Latest fixings to Mender
v2 cover Latest fixings to Mender
This patch series tries to ressurect the efforts Mizra did in August last year to have a proper mender package running on buildroot.
Here you can find a list of threads referring to the last outstanding problems:
https://patchwork.ozlabs.org/patch/959695/
https://patchwork.ozlabs.org/patch/959705/
https://patchwork.ozlabs.org/patch/959700/
https://patchwork.ozlabs.org/patch/959703/
Angelo Compagnucci (5):
package/mender: adding a writable location
package/mender: adding systemv init file
package/mender: adding artifact_info file
package/mender: adding device_type file
package/mender: adding a readme file
package/mender/S04mender | 56 +++++++++++++++++++++++++++++++++++++++++++ package/mender/artifact_info | 1 + package/mender/device_type | 1 + package/mender/mender.mk | 13 ++++++++++ package/mender/mender.service | 12 +++++++++- package/mender/readme.txt | 18 ++++++++++++++ 6 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 package/mender/S04mender create mode 100644 package/mender/artifact_info create mode 100644 package/mender/device_type create mode 100644 package/mender/readme.txt
Signature · 1 line
2.7.4
PATCH v2 1/5 package/mender: adding a writable location
Mender needs /var/lib/mender to be writable at the service start, the path is hardcoded and thus we cannot change it.
This patch solves the problem using the same approach we have for dropbear.
--- package/mender/mender.mk | 2 ++ package/mender/mender.service | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
package/mender/mender.mk +2 -0
@@ -49,6 +49,8 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) + + ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES
package/mender/mender.service +11 -1
@@ -6,7 +6,17 @@ After=systemd-resolved.service Type=idle User=root Group=root -ExecStartPre=/bin/mkdir -p -m 0700 /data/mender +ExecStartPre=/bin/sh -c '\ +if [ -L /var/lib/mender \ + -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]; then \ + if rm -f /var/lib/mender >/dev/null 2>&1; then \ + mkdir -p /var/lib/mender; \ + else \ + echo "No persistent location to store mender data. Data will be lost\ + echo "at reboot. Are you sure this is what you want to do?"; \ + mkdir -p "$(readlink /var/lib/mender)"; \ + fi; \ +fi' ExecStart=/usr/bin/mender -daemon Restart=on-abort
Signature · 1 line
2.7.4
PATCH v2 1/5 package/mender: adding a writable location
Quoted 55 lines · Angelo Compagnucci
Mender needs
/var/lib/menderto be writable at the service start, the path is hardcoded and thus we cannot change it.
This patch solves the problem using the same approach we have for dropbear.Signed-off-by Angelo Compagnucci <[email protected]>--- package/mender/mender.mk | 2 ++ package/mender/mender.service | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)package/mender/mender.mk +2
-0@@ -49,6 +49,8 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) + + ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILESpackage/mender/mender.service +11
-2@@ -6,7 +6,17 @@ After=systemd-resolved.service Type=idle User=root Group=root -ExecStartPre=/bin/mkdir -p -m 0700 /data/mender +ExecStartPre=/bin/sh -c '\ +if [ -L /var/lib/mender \ + -a "$(readlink /var/lib/mender)" = "/var/run/mender" ]; then \ + if rm -f /var/lib/mender >/dev/null 2>&1; then \ + mkdir -p /var/lib/mender; \ + else \ + echo "No persistent location to store mender data. Data will be lost\ + echo "at reboot. Are you sure this is what you want to do?"; \ + mkdir -p "$(readlink /var/lib/mender)"; \ + fi; \ +fi' ExecStart=/usr/bin/mender -daemon Restart=on-abort --2.7.4
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 2/5 package/mender: adding systemv init file
In reply to Angelo CompagnucciThis patch adds a service file for the init system v.
--- package/mender/S04mender | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ package/mender/mender.mk | 5 +++++ 2 files changed, 61 insertions(+) create mode 100644 package/mender/S04mender
package/mender/S04mender new file +56 -0
@@ -0,0 +1,56 @@ +#!/bin/sh +# +# Starts mender service. +# + +start() { + # If /var/lib/mender is a symlink to /var/run/mender, and + # - the filesystem is RO (i.e. we can not rm the symlink), + # create the directory pointed to by the symlink. + # - the filesystem is RW (i.e. we can rm the symlink), + # replace the symlink with an actual directory + if [ -L /var/lib/mender \ + -a "$(readlink /var/lib/mender)" = "/var/run/mender" ] + then + if rm -f /var/lib/mender >/dev/null 2>&1; then + mkdir -p /var/lib/mender + else + echo "No persistent location to store mender data. Data will be lost" + echo "at reboot. Are you sure this is what you want to do?" + mkdir -p "$(readlink /var/lib/mender)" + fi + fi + + printf "Starting mender service: " + umask 077 + + start-stop-daemon -S -q -p /var/run/mender.pid \ + --exec /usr/bin/mender -- -daemon + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +stop() { + printf "Stopping mender mender: " + start-stop-daemon -K -q -p /var/run/mender.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $?
package/mender/mender.mk +5 -0
@@ -63,4 +63,9 @@ define MENDER_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service endef +define MENDER_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/mender/S04mender \ + $(TARGET_DIR)/etc/init.d/S04mender +endef + $(eval $(golang-package))
Signature · 1 line
2.7.4
PATCH v2 2/5 package/mender: adding systemv init file
Quoted 93 lines · Angelo Compagnucci
This patch adds a service file for the init system v.
Signed-off-by Angelo Compagnucci <[email protected]>--- package/mender/S04mender | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ package/mender/mender.mk | 5 +++++ 2 files changed, 61 insertions(+) create mode 100644 package/mender/S04menderpackage/mender/S04mender new file +56
-0@@ -0,0 +1,56 @@ +#!/bin/sh +# +# Starts mender service. +# + +start() { + # If /var/lib/mender is a symlink to /var/run/mender, and + # - the filesystem is RO (i.e. we can not rm the symlink), + # create the directory pointed to by the symlink. + # - the filesystem is RW (i.e. we can rm the symlink), + # replace the symlink with an actual directory + if [ -L /var/lib/mender \ + -a "$(readlink /var/lib/mender)" = "/var/run/mender" ] + then + if rm -f /var/lib/mender >/dev/null 2>&1; then + mkdir -p /var/lib/mender + else + echo "No persistent location to store mender data. Data will be lost" + echo "at reboot. Are you sure this is what you want to do?" + mkdir -p "$(readlink /var/lib/mender)" + fi + fi + + printf "Starting mender service: " + umask 077 + + start-stop-daemon -S -q -p /var/run/mender.pid \ + --exec /usr/bin/mender -- -daemon + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +stop() { + printf "Stopping mender mender: " + start-stop-daemon -K -q -p /var/run/mender.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $?package/mender/mender.mk +5
-1@@ -63,4 +63,9 @@ define MENDER_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service endef +define MENDER_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/mender/S04mender \ + $(TARGET_DIR)/etc/init.d/S04mender +endef + $(eval $(golang-package)) --2.7.4
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 2/5 package/mender: adding systemv init file
Angelo, Adam,
About that one, I'm wondering if it could be problematic to start Mender before the network (as package/ifupdown-scripts installs S40network).
Best regards,
Titouan
Quoted 107 lines · Adam Duskett
Acked-by <[email protected]>Quoted 94 lines · Angelo Compagnucci
This patch adds a service file for the init system v.
Signed-off-by Angelo Compagnucci <[email protected]>--- package/mender/S04mender | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ package/mender/mender.mk | 5 +++++ 2 files changed, 61 insertions(+) create mode 100644 package/mender/S04menderpackage/mender/S04mender new file +8
-0@@ -0,0 +1,56 @@ +#!/bin/sh +# +# Starts mender service. +# + +start() { + # If /var/lib/mender is a symlink to /var/run/mender, and + # - the filesystem is RO (i.e. we can not rm thesymlink),
package/mender/S04mender new file +10
-0+ # create the directory pointed to by the symlink. + # - the filesystem is RW (i.e. we can rm the symlink), + # replace the symlink with an actual directory + if [ -L /var/lib/mender \ + -a "$(readlink /var/lib/mender)" = "/var/run/mender" ] + then + if rm -f /var/lib/mender >/dev/null 2>&1; then + mkdir -p /var/lib/mender + else + echo "No persistent location to storemender data. Data will be lost"
+ echo "at reboot. Are you sure this is what
you want to do?"package/mender/S04mender new file +37
-0+ mkdir -p "$(readlink /var/lib/mender)" + fi + fi + + printf "Starting mender service: " + umask 077 + + start-stop-daemon -S -q -p /var/run/mender.pid \ + --exec /usr/bin/mender -- -daemon + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +stop() { + printf "Stopping mender mender: " + start-stop-daemon -K -q -p /var/run/mender.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $?package/mender/mender.mk +0
-0@@ -63,4 +63,9 @@ define MENDER_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mender.service
endefpackage/mender/mender.mk +5
-1+define MENDER_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/mender/S04mender \ + $(TARGET_DIR)/etc/init.d/S04mender +endef + $(eval $(golang-package)) --2.7.4
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 3/5 package/mender: adding artifact_info file
In reply to Angelo CompagnucciIn order to have the mender package working out of the box, the /etc/mender/artifact_info should be present and should contain a valid artifact_name value.
This patch provides a default file that can be overridden easily from an overlay.
--- package/mender/artifact_info | 1 + package/mender/mender.mk | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 package/mender/artifact_info
package/mender/artifact_info new file +1 -0
@@ -0,0 +1 @@ +artifact_name=BUILDROOT_ARTIFACT
package/mender/mender.mk +3 -0
@@ -50,6 +50,9 @@ define MENDER_INSTALL_CONFIG_FILES $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) + $(INSTALL) -D -m 0755 package/mender/artifact_info \ + $(TARGET_DIR)/etc/mender/artifact_info + ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender endef
Signature · 1 line
2.7.4
PATCH v2 3/5 package/mender: adding artifact_info file
Quoted 42 lines · Angelo Compagnucci
In order to have the mender package working out of the box, the
/etc/mender/artifact_infoshould be present and should contain a validartifact_namevalue.
This patch provides a default file that can be overridden easily from an overlay.Signed-off-by Angelo Compagnucci <[email protected]>--- package/mender/artifact_info | 1 + package/mender/mender.mk | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 package/mender/artifact_infopackage/mender/artifact_info new file +1
-0@@ -0,0 +1 @@ +artifact_name=BUILDROOT_ARTIFACTpackage/mender/mender.mk +3
-1@@ -50,6 +50,9 @@ define MENDER_INSTALL_CONFIG_FILES $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) ) + $(INSTALL) -D -m 0755 package/mender/artifact_info \ + $(TARGET_DIR)/etc/mender/artifact_info + ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender endef --2.7.4
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 4/5 package/mender: adding device_type file
In reply to Angelo CompagnucciIn order to have the mender package working out of the box, the /etc/mender/device_type should be present and should contain a valid device_type value.
This patch provides a default file that can be overridden easily from an overlay.
--- package/mender/device_type | 1 + package/mender/mender.mk | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 package/mender/device_type
package/mender/device_type new file +1 -0
@@ -0,0 +1 @@ +device_type=BUILDROOT_DEVICE
package/mender/mender.mk +3 -0
@@ -53,6 +53,9 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 package/mender/artifact_info \ $(TARGET_DIR)/etc/mender/artifact_info + $(INSTALL) -D -m 0755 package/mender/device_type \ + $(TARGET_DIR)/etc/mender/device_type + ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender endef
Signature · 1 line
2.7.4
PATCH v2 4/5 package/mender: adding device_type file
Quoted 42 lines · Angelo Compagnucci
In order to have the mender package working out of the box, the
/etc/mender/device_typeshould be present and should contain a validdevice_typevalue.
This patch provides a default file that can be overridden easily from an overlay.Signed-off-by Angelo Compagnucci <[email protected]>--- package/mender/device_type | 1 + package/mender/mender.mk | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 package/mender/device_typepackage/mender/device_type new file +1
-0@@ -0,0 +1 @@ +device_type=BUILDROOT_DEVICEpackage/mender/mender.mk +3
-1@@ -53,6 +53,9 @@ define MENDER_INSTALL_CONFIG_FILES $(INSTALL) -D -m 0755 package/mender/artifact_info \ $(TARGET_DIR)/etc/mender/artifact_info + $(INSTALL) -D -m 0755 package/mender/device_type \ + $(TARGET_DIR)/etc/mender/device_type + ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender endef --2.7.4
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 5/5 package/mender: adding a readme file
In reply to Angelo CompagnucciThis patch adds a readme file with basic instructions to get mender up and running on a production system.
--- package/mender/readme.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/mender/readme.txt
package/mender/readme.txt new file +18 -0
@@ -0,0 +1,18 @@ +=== Notes on using Mender on Buildroot +====================================== +Default configurations files +---------------------------- + +Buildroot comes with a default artifact_info and device_type configuration files +in /etc/mender. They contain default values, and thus they should be overridden +on a production system. + +The simplest way to do it is to change these files in an overlay or in a post +build script. + +Configuring mender with certificates +------------------------------------ + +Mender uses TLS to communicate with the management server and, if you use a +CA-signed certificate on the server, you should select the ca-certificates +package otherwise it doesn't work.
Signature · 1 line
2.7.4
PATCH v2 5/5 package/mender: adding a readme file
All;
Quoted 37 lines · Angelo Compagnucci
This patch adds a readme file with basic instructions to get mender up and running on a production system.
Signed-off-by Angelo Compagnucci <[email protected]>--- package/mender/readme.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 package/mender/readme.txtpackage/mender/readme.txt new file +18
-1@@ -0,0 +1,18 @@ +=== Notes on using Mender on Buildroot +====================================== +Default configurations files +---------------------------- + +Buildroot comes with a default artifact_info and device_type configuration files +in /etc/mender. They contain default values, and thus they should be overridden +on a production system. + +The simplest way to do it is to change these files in an overlay or in a post +build script. + +Configuring mender with certificates +------------------------------------ + +Mender uses TLS to communicate with the management server and, if you use a +CA-signed certificate on the server, you should select the ca-certificates +package otherwise it doesn't work. --2.7.4
Quoted 4 lines
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot