Merge pull request #5 from RPi-Distro/master

Updated export-image to not depend on fake-hwclock and hardlink. (RPi-Distro#326)
mikehash · Aug 29, 2019 · 28c335d · 28c335d
2 parents f154563 + 00c22ab
commit 28c335d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/export-image/04-finalise/01-run.sh b/export-image/04-finalise/01-run.sh
@@ -4,8 +4,12 @@ IMG_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.img"
 INFO_FILE="${STAGE_WORK_DIR}/${IMG_FILENAME}${IMG_SUFFIX}.info"
 
 on_chroot << EOF
-/etc/init.d/fake-hwclock stop
-hardlink -t /usr/share/doc
+if [ -x /etc/init.d/fake-hwclock ]; then
+	/etc/init.d/fake-hwclock stop
+fi
+if hash hardlink 2>/dev/null; then
+	hardlink -t /usr/share/doc
+fi
 EOF
 
 if [ -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config" ]; then