From 74b2c5778d24951accb7a46b120390bdfbb34fc2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 17 Jan 2008 18:15:11 +0100 Subject: Renaming mini flavour to stripped to avoid confusion, thanks to Fathi Boudra and Ben Armstrong . --- functions/defaults.sh | 6 ++--- helpers/lh_binary_iso | 2 +- helpers/lh_binary_rootfs | 2 +- helpers/lh_bootstrap_cdebootstrap | 6 ++--- helpers/lh_bootstrap_debootstrap | 4 ++-- hooks/mini | 48 --------------------------------------- hooks/stripped | 48 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 58 deletions(-) delete mode 100755 hooks/mini create mode 100755 hooks/stripped 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/mini deleted file mode 100755 index 9d99e81..0000000 --- a/hooks/mini +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -# /usr/share/live-helper/hooks/mini - hook list for live-helper(7) -# Copyright (C) 2006-2007 Daniel Baumann -# -# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -# This is free software, and you are welcome to redistribute it -# under certain conditions; see COPYING for details. - -set -e - -# Removing unused packages -for PACKAGE in apt-utils aptitude man-db manpages info wget dselect -do - if ! apt-get remove --purge --yes "${PACKAGE}" - then - echo "WARNING: ${PACKAGE} isn't installed" - fi -done - -apt-get autoremove --yes || true - -# Removing unused files -find . -name *~ | xargs rm -f - -rm -rf /usr/include/* -#rm -rf /usr/share/groff/* -rm -rf /usr/share/doc/* -rm -rf /usr/share/locale/* -rm -rf /usr/share/man/* -rm -rf /usr/share/i18n/* -rm -rf /usr/share/info/* -rm -rf /usr/share/zoneinfo/* -rm -rf /var/cache/man/* - -# Cleaning apt lists -rm -rf /var/lib/apt/lists -mkdir -p /var/lib/apt/lists/partial - -# Cleaning apt cache -rm -rf /var/cache/apt -mkdir -p /var/cache/apt/archives/partial - -# Truncating logs -for FILE in $(find /var/log/ -type f) -do - : > ${FILE} -done diff --git a/hooks/stripped b/hooks/stripped new file mode 100755 index 0000000..a84a12f --- /dev/null +++ b/hooks/stripped @@ -0,0 +1,48 @@ +#!/bin/sh + +# /usr/share/live-helper/hooks/stripped - hook list for live-helper(7) +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Removing unused packages +for PACKAGE in apt-utils aptitude man-db manpages info wget dselect +do + if ! apt-get remove --purge --yes "${PACKAGE}" + then + echo "WARNING: ${PACKAGE} isn't installed" + fi +done + +apt-get autoremove --yes || true + +# Removing unused files +find . -name *~ | xargs rm -f + +rm -rf /usr/include/* +#rm -rf /usr/share/groff/* +rm -rf /usr/share/doc/* +rm -rf /usr/share/locale/* +rm -rf /usr/share/man/* +rm -rf /usr/share/i18n/* +rm -rf /usr/share/info/* +rm -rf /usr/share/zoneinfo/* +rm -rf /var/cache/man/* + +# Cleaning apt lists +rm -rf /var/lib/apt/lists +mkdir -p /var/lib/apt/lists/partial + +# Cleaning apt cache +rm -rf /var/cache/apt +mkdir -p /var/cache/apt/archives/partial + +# Truncating logs +for FILE in $(find /var/log/ -type f) +do + : > ${FILE} +done -- cgit v1.0