From 0c368aea30a3e6175016922c19630dc7d7fac0fb Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 16 Dec 2010 17:45:08 +0100
Subject: [PATCH] Make sure to always clean up on exit.

---
 scripts/grml-udev-rebuildfstab | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/grml-udev-rebuildfstab b/scripts/grml-udev-rebuildfstab
index 53521c8..9181b74 100755
--- a/scripts/grml-udev-rebuildfstab
+++ b/scripts/grml-udev-rebuildfstab
@@ -50,7 +50,7 @@ fi
 
 
 if grep -q " nofstab" /proc/cmdline ; then
-   exit
+   bailout 0
 fi
 
 grep -q 'nolabel' /proc/cmdline && NOLABEL='TRUE' || LABEL='TRUE'
@@ -58,13 +58,13 @@ grep -q 'nolabel' /proc/cmdline && NOLABEL='TRUE' || LABEL='TRUE'
 
 
 if [ "$CONFIG_FSTAB" = "no" ] ; then
-    exit
+    bailout 0
 fi
 
 
 if grep -q ' /mnt ' /proc/mounts ; then
    logit '/mnt is a mounted directory, exiting.'
-   exit 1
+   bailout 1
 fi
 
 # make sure we have the $MNTFILE before reading/writing into it
@@ -106,7 +106,7 @@ fi
 
 [ ! -w /etc/fstab ] && {
   logit "fatal - /etc/fstab not writeable, exiting"
-  exit
+  bailout 0
 }
 
 # Simple shell grep, searches for lines STARTING with string
@@ -185,13 +185,13 @@ fi
 
 if [ -z "$ACTION" ] ; then
     logit "Seems that $0 is not run in a udev environment, exiting." >&2
-    exit 1
+    bailout 1
 fi
 
 # ignore loop devices for now.
 case $DEVNAME in
 /dev/loop*)
-	exit 0
+	bailout 0
 	;;
 esac
 
@@ -209,11 +209,11 @@ mountpoint=$(get_mount_point $device)
 for devicelink in $DEVLINKS ; do
     # ignore external
     case "$devicelink" in "*external*") continue ;; esac
-    stringinfile $devicelink $TMPFILE && exit
+    stringinfile $devicelink $TMPFILE && bailout 0
 done
 
 # if entry is already present ignore it
-stringinfile $device $TMPFILE && exit
+stringinfile $device $TMPFILE && bailout 0
 
 options=noauto,user,dev,suid,exec
 case $ID_FS_TYPE in
@@ -278,4 +278,6 @@ if [ -r "$MNTFILE" ] ; then
    cat $TMPFILE > $MNTFILE
 fi
 
+bailout 0
+
 ## END OF FILE #################################################################
-- 
2.1.4