diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:17 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:26 +0100 |
| commit | 0d0de885e32ff67d57bb7def451b62d75b8920ab (patch) | |
| tree | cd4a159a86207401dbd5990bc0fa3c28825ab6f8 /helpers/lh_binary_rootfs | |
| parent | c68c0a270832ca340429878ce6a0ab606d435b06 (diff) | |
| download | vyos-live-build-0d0de885e32ff67d57bb7def451b62d75b8920ab.tar.gz vyos-live-build-0d0de885e32ff67d57bb7def451b62d75b8920ab.zip | |
Adding live-helper 1.0~a22-1.
Diffstat (limited to 'helpers/lh_binary_rootfs')
| -rwxr-xr-x | helpers/lh_binary_rootfs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index e8f34c804..15feb5f73 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -47,7 +47,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -case "${LIVE_ARCHITECTURE}" in +case "${LH_ARCHITECTURE}" in amd64|i386) LINUX="vmlinuz" ;; @@ -92,7 +92,7 @@ do fi done -case "${LIVE_CHROOT_FILESYSTEM}" in +case "${LH_CHROOT_FILESYSTEM}" in ext2) # Checking depends Check_package chroot/usr/bin/genext2fs genext2fs @@ -112,7 +112,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in DU_DIM="`du -ks chroot/chroot | cut -f1`" REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here... - case "${LIVE_CHROOT_BUILD}" in + case "${LH_CHROOT_BUILD}" in enabled) Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2" @@ -139,7 +139,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in rm -rf binary/${INITFS}/filesystem.dir fi - case "${LIVE_CHROOT_BUILD}" in + case "${LH_CHROOT_BUILD}" in enabled) mv chroot/chroot binary/${INITFS}/filesystem.dir ;; @@ -166,7 +166,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in rm -f binary/${INITFS}/filesystem.squashfs fi - if [ "${LH_QUIET}" = "enabled" ] && [ "${LIVE_DISTRIBUTION}" != "etch" ] && [ "${LIVE_DISTRIBUTION}" != "testing" ] + if [ "${LH_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LH_DISTRIBUTION}" != "testing" ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress" fi @@ -176,7 +176,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info" fi - if [ "${LIVE_PACKAGES_LISTS}" = "minimal" ] || [ "${LIVE_PACKAGES_LISTS}" = "mini" ] + if [ "${LH_PACKAGES_LISTS}" = "minimal" ] || [ "${LH_PACKAGES_LISTS}" = "mini" ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e `ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's,chroot/,,g'`" fi @@ -187,7 +187,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in cp config/binary_rootfs/squashfs.sort chroot #FIXME fi - case "${LIVE_CHROOT_BUILD}" in + case "${LH_CHROOT_BUILD}" in enabled) # Create image Chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}" |