[Devil-linux-commit] build/config/etc/init.d mountfs,1.28,1.29

[<bl...@us...>]

Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory sc8-pr-cvs1:/tmp/cvs-serv25372

Modified Files:
	mountfs 
Log Message:
Fixed swap not being activated.


Index: mountfs
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/mountfs,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mountfs	26 Dec 2003 03:16:20 -0000	1.28
+++ mountfs	30 Dec 2003 18:32:34 -0000	1.29
@@ -50,29 +50,25 @@
 
 lvm_mount ()
 {
-	[ ! -d $LD ] && mkdir -p $LD &> /dev/null
-	if [ -d $LD ]; then
-		case $LT in
-			swap )
-				echo -n "Activating swap $lv_done"
-				swapon /dev/$LVMSYS/$LV &> /dev/null
-				evaluate_retval
-				;;
-			* )
-
-				[ "$L2" -gt "0" ] && \
-					/sbin/fsck -a -C -T /dev/$LVMSYS/$LV
-				echo -n "Mounting $LD $lv_done"
-				mount -t"$LT" -o"$LO" /dev/$LVMSYS/$LV $LD
-				evaluate_retval
-				if [ $(echo "$LO" | grep -c quota) -eq 1 ]; then
-					modprobe quota_v2 > /dev/null
-					quotaon $LD
-				fi
-				;;
-		esac
+	if [ $LT = "swap" ]; then
+		echo -n "Activating swap $lv_done"
+		swapon /dev/$LVMSYS/$LV &> /dev/null
+		evaluate_retval
 	else
-		echo "ERROR: cannot create directory: $LD,  $LV not mounted"
+		[ ! -d $LD ] && mkdir -p $LD &> /dev/null
+		if [ -d $LD ]; then
+			[ "$L2" -gt "0" ] && \
+				/sbin/fsck -a -C -T /dev/$LVMSYS/$LV
+			echo -n "Mounting $LD $lv_done"
+			mount -t"$LT" -o"$LO" /dev/$LVMSYS/$LV $LD
+			evaluate_retval
+			if [ $(echo "$LO" | grep -c quota) -eq 1 ]; then
+				modprobe quota_v2 > /dev/null
+				quotaon $LD
+			fi
+		else
+			echo "ERROR: cannot create directory: $LD,  $LV not mounted"
+		fi
 	fi
 }