From 1227c08ee615f11dcd8566b0408045eae2525522 Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Sun, 9 Dec 2007 19:10:24 +0100
Subject: [PATCH] Skip stage updatebase when using softupdate

---
 debian/changelog                              |  2 ++
 etc/grml/fai/config/hooks/instsoft.GRMLBASE   |  2 ++
 etc/grml/fai/config/hooks/updatebase.GRMLBASE | 15 +++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100755 etc/grml/fai/config/hooks/updatebase.GRMLBASE

diff --git a/debian/changelog b/debian/changelog
index 96c467a..6429a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ grml-live (0.0.12) unstable; urgency=low
   * Do not install package 'grml' via GRMLBASE because we want
     to use grml-small in GRML_SMALL and GRML_MEDIUM.
   * Do not exit if cleanup of /root directory in 98-clean-chroot fails.
+  * Skip stage updatebase when using softupdate and handle upgrade
+    on our own via hooks.
 
  -- Michael Prokop <mika@grml.org>  Sun, 09 Dec 2007 17:28:01 +0100
 
diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 0503311..ecf6772 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -66,6 +66,8 @@ EOF
       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
    $ROOTCMD apt-get update
    if [ -x $target/usr/bin/aptitude ] ; then
       if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
new file mode 100755
index 0000000..b47973c
--- /dev/null
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Filename:      /etc/grml/fai/config/hooks/updatebase.GRMLBASE
+# Purpose:       skip task updatebase of FAI when running softupdate
+# 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 Dec 09 19:07:51 CET 2007 [mika]
+################################################################################
+
+if [ "$FAI_ACTION" = "softupdate" ] ; then
+   skiptask updatebase
+fi
+
+## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
-- 
2.1.4