diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-01-17 18:15:11 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:35:54 +0100 |
| commit | 74b2c5778d24951accb7a46b120390bdfbb34fc2 (patch) | |
| tree | 04e8efeebfc81452c8d9ca22ef15ee21337cb805 /helpers | |
| parent | 349dfe0e5bbfd637fe33259bd66957057aaf14be (diff) | |
| download | vyos-live-build-74b2c5778d24951accb7a46b120390bdfbb34fc2.tar.gz vyos-live-build-74b2c5778d24951accb7a46b120390bdfbb34fc2.zip | |
Renaming mini flavour to stripped to avoid confusion, thanks to Fathi Boudra <fabo@debian.org> and Ben Armstrong <synrg@debian.org>.
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_iso | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_rootfs | 2 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 6 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_debootstrap | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index cf38317c7..f3f427425 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -125,7 +125,7 @@ case "${LH_BOOTLOADER}" in esac case "${LH_PACKAGES_LISTS}" in - minimal|mini) + stripped|minimal) GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" ;; esac diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 2bd2a1f6e..20098c6eb 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -183,7 +183,7 @@ case "${LH_CHROOT_FILESYSTEM}" in MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info" fi - if [ "${LH_PACKAGES_LISTS}" = "minimal" ] || [ "${LH_PACKAGES_LISTS}" = "mini" ] + if [ "${LH_PACKAGES_LISTS}" = "stripped" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')" fi diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 56e05a030..a3db55c89 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -90,7 +90,7 @@ fi if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ] then case "${LH_PACKAGES_LISTS}" in - minimal|mini) + stripped|minimal) CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal" ;; *) @@ -99,7 +99,7 @@ then esac else case "${LH_BOOTSTRAP_FLAVOUR}" in - minimal|mini) + stripped|minimal) CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal" ;; @@ -166,7 +166,7 @@ then # Remove cdebootstrap-helper-diverts (needed at least for minimal flavours) case "${LH_PACKAGES_LISTS}" in - minimal|mini) + stripped|minimal) Chroot "dpkg -P cdebootstrap-helper-diverts" ;; esac diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 69d9cd054..a69a0869a 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -87,13 +87,13 @@ then if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ] then case "${LH_PACKAGES_LISTS}" in - minimal|mini) + stripped|minimal) DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd" ;; esac else case "${LH_BOOTSTRAP_FLAVOUR}" in - minimal|mini) + stripped|minimal) DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd" ;; |