[Fai-commit] r3057 - in trunk: bin debian

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-11-14 16:41:32 +0000 (Mon, 14 Nov 2005)
New Revision: 3057

Modified:
   trunk/bin/fai-cd
   trunk/debian/changelog
Log:
fai-cd: add tests if nfsroot was created (#317495) and if mkisofs is available (#334871)


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2005-11-14 16:18:29 UTC (rev 3056)
+++ trunk/bin/fai-cd	2005-11-14 16:41:32 UTC (rev 3057)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 1.2.2"
+version="fai-cd 1.2.3"
 
 isoversion="$version -- build $(date '+%c')"
 vname="Fully Automatic Installation CD"
@@ -255,7 +255,10 @@
 [ -f "$grub_config" ] || die 6 "Grub menu file $grub_config not found."
 [ `id -u` -ne 0 ]     && die 9 "Run this program as root."
 
-[ -x "$(which mkinitrd-cd)" ] || die 4 "mkinitrd-cd not found. Please install package."
+[ -x "$(which mkinitrd-cd)" ] || die 7 "mkinitrd-cd not found. Please install package."
+[ -x "$(which mkisofs)" ] || die 8 "mkisofs not found. Please install package."
+[ -d "$NFSROOT/etc/fai" ] || die 10 "Please create NFSROOT by calling make-fai-nfsroot or fai-setup."
+
 tmp=$(mktemp -t -d fai-cd.XXXXXX)
 kernelversion=$(ls -tr $NFSROOT/boot/vmlinu?-* | tail -1 | sed -e 's#.*/vmlinuz-##')
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-14 16:18:29 UTC (rev 3056)
+++ trunk/debian/changelog	2005-11-14 16:41:32 UTC (rev 3057)
@@ -7,9 +7,10 @@
   * increase compat level to 4
   * delete sunos code from source
   * scripts/ directory is now bin/
-  * fixed fai-cd hardcoded sources.list for the install client to be
+  * fai-cd: fixed hardcoded sources.list for the install client to be
     generated, code by Michael Tautschnig (closes: #320024) and at least
-    partially #329547
+    partially #329547, test if nfsroot was created (closes: #317495), test
+    if mkisofs is available (closes: #334871)
   * install_packages: ignore packages ending with - when using -d
     (closes: #334333)
   * lib/create_ramdisk: make /etc/network/run/ifstate writable
@@ -17,10 +18,10 @@
   * fai-mirror: add -i to egrep (closes: #312508)
   * fai-do-scripts: do not execute S[0-9][0-9]* any more (closes: #310999)
   * fcopy: add preinst support, fix for inforing .svn dirs (closes: #297550)
-  * fai-guide.sgml: include README.disk_config into fai guide, minor fixes,
-    (closes: #332295, #332318, #332293, #332291)
+  * fai-guide.sgml: include README.disk_config into fai guide, minor
+    fixes, (closes: #332295, #332318, #332293, #332291)
   
- -- Thomas Lange <lange at debian.org>  Mon, 14 Nov 2005 17:17:55 +0100
+ -- Thomas Lange <lange at debian.org>  Mon, 14 Nov 2005 17:38:40 +0100
 
 fai (2.8.4) unstable; urgency=high