diff options
| -rwxr-xr-x | functions/defaults.sh | 6 | ||||
| -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 | ||||
| -rwxr-xr-x | hooks/stripped (renamed from hooks/mini) | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 38b948e..4214db1 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -431,7 +431,7 @@ Set_defaults () for LIST in ${LH_PACKAGES_LISTS} do case "${LIST}" in - mini|minimal) + stripped|minimal) LH_APT="apt-get" ;; @@ -637,13 +637,13 @@ Check_defaults () fi fi - if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ] + if [ "${LH_PACKAGES_LISTS}" = "stripped" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ] then if [ "${LH_APT}" = "aptitude" ] then Echo_warning "You selected LH_PACKAGES_LISTS='"${LH_PACKAGES_LIST}"' and LH_APT='aptitude'" Echo_warning "This is a possible unsafe configuration as aptitude is not" - Echo_warning "used in the mini/minimal package lists." + Echo_warning "used in the stripped/minimal package lists." fi fi } diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index cf38317..f3f4274 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 2bd2a1f..20098c6 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 56e05a0..a3db55c 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 69d9cd0..a69a086 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" ;; diff --git a/hooks/mini b/hooks/stripped index 9d99e81..a84a12f 100755 --- a/hooks/mini +++ b/hooks/stripped @@ -1,6 +1,6 @@ #!/bin/sh -# /usr/share/live-helper/hooks/mini - hook list for live-helper(7) +# /usr/share/live-helper/hooks/stripped - hook list for live-helper(7) # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. |