From b03b611c5befa52ff2d30de1446c083dff40a551 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Mon, 25 Nov 2019 17:36:28 -0500 Subject: [PATCH 1/2] modify: Add an extra function user_local_modify for end users to populate. Changelog: Title Signed-off-by: Drew Moseley --- mender-convert-modify | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mender-convert-modify b/mender-convert-modify index be5e68a..b4a09e5 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -20,6 +20,10 @@ function platform_modify() { true } +function user_local_modify() { + true +} + function trap_exit() { echo "mender-convert-modify has finished. Cleaning up..." sudo umount -f work/boot @@ -216,6 +220,9 @@ EOF" log_info "Performing platform specific modifications (if any)" platform_modify +log_info "Performing user/local specific modifications (if any)" +user_local_modify + for overlay in "${overlays[@]}"; do log_info "Applying rootfs overlay: ${overlay}" run_and_log_cmd "sudo rsync --archive --keep-dirlinks --verbose ${overlay}/ work/rootfs/" From b9a617a338a17410366fb820daa8d76be64e586b Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Mon, 25 Nov 2019 18:40:57 -0500 Subject: [PATCH 2/2] mender: Rename mender.service to mender-client.service Changelog: Title Signed-off-by: Drew Moseley --- mender-convert-modify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mender-convert-modify b/mender-convert-modify index b4a09e5..716636f 100755 --- a/mender-convert-modify +++ b/mender-convert-modify @@ -98,8 +98,8 @@ cd - > /dev/null 2>&1 run_and_log_cmd "sudo rsync --archive --keep-dirlinks --verbose work/mender-deb/files/ work/rootfs/" if [ "${MENDER_ENABLE_SYSTEMD}" == "y" ]; then - run_and_log_cmd "sudo ln -sf /lib/systemd/system/mender.service \ - work/rootfs/etc/systemd/system/multi-user.target.wants/mender.service" + run_and_log_cmd "sudo ln -sf /lib/systemd/system/mender-client.service \ + work/rootfs/etc/systemd/system/multi-user.target.wants/mender-client.service" fi if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then