summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_iso
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:15 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:26 +0100
commitc79ab34a7c597c9e3ab202c644121c6944789424 (patch)
tree324691f4f851c719b864229b399584f035b2873f /helpers/lh_binary_iso
parent0d5ff4ca7596790f853cf637e0fe225cad810a76 (diff)
downloadvyos-live-build-c79ab34a7c597c9e3ab202c644121c6944789424.tar.gz
vyos-live-build-c79ab34a7c597c9e3ab202c644121c6944789424.zip
Adding live-helper 1.0~a19-1.
Diffstat (limited to 'helpers/lh_binary_iso')
-rwxr-xr-xhelpers/lh_binary_iso33
1 files changed, 26 insertions, 7 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index f57b4e511..b39f31e2a 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -54,6 +54,9 @@ Create_lockfile .lock
# Checking depends
Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
+# Restoring cache
+Restore_cache cache/packages_binary
+
# Installing depends
Install_package
@@ -88,9 +91,6 @@ then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\""
fi
-# Moving image
-mv binary chroot
-
# Create image
case "${LIVE_BOOTLOADER}" in
grub)
@@ -128,15 +128,34 @@ case "${LIVE_BOOTLOADER}" in
;;
esac
+case "${LIVE_CHROOT_BUILD}" in
+ enabled)
+ # Moving image
+ mv binary chroot
+
cat > chroot/binary.sh << EOF
${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
EOF
-Chroot "sh binary.sh"
+ Chroot "sh binary.sh"
+
+ # Move image
+ mv chroot/binary chroot/binary.iso ./
+ rm -f chroot/binary.sh
+ ;;
+
+ disabled)
+cat > binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes binary
+EOF
+
+ sh binary.sh
+ rm -f binary.sh
+ ;;
+esac
-# Move image
-mv chroot/binary chroot/binary.iso ./
-rm -f chroot/binary.sh
+# Saving cache
+Save_cache cache/packages_binary
# Removing depends
Remove_package