[Fai-commit] r4898 - people/faiguy/bugfixes/480830/bin

meissner-guest at alioth.debian.org meissner-guest at alioth.debian.org
Mon May 12 10:17:55 UTC 2008


Author: meissner-guest
Date: 2008-05-12 10:17:54 +0000 (Mon, 12 May 2008)
New Revision: 4898

Modified:
   people/faiguy/bugfixes/480830/bin/fai-cd
Log:
fixed issues from #480830



Modified: people/faiguy/bugfixes/480830/bin/fai-cd
===================================================================
--- people/faiguy/bugfixes/480830/bin/fai-cd	2008-05-12 10:16:14 UTC (rev 4897)
+++ people/faiguy/bugfixes/480830/bin/fai-cd	2008-05-12 10:17:54 UTC (rev 4898)
@@ -177,8 +177,10 @@
 # mirror location for fai CD, file generated by fai-cd
 EOF
 
-    dists=$(find $mirrordir -name "Packages*" | grep binary | sed 's/binary-.*//' | \
-         sed "s#$mirrordir/*dists/##" | xargs -n 1 dirname | uniq )
+	if [ -n "$(ls -A $mirrordir)" ]; then
+    	dists=$(find $mirrordir -name "Packages*" | grep binary | sed 's/binary-.*//' | \
+        	sed "s#$mirrordir/*dists/##" | xargs -n 1 dirname | uniq )
+	fi
 
     for i in $dists ; do
 	comp=$(find $mirrordir/dists/$i -maxdepth 2 -type d -name "binary-*" | \
@@ -256,7 +258,7 @@
     cfdir=$FAI_ETC_DIR
 fi
 [ -n "$cdir" ] && cfdir=$cdir
-${cfdir:=/etc/fai}
+cfdir=${cfdir:=/etc/fai}
 cfdir=$(readlink -f $cfdir) # canonicalize path
 if [ ! -d "$cfdir" ]; then
     echo "$cfdir is not a directory"




More information about the Fai-commit mailing list