SF.net SVN: morphix: [2329] trunk/scripts-base/debian

Revision: 2329
Author:   bmsleight
Date:     2006-06-28 15:09:28 -0700 (Wed, 28 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2329&view=rev

Log Message:
-----------
loading minimodules respects boot_option if this file exists in minimodule

Modified Paths:
--------------
    trunk/scripts-base/debian/changelog
    trunk/scripts-base/etc/init.d/load-minimodules.sh
Modified: trunk/scripts-base/debian/changelog
===================================================================
--- trunk/scripts-base/debian/changelog	2006-06-27 21:35:22 UTC (rev 2328)
+++ trunk/scripts-base/debian/changelog	2006-06-28 22:09:28 UTC (rev 2329)
@@ -1,3 +1,9 @@
+morphix-base-scripts (0.5-59) unstable; urgency=low
+
+  * loading minimodules respects boot_option if this file exists in minimodule
+
+ -- bmsleight <[email protected]>  Wed, 28 Jun 2006 23:00:00 +0100
+
 morphix-base-scripts (0.5-58) unstable; urgency=low
 
   * unionctl path for minimodules

Modified: trunk/scripts-base/etc/init.d/load-minimodules.sh
===================================================================
--- trunk/scripts-base/etc/init.d/load-minimodules.sh	2006-06-27 21:35:22 UTC (rev 2328)
+++ trunk/scripts-base/etc/init.d/load-minimodules.sh	2006-06-28 22:09:28 UTC (rev 2329)
@@ -21,6 +21,8 @@
 . /etc/morphix.d/color.sh
 . /etc/morphix.d/functions.sh
 
+CMDLINE="$(cat /proc/cmdline)"
+
 trymount(){
 # Apparently, mount-aes DOES autodetect AES loopback files.
     [ -b "$1" ] && { mount -t auto -o ro "$1" "$2" 2>/dev/null; RC="$?"; }
@@ -71,6 +73,24 @@
 	    return 1
 	fi
     fi
+    MiniTagBootOption=$(head -n 1 /mnt/main/mnt/mini/mod$count/morphix/boot_option 2>/dev/null)
+    if [ -n "$MiniTagBootOption" ]; then
+	BOOTOPTIONOK=""
+	case "${CMDLINE}" in *\ ${MiniTagBootOption}*) BOOTOPTIONOK="yes"; ;; esac
+	if [ "${MiniTagBootOption}" != "ALL" ]; then
+	    if [ -z "${BOOTOPTIONOK}" ]; then
+                einfo "${GREEN} Boot Option ${RED}${MiniTagBootOption}${NORMAL} not found. Skipping MiniModule.${NORMAL}"
+	        einfo "${GREEN} Boot Options found ${RED}${CMDLINE}${NORMAL}"
+		einfo "${GREEN} Mini: $file ${NORMAL}"
+	        chroot /mnt/main umount /mnt/mini/mod$count
+		chroot /mnt/main rm /dev/cloop$count
+    	        chroot /mnt/main rm /mnt/mini/mod$count
+	        return 1
+            fi
+        fi
+    fi
+    
+    
     echo "$count" > /mnt/mini/num_loaded
 
     # Unionfs overlaying (only if unionctl exists and the root dir in the minimodule exists


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642