From f2060a8ee2cfd5a7a6c26e96e48ac363e327af1a Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Wed, 12 Jul 2017 12:33:57 +0100
Subject: [PATCH] export-noobs: enable NOOBS config script here instead of
 stage2

---
 export-noobs/prerun.sh         | 2 ++
 stage2/01-sys-tweaks/01-run.sh | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/export-noobs/prerun.sh b/export-noobs/prerun.sh
index a3bb29f..61a26d5 100755
--- a/export-noobs/prerun.sh
+++ b/export-noobs/prerun.sh
@@ -31,6 +31,8 @@ mkdir -p ${NOOBS_DIR}
 mount $ROOT_DEV ${STAGE_WORK_DIR}/rootfs
 mount $BOOT_DEV ${STAGE_WORK_DIR}/rootfs/boot
 
+ln -sv "/lib/systemd/system/apply_noobs_os_config.service" "$ROOTFS_DIR/etc/systemd/system/multi-user.target.wants/apply_noobs_os_config.service"
+
 bsdtar --format gnutar --use-compress-program pxz -C ${STAGE_WORK_DIR}/rootfs/boot -cpf ${NOOBS_DIR}/boot.tar.xz .
 umount ${STAGE_WORK_DIR}/rootfs/boot
 bsdtar --format gnutar --use-compress-program pxz -C ${STAGE_WORK_DIR}/rootfs --one-file-system -cpf ${NOOBS_DIR}/root.tar.xz .
diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh
index f24d529..4c72d85 100755
--- a/stage2/01-sys-tweaks/01-run.sh
+++ b/stage2/01-sys-tweaks/01-run.sh
@@ -17,7 +17,6 @@ systemctl disable nfs-common
 systemctl disable rpcbind
 systemctl disable ssh
 systemctl enable regenerate_ssh_host_keys
-systemctl enable apply_noobs_os_config
 systemctl enable resize2fs_once
 EOF