From: Michael Prokop <mika@grml.org>
Date: Wed, 15 Oct 2008 21:21:19 +0000 (+0200)
Subject: Drop the /etc/grml/fai/apt/sources.list workaround for softupdate for now
X-Git-Tag: v0.9.5~7
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=c8546cb8d8d0870c6993343a7b5cfe27694cbf4e;hp=e633958a4e70261c7973b755c41c218fa6a8f1a8

Drop the /etc/grml/fai/apt/sources.list workaround for softupdate for now
---

diff --git a/debian/changelog b/debian/changelog
index d407cd3..879b58c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,9 @@ 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.
-  * Install policy-rc.d via /etc/grml/fai/config/hooks/updatebase.GRMLBASE,
-    otherwise installing additional software will fail if any daemons
-    are started up and /proc (mounted via FAI's updatebase) is missing.
+  * Drop the /etc/grml/fai/apt/sources.list workaround for softupdate for now.
 
- -- Michael Prokop <mika@grml.org>  Wed, 15 Oct 2008 23:03:15 +0200
+ -- Michael Prokop <mika@grml.org>  Wed, 15 Oct 2008 23:20:54 +0200
 
 grml-live (0.9.4) unstable; urgency=low
 
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 4707fa9..ad9f199 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -4,7 +4,6 @@
 # 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: Sat Apr 12 21:35:03 CEST 2008 [mika]
 ################################################################################
 
 set -u
@@ -57,14 +56,18 @@ EOF
       fi
    fi
 
+   # 081015: deactivated because it seems to be unnecessary for
+   #         stable release maintenance - keep the code for now
+   #         if we re-notice any problems
+   #
    # FAI softupdate executes upgrade only with the sources.list being
    # present in the chroot :-/ - so let's do it on our own:
-   if [ -r /etc/grml/fai/apt/sources.list ] ; then
-      if [ -L $target/etc/apt/sources.list ] ; then
-         rm $target/etc/apt/sources.list
-      fi
-      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
-   fi
+#   if [ -r /etc/grml/fai/apt/sources.list ] ; then
+#      if [ -L $target/etc/apt/sources.list ] ; then
+#         rm $target/etc/apt/sources.list
+#      fi
+#      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
+#   fi
 
    # run it on our own, as updatebase is used at the wrong stage for our needs,
    # see /etc/grml/fai/config/hooks/updatebase.GRMLBASE
diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 00680f2..d50e600 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -8,17 +8,19 @@
 
 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
 fi