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

[fai-repository at svn.debian.org]

Author: lange
Date: 2005-12-05 22:51:56 +0000 (Mon, 05 Dec 2005)
New Revision: 3153

Modified:
   trunk/bin/fai-setup
   trunk/bin/make-fai-nfsroot
   trunk/debian/fai-quickstart.postinst
Log:
remove some "|| true"


Modified: trunk/bin/fai-setup
===================================================================
--- trunk/bin/fai-setup	2005-12-05 18:02:34 UTC (rev 3152)
+++ trunk/bin/fai-setup	2005-12-05 22:51:56 UTC (rev 3153)
@@ -147,7 +147,7 @@
     echo "Using /usr/local/share/fai as default."
     FAI_CONFIGDIR=/usr/local/share/fai
 fi
-mkdir -p $FAI_CONFIGDIR || true
+[ -d $FAI_CONFIGDIR ] || mkdir -p $FAI_CONFIGDIR
 
 # in expert mode, do not export nfs directories
 if [ -z "$expert" ]; then

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2005-12-05 18:02:34 UTC (rev 3152)
+++ trunk/bin/make-fai-nfsroot	2005-12-05 22:51:56 UTC (rev 3153)
@@ -395,7 +395,7 @@
     local pxebin=/usr/lib/syslinux/pxelinux.0
     cp -p $NFSROOT/boot/$kfile-$KERNELVERSION /boot/fai/$kfile-install
     [ -f $pxebin ] && cp $pxebin /boot/fai
-    [ -d /boot/fai/pxelinux.cfg ] || mkdir -p /boot/fai/pxelinux.cfg || true
+    [ -d /boot/fai/pxelinux.cfg ] || mkdir -p /boot/fai/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	2005-12-05 18:02:34 UTC (rev 3152)
+++ trunk/debian/fai-quickstart.postinst	2005-12-05 22:51:56 UTC (rev 3153)
@@ -18,7 +18,7 @@
     configure)
 	. /etc/fai/fai.conf
 	if [ ! -d $FAI_CONFIGDIR/class ]; then
-	    mkdir -p $FAI_CONFIGDIR || true
+	    [ -d $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