Renaming mini flavour to stripped to avoid confusion, thanks to Fathi Boudra <fabo@debian.org> and Ben Armstrong <synrg@debian.org>.
This commit is contained in:
parent
25f4d73ba9
commit
0d0e8bb268
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
;;
|
||||
|
||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue