manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Daniel Baumann 2008-01-17 18:15:11 +01:00
parent 25f4d73ba9
commit 0d0e8bb268
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions/defaults.sh
View File

@ -431,7 +431,7 @@ Set_defaults ()
for LIST in ${LH_PACKAGES_LISTS} for LIST in ${LH_PACKAGES_LISTS}
do do
case "${LIST}" in case "${LIST}" in
mini|minimal) stripped|minimal)
LH_APT="apt-get" LH_APT="apt-get"
;; ;;
@ -637,13 +637,13 @@ Check_defaults ()
fi fi
fi fi
if [ "${LH_PACKAGES_LISTS}" = "mini" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ] if [ "${LH_PACKAGES_LISTS}" = "stripped" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
then then
if [ "${LH_APT}" = "aptitude" ] if [ "${LH_APT}" = "aptitude" ]
then then
Echo_warning "You selected LH_PACKAGES_LISTS='"${LH_PACKAGES_LIST}"' and LH_APT='aptitude'" 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 "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
fi fi
} }

2
helpers/lh_binary_iso
View File

@ -125,7 +125,7 @@ case "${LH_BOOTLOADER}" in
esac esac
case "${LH_PACKAGES_LISTS}" in case "${LH_PACKAGES_LISTS}" in
minimal|mini) stripped|minimal)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
;; ;;
esac esac

2
helpers/lh_binary_rootfs
View File

@ -183,7 +183,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info" MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
fi fi
if [ "${LH_PACKAGES_LISTS}" = "minimal" ] || [ "${LH_PACKAGES_LISTS}" = "mini" ] if [ "${LH_PACKAGES_LISTS}" = "stripped" ] || [ "${LH_PACKAGES_LISTS}" = "minimal" ]
then then
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')" MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e $(ls chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* | sed 's|chroot/||g')"
fi fi

6
helpers/lh_bootstrap_cdebootstrap
View File

@ -90,7 +90,7 @@ fi
if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ] if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
then then
case "${LH_PACKAGES_LISTS}" in case "${LH_PACKAGES_LISTS}" in
minimal|mini) stripped|minimal)
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal" CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
;; ;;
*) *)
@ -99,7 +99,7 @@ then
esac esac
else else
case "${LH_BOOTSTRAP_FLAVOUR}" in case "${LH_BOOTSTRAP_FLAVOUR}" in
minimal|mini) stripped|minimal)
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal" CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
;; ;;
@ -166,7 +166,7 @@ then
# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours) # Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
case "${LH_PACKAGES_LISTS}" in case "${LH_PACKAGES_LISTS}" in
minimal|mini) stripped|minimal)
Chroot "dpkg -P cdebootstrap-helper-diverts" Chroot "dpkg -P cdebootstrap-helper-diverts"
;; ;;
esac esac

4
helpers/lh_bootstrap_debootstrap
View File

@ -87,13 +87,13 @@ then
if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ] if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
then then
case "${LH_PACKAGES_LISTS}" in case "${LH_PACKAGES_LISTS}" in
minimal|mini) stripped|minimal)
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd" DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd"
;; ;;
esac esac
else else
case "${LH_BOOTSTRAP_FLAVOUR}" in case "${LH_BOOTSTRAP_FLAVOUR}" in
minimal|mini) stripped|minimal)
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd" DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=buildd"
;; ;;

2
hooks/mini → hooks/stripped
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/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> # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
# #
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.