[SCM] debian-live/config-webc branch, master, updated. 2087f1d387ef860e388da247c70523d4d0a84d1f

[Kai Hendry]

The following commit has been merged in the master branch:
commit 2087f1d387ef860e388da247c70523d4d0a84d1f
Author: Kai Hendry <hendry at iki.fi>
Date:   Sat Jan 2 21:58:10 2010 +0100

    minor cleanup for less bloated builds

diff --git a/webconverger/config/binary_local-hooks/brand-di-banner.sh b/webconverger/config/binary_local-hooks/brand-di-banner.sh
deleted file mode 100755
index 365909b..0000000
--- a/webconverger/config/binary_local-hooks/brand-di-banner.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# This is an binary hook for live-helper(7) to overwrite the banner
-# in the graphical Debian Installer. To enable it, coppy or symlink
-# this hook into your config/binary_local-hooks directory and add a
-# replacement banner.png at:
-#
-#  config/binary_local-includes/binary/install/banner.png
-#
-# The file should be a PNG image of dimensions 800 x 75.
-
-set -e
-
-TARGET_INITRD="binary/install/gtk/initrd.gz"
-REPACK_TMPDIR="unpacked-initrd"
-
-# cpio does not have a "extract to directory", so we must change directory
-mkdir -p ${REPACK_TMPDIR}
-cd ${REPACK_TMPDIR}
-gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
-
-# Overwrite banner
-mv ../binary/install/banner.png ./usr/share/graphics/logo_debian.png
-
-find | cpio -H newc -o | gzip -9 > ../${TARGET_INITRD}
-cd ..
-rm -rf ${REPACK_TMPDIR}
diff --git a/webconverger/config/chroot_local-hooks/stripped b/webconverger/config/chroot_local-hooks/stripped
deleted file mode 100755
index e99249d..0000000
--- a/webconverger/config/chroot_local-hooks/stripped
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# /usr/share/live-helper/hooks/stripped - hook list for live-helper(7)
-# Copyright (C) 2006-2008 Daniel Baumann <daniel at debian.org>
-#
-# 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
-# python-2.5
-for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute
-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/lintian/*
-rm -rf /usr/share/linda/*
-#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/webconverger/config/chroot_local-hooks/webconverger b/webconverger/config/chroot_local-hooks/webconverger
index ee808b9..6966e21 100755
--- a/webconverger/config/chroot_local-hooks/webconverger
+++ b/webconverger/config/chroot_local-hooks/webconverger
@@ -1,6 +1,5 @@
 update-rc.d -f openbsd-inetd remove
 update-rc.d -f stop-bootlogd remove
-sleep 5
 echo Fix dictionary transition
 set -ex
 ln -s /usr/share/myspell/dicts /usr/share/hunspell
diff --git a/webconverger/config/chroot_local-hooks/zzzminimal b/webconverger/config/chroot_local-hooks/zzzminimal
index fc98ed5..5f3598e 100755
--- a/webconverger/config/chroot_local-hooks/zzzminimal
+++ b/webconverger/config/chroot_local-hooks/zzzminimal
@@ -12,7 +12,7 @@ set -e
 echo Removing unused packages
 for PACKAGE in apt-utils aptitude man-db manpages info libxapian15 grub grub-common vim-common vim-tiny \
 	tcpd netcat-traditional gcc gcc-4.1 gcc-4.1-base gcc-4.2 gcc-4.2-base xserver-xorg-video-dummy ed dmidecode menu \
-	rsyslog nano linux-headers-2.6
+	samba-common dbus rsyslog nano linux-headers-2.6 console-setup
 do
 	if apt-get remove --purge --yes "${PACKAGE}"
 	then
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index 576de78..8b91c62 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -4,7 +4,7 @@
 MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
 
 lh config noautoconfig \
-	--apt-recommends disabled \
+	--apt-recommends false \
 	--bootappend-live "quiet homepage=http://portal.webconverger.com nonetworking nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent quickreboot" \
 	--cache-stages "bootstrap rootfs" \
 	--debian-installer-distribution sid \
@@ -25,6 +25,6 @@ lh config noautoconfig \
 	--syslinux-splash config/binary_syslinux/splash.rle \
 	--syslinux-timeout 5 \
 	--mirror-bootstrap ${MIRROR_DEBIAN} \
-	--binary-indices disabled \
-	--win32-loader disabled \
+	--binary-indices false \
+	--win32-loader false \
 	${@}

-- 
debian-live/config-webc