Merge pull request #133 from drewmoseley/next

modify: Add an extra function user_local_modify for end users to popu…

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
@@ -94,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
@@ -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/"