[Fai-commit] r4365 - in trunk: bin debian examples/simple/scripts/FAIBASE lib

[lange at alioth.debian.org]

Author: lange
Date: 2007-06-23 21:38:38 +0000 (Sat, 23 Jun 2007)
New Revision: 4365

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/fai-quickstart.postinst
   trunk/examples/simple/scripts/FAIBASE/20-removable_media
   trunk/lib/mount2dir
   trunk/lib/subroutines
Log:
use mkdir -p


Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2007-06-23 20:37:03 UTC (rev 4364)
+++ trunk/bin/make-fai-nfsroot	2007-06-23 21:38:38 UTC (rev 4365)
@@ -112,7 +112,7 @@
 ROOTCMD="chroot $NFSROOT"
 
 RUNDIR=/var/run/fai/make-fai-nfsroot
-[ ! -d $RUNDIR ] && mkdir -p $RUNDIR
+mkdir -p $RUNDIR
 export DEBIAN_FRONTEND=noninteractive
 [ "$recover" ] || rm -rf $RUNDIR/*
 
@@ -401,7 +401,7 @@
     cp -pv $NFSROOT/boot/$ifile-* $TFTPROOT
 #    echo "Kernel $KERNELVERSION copied to $TFTPROOT/$kernelname"
     [ -f $pxebin ] && cp $pxebin $TFTPROOT
-    [ -d $TFTPROOT/pxelinux.cfg ] || mkdir -p $TFTPROOT/pxelinux.cfg
+    mkdir -p $TFTPROOT/pxelinux.cfg
     echo "DHCP environment prepared. If you want to use it, you have to enable the dhcpd and the tftp-hpa daemon."
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

Modified: trunk/debian/fai-quickstart.postinst
===================================================================
--- trunk/debian/fai-quickstart.postinst	2007-06-23 20:37:03 UTC (rev 4364)
+++ trunk/debian/fai-quickstart.postinst	2007-06-23 21:38:38 UTC (rev 4365)
@@ -18,7 +18,7 @@
     configure)
 	. /etc/fai/fai.conf
 	if [ ! -d $FAI_CONFIGDIR/class ]; then
-	    [ -d $FAI_CONFIGDIR ] || mkdir -p $FAI_CONFIGDIR
+	    mkdir -p $FAI_CONFIGDIR
 	    cp -a /usr/share/doc/fai-doc/examples/simple/* $FAI_CONFIGDIR
 	    echo "Simple examples copied to config space $FAI_CONFIGDIR."
 	fi

Modified: trunk/examples/simple/scripts/FAIBASE/20-removable_media
===================================================================
--- trunk/examples/simple/scripts/FAIBASE/20-removable_media	2007-06-23 20:37:03 UTC (rev 4364)
+++ trunk/examples/simple/scripts/FAIBASE/20-removable_media	2007-06-23 21:38:38 UTC (rev 4365)
@@ -21,7 +21,7 @@
 i=0
 for cdrom in $(cdromlist | tac); do
     [ $i -eq 0 ] && ln -s cdrom0 $target/media/cdrom
-    [ -d $target/media/cdrom$i ] || mkdir $target/media/cdrom$i
+    mkdir -p $target/media/cdrom$i
     fstabline /dev/$cdrom /media/cdrom$i udf,iso9660 ro,user,noauto 0 0
     i=$(($i + 1))
 done

Modified: trunk/lib/mount2dir
===================================================================
--- trunk/lib/mount2dir	2007-06-23 20:37:03 UTC (rev 4364)
+++ trunk/lib/mount2dir	2007-06-23 21:38:38 UTC (rev 4365)
@@ -78,7 +78,7 @@
 	    # overwrite mount options
 	    mopt="-o $mopt"
 	    [ "$moptions" ] && mopt="-o $moptions"
-	    [ -d $target/$mountpoint ] || mkdir -p $target$mountpoint
+	    mkdir -p $target$mountpoint
 	    if [ $debug ]; then
 		echo "Mounting $device to $target$mountpoint type: $fstype opt: $mopt"
 	    else

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2007-06-23 20:37:03 UTC (rev 4364)
+++ trunk/lib/subroutines	2007-06-23 21:38:38 UTC (rev 4365)
@@ -382,8 +382,8 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 task_savelog() {
 
-    [ -d $FAI_ROOT/var/lib/fai ] || mkdir -p $FAI_ROOT/var/lib/fai
-    [ -d $FAI_ROOT/var/log/fai ] || mkdir -p $FAI_ROOT/var/log/fai
+    mkdir -p $FAI_ROOT/var/lib/fai
+    mkdir -p $FAI_ROOT/var/log/fai
     fai-savelog -l
     [ -f $LOGDIR/FAI_CLASSES ] && cp -pu $LOGDIR/FAI_CLASSES $FAI_ROOT/var/lib/fai
     [ -f $LOGDIR/disk_var.sh ] && cp -pu $LOGDIR/disk_var.sh $FAI_ROOT/var/lib/fai