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

[Thomas Lange]

Author: lange
Date: 2010-06-22 16:33:36 +0000 (Tue, 22 Jun 2010)
New Revision: 5815

Modified:
   trunk/bin/make-fai-nfsroot
   trunk/debian/changelog
Log:
  remove unneeded else

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-06-22 16:29:23 UTC (rev 5814)
+++ trunk/bin/make-fai-nfsroot	2010-06-22 16:33:36 UTC (rev 5815)
@@ -288,15 +288,15 @@
 
     if [ ! -r "$basetgz" ] ; then
       die "Specified $basetgz could not be used."
-    else
-       if cd $NFSROOT ; then
-	 printf "Extracting $basetgz: "
-	 tar -C $NFSROOT -zxpf "$basetgz" || die "Error while extracting ${basetgz} in ${NFSROOT}."
-	 cp "$basetgz" $NFSROOT/var/tmp/base.tgz
-	 touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT
-	 echo done
-       fi
     fi
+
+    if cd $NFSROOT ; then
+      printf "Extracting $basetgz: "
+      tar -C $NFSROOT -zxpf "$basetgz" || die "Error while extracting ${basetgz} in ${NFSROOT}."
+      cp "$basetgz" $NFSROOT/var/tmp/base.tgz
+      touch $NFSROOT/.THIS_IS_THE_FAI_NFSROOT
+      echo done
+    fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 create_nfsroot() {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-06-22 16:29:23 UTC (rev 5814)
+++ trunk/debian/changelog	2010-06-22 16:33:36 UTC (rev 5815)
@@ -10,6 +10,7 @@
   * make-fai-nfsroot, make-fai-nfsroot.8: add option -B, (closes: #576092)
     (thanks to Mika Prokop for the patch)
     copy pxelinux.0 to TFTPROOT only if it's not already existing
+    remove unneeded else
   * disk-info: rename subroutine
   * faimond-gui: Tk::Balloon is not used atm.
   * subroutines: show rx and tx bytes for network device at the end