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

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-12-02 13:47:07 +0000 (Fri, 02 Dec 2005)
New Revision: 3134

Modified:
   trunk/bin/fai-cd
   trunk/bin/fai-mirror
   trunk/debian/changelog
Log:
check if $FAI_CONFIGDIR is valid (closes: #334577)


Modified: trunk/bin/fai-cd
===================================================================
--- trunk/bin/fai-cd	2005-12-02 13:05:30 UTC (rev 3133)
+++ trunk/bin/fai-cd	2005-12-02 13:47:07 UTC (rev 3134)
@@ -30,7 +30,7 @@
 #*********************************************************************
 
 set -e 
-version="fai-cd 1.2.6"
+version="fai-cd 1.2.7"
 
 isoversion="$version -- build $(date '+%c')"
 vname="Fully Automatic Installation CD"
@@ -264,6 +264,10 @@
 [ -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."
 
+[ -z "$FAI_CONFIGDIR" ]  && die 14 "Variable \$FAI_CONFIG not set."
+[ -d $FAI_CONFIGDIR ] || die 15 "Can't find config space $FAI_CONFIGDIR."
+[ -d $FAI_CONFIGDIR/class ] || die 16 "Config space $FAI_CONFIGDIR seems to be empty."
+
 tmp=$(mktemp -t -d fai-cd.XXXXXX) || exit 13
 kernelversion=$(ls -tr $NFSROOT/boot/vmlinu?-* | tail -1 | sed -e 's#.*/vmlinuz-##')
 

Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror	2005-12-02 13:05:30 UTC (rev 3133)
+++ trunk/bin/fai-mirror	2005-12-02 13:47:07 UTC (rev 3134)
@@ -25,7 +25,7 @@
 # MA 02111-1307, USA.
 #*********************************************************************
 
-version="Version 1.4.2, 23-nov-2005"
+version="Version 1.4.3, 2-dec-2005"
 
 # variables: NFSROOT, FAI_CONFIGDIR
 # NFSROOT_PACKAGES, packages from make-fai-nfsroot.conf
@@ -244,6 +244,8 @@
     die 3 "Please first remove $mirrordir/pool and $mirrordir/dists"
 fi
 
+[ -d $FAI_CONFIGDIR/package_config ] || die 6 "Can't find package config files in $FAI_CONFIGDIR."
+
 initialize
 
 # if we are using nfs mounts for Debian mirror, this may fail here, since inside a chroot environment different dir are used

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-02 13:05:30 UTC (rev 3133)
+++ trunk/debian/changelog	2005-12-02 13:47:07 UTC (rev 3134)
@@ -11,7 +11,7 @@
     generated, code by Michael Tautschnig (closes: #320024) and at least
     partially #329547, test if nfsroot was created (closes: #317495), test
     if mkisofs is available (closes: #334871), exist unless arch is i386
-    or amd64 (closes: #339098)
+    or amd64 (closes: #339098), check if $FAI_CONFIGDIR is valid
   * install_packages: ignore packages ending with - when using -d
     (closes: #334333), remove backtick evaluation (closes: #322157), add
     -R to default aptitude call, add aptitude-r for download only mode
@@ -20,7 +20,7 @@
   * fai-mirror: add -i to egrep (closes: #312508), add option
     DPkg::force-conflicts::=yes (closes: #328138), only aptitude can
     install conflicting packages, test if $mirrordir starts with a slash
-    (closes: #328139)
+    (closes: #328139), check if $FAI_CONFIGDIR is valid (closes: #334577)
   * fai-do-scripts: do not execute S[0-9][0-9]* any more (closes: #310999)
   * fcopy: add preinst support, ignore .svn dirs (closes: #297550), do
     chroot before using getpwnam (closes: #283475), add option -U