From f8e8f9adc0ffb74eaeb1a011d501649e0a2320f6 Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Fri, 21 Sep 2007 19:47:39 +0200
Subject: [PATCH] Add fai_dirinstall_check.diff; wvdial preseeding

---
 debian/changelog                             |  1 +
 etc/grml/fai/config/debconf/GRMLBASE         |  1 +
 etc/grml/fai/config/package_config/GRML_FULL | 12 ++++++++++++
 grml-live                                    |  6 +++---
 patches/README                               |  4 ++++
 patches/fai_dirinstall_check.diff            | 12 ++++++++++++
 6 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 patches/fai_dirinstall_check.diff

diff --git a/debian/changelog b/debian/changelog
index 6941e6a..6a4c673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ grml-live (0.0.2) unstable; urgency=low
   * Add support for amd64.
   * Update and extend documentation.
   * Bugfix: Make sure $LOGDIR exists.
+  * fai dirinstall: set hostname via $HOSTNAME
 
  -- Michael Prokop <mika@grml.org>  Fri, 21 Sep 2007 11:46:17 +0200
 
diff --git a/etc/grml/fai/config/debconf/GRMLBASE b/etc/grml/fai/config/debconf/GRMLBASE
index 93f5632..c67ea94 100644
--- a/etc/grml/fai/config/debconf/GRMLBASE
+++ b/etc/grml/fai/config/debconf/GRMLBASE
@@ -1,3 +1,4 @@
 passwd passwd/shadow boolean true
+wvdial wvdial/wvdialconf boolean false
 locales locales/default_environment_locale select en_US.UTF-8
 locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index 0091d7d..bbcb954 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -189,6 +189,18 @@ upgrade-oldest
 zfs-fuse
 zsh-lovers
 
+## Notice: this packages are known to be x86-only currently [2007-09-21]:
+# 3ware-cli-binary aamath aesutil afflib asleap athcool atitvout btsco chntpw
+# cmospwd cpp-2.95 cpuburn-in-binary ctapi-cyberjack ctris dcfldd dd-rhelp
+# deletemail detox dupmerge dupseek dynamic-disk ecryptfs-utils ext3rminator
+# fdflush firescope fnfx-client fnfxd ftpbackup fuseiso9660 fvwm-crystal-minimal
+# gateguardian gatling gifshuffle gkrellm-x86info glipper-nognome heirloom-sh
+# histring hydra i810switch i855crt i8kutils icmp-mtu icmp-quench icmp-reset
+# irpas lcdtest minised nat-traverse orpheus ppmd prosilla pspax pstack ptfinder
+# rainbowcrack replicator rootsh s3switch salvage-ntfs scrounge-ntfs shadowfs
+# shmux sjog speechd-up spicctrl ssdeep sudosh tlswrap toshset toshutils
+# tpm-tools trapdoor2 trousers xserver-xorg-video-amd zfs-fuse
+
 # official Debian packages:
 2vcard
 3270-common
diff --git a/grml-live b/grml-live
index cde31db..19b9cd1 100755
--- a/grml-live
+++ b/grml-live
@@ -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: Fri Sep 21 11:44:43 CEST 2007 [mika]
+# Latest change: Fri Sep 21 17:00:20 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -247,7 +247,7 @@ else
       mkdir -p "${CHROOT_TARGET}/${MIRROR_DIRECTORY}"
       mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_TARGET}/${MIRROR_DIRECTORY}"
    fi
-   fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS | tee -a $LOGFILE
+   fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u "$HOSTNAME" dirinstall "$CHROOT_TARGET" $FAI_ARGS | tee -a $LOGFILE
    umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true
    umount $CHROOT_TARGET/sys  2>/dev/null || /bin/true
    [ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_TARGET}/${MIRROR_DIRECTORY}"
@@ -265,7 +265,7 @@ else
    if [ -n "$ERROR" ] ; then
       log "There was an error during execution of stage 'fai dirinstall' [$(date)]"
       eerror "There was an error during execution of stage 'fai dirinstall'"
-      echo "      Check out /var/log/fai/dirinstall/$HOSTNAME/... for details. [exit ${ERROR}]"
+      echo "   Check out /var/log/fai/dirinstall/$HOSTNAME/ for details. [exit ${ERROR}]"
       eend 1 ; exit 1
    else
       log "Finished execution of stage 'fai dirinstall' [$(date)]"
diff --git a/patches/README b/patches/README
index 8b28ba5..00fc21a 100644
--- a/patches/README
+++ b/patches/README
@@ -5,3 +5,7 @@ Try to provide an "update chroot" action, like:
   # TARGET=/dev/shm/grml_chroot fai -C/etc/grml/fai -cGRMLBASE,I386 dirupdate
 
 Needs work though...
+
+fai_dirinstall_check.diff:
+
+Make sure to exit in fai dirinstall if task instsoft wasn't successfull. 
diff --git a/patches/fai_dirinstall_check.diff b/patches/fai_dirinstall_check.diff
new file mode 100644
index 0000000..69aef39
--- /dev/null
+++ b/patches/fai_dirinstall_check.diff
@@ -0,0 +1,12 @@
+--- /usr/lib/fai/subroutines.orig	2007-09-21 10:46:23.000000000 +0200
++++ /usr/lib/fai/subroutines	2007-09-21 19:36:34.000000000 +0200
+@@ -476,6 +476,9 @@
+     task prepareapt
+     task updatebase
+     task instsoft
++    if grep -q 'E: Sub-process /usr/bin/dpkg returned an error code' $LOGDIR/software.log ; then
++	    die "Error in software installation task."
++    fi
+     task configure
+     task finish
+ 
-- 
2.1.4