[Fai-commit] r5966 - in branches/stable/3.4: debian lib

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:51:57 +0000 (Tue, 17 Aug 2010)
New Revision: 5966

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/lib/mkramdisk
Log:
mkramdisk: use exit in main routine (closes: #583289)


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:51:51 UTC (rev 5965)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:51:57 UTC (rev 5966)
@@ -2,8 +2,9 @@
 
   [ Thomas Lange ]
   * make-fai-nfsroot: fix typo
+  * mkramdisk: use exit in main routine (closes: #583289)
 
- -- Thomas Lange <lange at debian.org>  Sun, 11 Apr 2010 12:38:00 +0200
+ -- Thomas Lange <lange at debian.org>  Mon, 31 May 2010 16:50:25 +0200
 
 fai (3.3.5) unstable; urgency=high
 

Modified: branches/stable/3.4/lib/mkramdisk
===================================================================
--- branches/stable/3.4/lib/mkramdisk	2010-08-17 12:51:51 UTC (rev 5965)
+++ branches/stable/3.4/lib/mkramdisk	2010-08-17 12:51:57 UTC (rev 5966)
@@ -75,7 +75,7 @@
 shift $(($OPTIND - 1))
 
 # do not use the ramdisk if FAI_NORAMDISK is set to 1
-[ X$FAI_NORAMDISK = X1 ] && return
+[ X$FAI_NORAMDISK = X1 ] && exit 0
 
 for d in "$@"; do
     if [ $umount -eq 1 ]; then