From 8795132e3cc5937788a27947d2af7aa9881dcec3 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 16 Oct 2008 01:04:53 +0200 Subject: [PATCH] Rework policy-rc.d handling in updatebase once again --- debian/changelog | 8 +++++--- etc/grml/fai/config/hooks/updatebase.GRMLBASE | 18 +++++++++--------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4ca8ba3..e5f7306 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,12 @@ grml-live (0.9.5) unstable; urgency=low [Closes: issue552] * Drop xserver-xorg-video-newport from all flavours. * Replace all unzoo package references with zoo, see #497775. - * Drop 'skiptask updatebase' workaround in - /etc/grml/fai/config/hooks/updatebase.GRMLBASE. + * Handle policy-rc.d in /etc/grml/fai/config/hooks/updatebase.GRMLBASE + because we have to skip FAI's updatebase task and lack /proc therefore. + New packages that are being installed and want to start any daemons + might fail, let's try to do our best to avoid that. - -- Michael Prokop Wed, 15 Oct 2008 23:20:54 +0200 + -- Michael Prokop Thu, 16 Oct 2008 01:03:24 +0200 grml-live (0.9.4) unstable; urgency=low diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE index 933bb8c..0c46d00 100755 --- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE +++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE @@ -9,18 +9,18 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then ## we want to use our own sources.list: - # skiptask updatebase + skiptask updatebase ## make sure we don't start any daemons - removed ## later on via /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot -# if ! [ -r $target/usr/sbin/policy-rc.d ] ; then -# cat > $target/usr/sbin/policy-rc.d << EOF -##!/bin/sh -## FAI_ACTION=updatebase -#exit 101 -#EOF -# chmod 755 $target/usr/sbin/policy-rc.d -# fi + if ! [ -r $target/usr/sbin/policy-rc.d ] ; then + cat > $target/usr/sbin/policy-rc.d << EOF +#!/bin/sh +# FAI_ACTION=updatebase +exit 101 +EOF + chmod 755 $target/usr/sbin/policy-rc.d + fi # skip the task if we want to build a new ISO only: [ -n "$BUILD_ONLY" ] && skiptask instsoft || /bin/true -- 2.1.4