[Fai-commit] r5726 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2010-02-18 14:19:09 +0000 (Thu, 18 Feb 2010)
New Revision: 5726

Modified:
   trunk/debian/changelog
   trunk/lib/mkramdisk
Log:
mkramdisk: do nothing if the variable FAI_NORAMDISK is set to 1

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-02-17 12:33:29 UTC (rev 5725)
+++ trunk/debian/changelog	2010-02-18 14:19:09 UTC (rev 5726)
@@ -1,6 +1,8 @@
 fai (3.3.4~beta1) unstable; urgency=low
 
+  [ Thomas Lange ]
   * make-fai-nfsroot: fix matching of hook names
+  * mkramdisk: do nothing if the variable FAI_NORAMDISK is set to 1
 
  -- Thomas Lange <lange at debian.org>  Wed, 17 Feb 2010 13:32:51 +0100
 

Modified: trunk/lib/mkramdisk
===================================================================
--- trunk/lib/mkramdisk	2010-02-17 12:33:29 UTC (rev 5725)
+++ trunk/lib/mkramdisk	2010-02-18 14:19:09 UTC (rev 5726)
@@ -74,6 +74,9 @@
 done
 shift $(($OPTIND - 1))
 
+# do not use the ramdisk if FAI_NORAMDISK is set to 1
+[ X$FAI_NORAMDISK = X1 ] && return
+
 for d in "$@"; do
     if [ $umount -eq 1 ]; then
 	umount_ramdisk $d