From 4b8512a32a394720eb1f84bd31cddd98a68a1f21 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 6 Oct 2007 00:56:39 +0200 Subject: [PATCH] adjust /etc/grml/fai/config/hooks/instsoft.GRMLBASE --- debian/changelog | 4 ++++ etc/grml/fai/config/hooks/instsoft.GRMLBASE | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 325ac40..b66301f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ grml-live (0.0.4) unstable; urgency=low * Check for /var/run/fai/FAI_INSTALLATION_IN_PROGRESS and exit then. + * /etc/grml/fai/config/hooks/instsoft.GRMLBASE: + - disable pipeline workaround + - create /dev/MAKEDEV in chroot to work around the + "./MAKEDEV: No such file or directory" problem of some packages -- Michael Prokop Thu, 04 Oct 2007 22:16:34 +0200 diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index e4449d8..5556f7c 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Sep 16 22:53:02 CEST 2007 [mika] +# Latest change: Sat Oct 06 00:55:29 CEST 2007 [mika] ################################################################################ set -u @@ -12,7 +12,7 @@ set -e # work around http://trac.lighttpd.net/trac/ticket/657 # should be removed later on: -echo "Acquire::http::Pipeline-Depth "0";" >> $target/etc/apt/apt.conf +# echo "Acquire::http::Pipeline-Depth "0";" >> $target/etc/apt/apt.conf # install grml keys: gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 @@ -24,6 +24,11 @@ $ROOTCMD apt-key add /etc/apt/grml.key $ROOTCMD apt-get update $ROOTCMD aptitude -f -y install file-rc +# make sure /dev/MAKEDEV is available: +if [ -x "$target"/sbin/MAKEDEV ] && ! [ -r "$target"/dev/MAKEDEV ] ; then + ln -s /sbin/MAKEDEV "$target"/dev/MAKEDEV +fi + # we don't need the invoke-rc.d.d diversion (we have grml-policyrcd :)): if [ -L "$target"/usr/sbin/invoke-rc.d ] ; then rm -f "$target"/usr/sbin/invoke-rc.d -- 2.1.4