[1/2] package/mender: update rootfs parts inmender.conf
diff mbox series

Message ID 20190514090450.20142-2-mirza.krak@northern.tech
State Accepted
Headers show
Series
  • misc package/mender updates
Related show

Commit Message

Mirza Krak May 14, 2019, 9:04 a.m. UTC
The configuration options (RootfsPartA/RootfsPartB) must
provide a valid path to a block devices.

Signed-off-by: Mirza Krak <mirza.krak@northern.tech>
---
 package/mender/mender.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Arnout Vandecappelle May 28, 2019, 8:43 p.m. UTC | #1
On 14/05/2019 11:04, Mirza Krak wrote:
> The configuration options (RootfsPartA/RootfsPartB) must
> provide a valid path to a block devices.
> 
> Signed-off-by: Mirza Krak <mirza.krak@northern.tech>

 Applied to master, thanks. This is clearly a bugfix, so master, not next.

 Regards,
 Arnout

> ---
>  package/mender/mender.conf | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/mender/mender.conf b/package/mender/mender.conf
> index 979f16aaf6..f89118ac1b 100644
> --- a/package/mender/mender.conf
> +++ b/package/mender/mender.conf
> @@ -2,8 +2,8 @@
>    "InventoryPollIntervalSeconds": 1800,
>    "UpdatePollIntervalSeconds": 1800,
>    "RetryPollIntervalSeconds": 300,
> -  "RootfsPartA": "mmcblk0p2",
> -  "RootfsPartB": "mmcblk0p3",
> +  "RootfsPartA": "/dev/mmcblk0p2",
> +  "RootfsPartB": "/dev/mmcblk0p3",
>    "ServerCertificate": "/etc/mender/server.crt",
>    "ServerURL": "https://docker.mender.io",
>    "TenantToken": "dummy"
>
Peter Korsgaard June 6, 2019, 3:27 p.m. UTC | #2
>>>>> "Mirza" == Mirza Krak <mirza.krak@northern.tech> writes:

 > The configuration options (RootfsPartA/RootfsPartB) must
 > provide a valid path to a block devices.

 > Signed-off-by: Mirza Krak <mirza.krak@northern.tech>

Committed to 2019.02.x, thanks.

Patch
diff mbox series

diff --git a/package/mender/mender.conf b/package/mender/mender.conf
index 979f16aaf6..f89118ac1b 100644
--- a/package/mender/mender.conf
+++ b/package/mender/mender.conf
@@ -2,8 +2,8 @@ 
   "InventoryPollIntervalSeconds": 1800,
   "UpdatePollIntervalSeconds": 1800,
   "RetryPollIntervalSeconds": 300,
-  "RootfsPartA": "mmcblk0p2",
-  "RootfsPartB": "mmcblk0p3",
+  "RootfsPartA": "/dev/mmcblk0p2",
+  "RootfsPartB": "/dev/mmcblk0p3",
   "ServerCertificate": "/etc/mender/server.crt",
   "ServerURL": "https://docker.mender.io",
   "TenantToken": "dummy"