From: Michael Prokop <devnull@localhost>
Date: Sun, 4 Nov 2007 10:21:30 +0000 (+0100)
Subject: Set EXITSTATUS in /etc/policy-rc.d.conf
X-Git-Tag: 0.0.8~26
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=9838a1360e0675cc06ef853848d42793c51e3701

Set EXITSTATUS in /etc/policy-rc.d.conf
---

diff --git a/debian/changelog b/debian/changelog
index 4ebbf93..ee21d4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ grml-live (0.0.8) unstable; urgency=low
     /var/run/fai/FAI_INSTALLATION_IN_PROGRESS if we exit grml-live.
     (FAI's softupdate currently does not clean up when canceling
     the process.)
+  * Set EXITSTATUS in /etc/policy-rc.d.conf of chroot to 101 for
+    softupdate action.
 
  -- Michael Prokop <mika@grml.org>  Sun, 04 Nov 2007 01:43:06 +0100
 
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 63ae67d..447b40e 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 <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 Nov 04 11:08:53 CET 2007 [mika]
+# Latest change: Sun Nov 04 11:21:02 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -22,7 +22,11 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
      else
         cat /etc/resolv.conf >> $target/etc/resolv.conf
      fi
-  fi
+   fi
+
+   if [ -r $target/etc/policy-rc.d.conf ] ; then
+      sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf
+   fi
 
    # make sure we prefer grml repository:
    if [ -r /etc/grml/fai/apt/preferences ] ; then
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
index 7b03524..77ebe56 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -4,7 +4,7 @@
 # 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: Thu Nov 01 16:19:52 CET 2007 [mika]
+# Latest change: Sun Nov 04 11:20:55 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -17,7 +17,10 @@ if [ -r $target/etc/apt/apt.conf ] ; then
    sed -i "s#APT::Install-Recommends.*#// &#"       $target/etc/apt/apt.conf
 fi
 
-
+# Restore original state from softupdate:
+if [ -r $target/etc/policy-rc.d.conf ] ; then
+   sed -i "s/EXITSTATUS='101'/EXITSTATUS='0'/" $target/etc/policy-rc.d.conf
+fi
 
 # remove an existing /etc/debian_chroot file:
 if [ -r $target/etc/debian_chroot ] ; then