summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_rootfs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:09 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commit97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 (patch)
treed7facbbbf53b1a5bc0fa92f671f5b1e29a7e3200 /helpers/lh_binary_rootfs
parent7c68e6ebca01f64501453fa53941ac77b9c2c335 (diff)
downloadvyos-live-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.tar.gz
vyos-live-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.zip
Adding live-helper 1.0~a10-1.
Diffstat (limited to 'helpers/lh_binary_rootfs')
-rwxr-xr-xhelpers/lh_binary_rootfs12
1 files changed, 6 insertions, 6 deletions
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index ce93038dc..47529a297 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -63,7 +63,7 @@ then
mkdir -p binary/${INITFS}
fi
-case "${LIVE_FILESYSTEM}" in
+case "${LIVE_CHROOT_FILESYSTEM}" in
ext2)
# Checking depends
Check_package chroot/usr/bin/genext2fs genext2fs
@@ -119,17 +119,17 @@ case "${LIVE_FILESYSTEM}" in
if [ "${LH_VERBOSE}" = "enabled" ]
then
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -i"
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
fi
- # Create image
if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
then
- Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs"
- else
- Chroot "mksquashfs ${MKSQUASHFS_OPTIONS} chroot filesystem.squashfs -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/vmlinuz* chroot/boot/initrd.img* chroot/vmlinuz* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
fi
+ # Create image
+ Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+
# Move image
${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
${LH_ROOT_COMMAND} rm -rf chroot/chroot