X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRML;h=e4449d8f9cb205b3aa90592ab6ca6ff22f312dba;hp=6f7cf08e2d8334548b5b8570c75b012da02641e1;hb=46e327ee238f7a1b11ec7c6895a0b4b87be9fbbe;hpb=b20d1f05dab564fbab2bea7118b3201421d411e7

diff --git a/etc/grml/fai/config/hooks/instsoft.GRML b/etc/grml/fai/config/hooks/instsoft.GRML
index 6f7cf08..e4449d8 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRML
+++ b/etc/grml/fai/config/hooks/instsoft.GRML
@@ -1,13 +1,17 @@
 #!/bin/sh
+# Filename:      /etc/grml/fai/config/hooks/instsoft.GRML
+# Purpose:       grml specific Debian installation in the chroot
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# 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]
+################################################################################
+
 set -u
 set -e
 
-# make sure we have file-rc available before
-# package_config/GRML is being executed:
-
-# TODO: test whether adding file-rc to FAI_DEBOOTSTRAP_OPTS= would do the trick too
-
-# work around http://trac.lighttpd.net/trac/ticket/657:
+# 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
 
 # install grml keys:
@@ -15,24 +19,16 @@ gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
 gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
 $ROOTCMD apt-key add /etc/apt/grml.key
 
-# finally install file-rc:
+# make sure we have file-rc available before
+# package_config/GRML is being executed:
 $ROOTCMD apt-get update
-$ROOTCMD apt-get --download-only --assume-yes install file-rc
-$ROOTCMD /bin/sh -c "dpkg -i --force-all /var/cache/apt/archives/file-rc*.deb"
-$ROOTCMD apt-get -f install file-rc
+$ROOTCMD aptitude -f -y install file-rc
 
-# we don't need the invoke-rc.d and update-rc.d diversion
-# because otherwise use of file-rc with aptitude fails:
+# 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
    $ROOTCMD dpkg-divert --package fai --rename --remove /usr/sbin/invoke-rc.d
 fi
-if [ -L "$target"/usr/sbin/update-rc.d ] ; then
-   dpkg --purge sysv-rc
-   $ROOTCMD apt-get --assume-yes --reinstall install file-rc
-fi
-
-# debug:
-# $ROOTCMD /bin/bash
 
+## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3