[Morphix-cvs] SF.net SVN: morphix: [2622] trunk/scripts-base

[<ale...@us...>]

Revision: 2622
          http://morphix.svn.sourceforge.net/morphix/?rev=2622&view=rev
Author:   alextreme
Date:     2008-04-05 06:27:18 -0700 (Sat, 05 Apr 2008)

Log Message:
-----------
 * another list of base-script modifications (automatic startup of cups, networkmanager, ntp, /media fixes)

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/knoppix-autoconfig
    trunk/scripts-base/etc/init.d/load-minimodules.sh
    trunk/scripts-base/etc/init.d/morphix-start
    trunk/scripts-base/usr/sbin/rebuildfstab-morphix

Modified: trunk/scripts-base/etc/init.d/knoppix-autoconfig
===================================================================
--- trunk/scripts-base/etc/init.d/knoppix-autoconfig	2008-03-30 20:09:22 UTC (rev 2621)
+++ trunk/scripts-base/etc/init.d/knoppix-autoconfig	2008-04-05 13:27:18 UTC (rev 2622)
@@ -642,11 +642,7 @@
     done </etc/fstab
 fi
 
-# Mount all filesystems listed in fstab (read-only)
 # fstab has been generated by rebuildfstab-morphix in knoppix-autoconfig
-
-mount -a -r
-
 # Proc and sys need to be writable
 
 mount -t proc proc /proc 2>/dev/null

Modified: trunk/scripts-base/etc/init.d/load-minimodules.sh
===================================================================
--- trunk/scripts-base/etc/init.d/load-minimodules.sh	2008-03-30 20:09:22 UTC (rev 2621)
+++ trunk/scripts-base/etc/init.d/load-minimodules.sh	2008-04-05 13:27:18 UTC (rev 2622)
@@ -25,25 +25,23 @@
     countarg="$2"
     count=$(($countarg+2)) # we have a base module, and a mainmodule loaded
 
-    # /etc/init.d/morphix-start will mount cdrom minimodules.
-    # But just incase
-    if [ ! -d /mnt/main/mnt/mini/mod$count ]; then
-	chroot /mnt/main mkdir /mnt/mini/mod$count
+    if [ ! -d /mnt/mini/mod$count ]; then
+	mkdir -p /mnt/mini/mod$count
 	# this not chrooted, so mount_module only needs to be in base
-	mount_module $file /mnt/main/mnt/mini/mod$count $count >/dev/null 2>&1
+	mount_module $file /mnt/mini/mod$count $count >/dev/null 2>&1
     fi
    
     echo "$count" > /mnt/mini/num_loaded
 
     # Unionfs overlaying
     # Add the /root dir to be the unionfs branch after the first component (which should be 0 and rw...)
-    if [ -d /mnt/main/mnt/mini/mod$count/root ]; then
-	mount -t unionfs -o remount,add=:/mnt/main/mnt/mini/mod$count/root=ro none /mnt/main
+    if [ -d /mnt/mini/mod$count/root ]; then
+	mount -t unionfs -o remount,add=:/mnt/mini/mod$count/root=ro none /
     fi
 
-    if [ -e /mnt/main/mnt/mini/mod$count/morphix/loadmod.sh ]; then
+    if [ -e /mnt/mini/mod$count/morphix/loadmod.sh ]; then
 	einfo "Starting /mnt/mini/mod$count/morphix/loadmod.sh"
-	chroot /mnt/main sh /mnt/mini/mod$count/morphix/loadmod.sh /mnt/mini/mod$count
+	sh /mnt/mini/mod$count/morphix/loadmod.sh /mnt/mini/mod$count
     else
 	einfo "Not able to find /mnt/mini/mod$count/morphix/loadmod.sh, continuing"
     fi
@@ -65,7 +63,6 @@
 NOUSB="$(getbootparam nousb)"
 if [ -z "$NOUSB" ]; then
     einfo "Checking for MiniModules on connected devices"
-    modprobe usb-storage >/dev/null 2>&1
     
     MiniModules="$(ls /media/*/minimod/*.mod 2> /dev/null)"
     for file in $MiniModules 
@@ -75,16 +72,5 @@
     done
 fi
 
-# checks for all minimodules on /cdrom/minimod
 
-echo 
-einfo "Checking for MiniModules on CDROM"
-CdromMiniModules="$(ls /cdrom/minimod/*.mod 2> /dev/null )"
-for file in $CdromMiniModules 
-  do
-  load_mini_module "$file" $MiniModuleCount
-  ((MiniModuleCount += 1))
-done
 
-# All changes have been made, ready to chroot to MainModule
-

Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2008-03-30 20:09:22 UTC (rev 2621)
+++ trunk/scripts-base/etc/init.d/morphix-start	2008-04-05 13:27:18 UTC (rev 2622)
@@ -243,7 +243,7 @@
 mkdir /mnt/main/floppy >/dev/null 2>&1
 
 mount --bind /mnt /mnt/main/mnt
-mount --bind /media /mnt/main/media
+mount --bind -o ro /media/cdrom /mnt/main/media/cdrom
 mount --bind -o ro /cdrom /mnt/main/cdrom
 
 chroot /mnt/main mount -t sysfs /sys /sys > /dev/null 2>&1
@@ -257,6 +257,7 @@
 cp -af /MorphixCD/etc/localtime /mnt/main/etc/localtime >/dev/null 2>&1
 cp -af /etc/filesystems /mnt/main/etc/filesystems >/dev/null 2>&1
 cp -af /etc/modules.conf /mnt/main/etc/modules.conf >/dev/null 2>&1
+cp -af /MorphixCD/etc/morphix.d /mnt/main/etc/morphix.d >/dev/null 2>&1
 
 #Copy alsa aliases
 if [ -n "$SOUND_DRIVER" ];then
@@ -291,6 +292,9 @@
 # detected filesystems
 cp -af /etc/fstab /mnt/main/etc/fstab
 
+# Mount all filesystems
+chroot /mnt/main mount -a -F 
+
 # network stuff
 cp -af /etc/network/* /mnt/main/etc/network/ >/dev/null 2>&1
 
@@ -485,12 +489,64 @@
     echo "nameserver $ETHDNS" >> /mnt/main/etc/resolv.conf
 fi
 
+####
+#
+# Start Network Time Protocol daemon, if it exists
+#
+####
+
+NONTP="$(getbootparam nontp)"
+
+if [ -z "$NONTP" ]; then
+  if [ -e /mnt/main/etc/init.d/ntp ]; then
+    chroot /mnt/main /etc/init.d/ntp start &
+  fi
+fi
+
+####
+#
+# Start cups, if it exists in the main module
+#
+####
+
+NOPRINTING="$(getbootparam noprinting)"
+
+if [ -z "$NOPRINTING" ]; then
+  if [ -e /mnt/main/etc/init.d/cupsys ]; then
+    chroot /mnt/main /etc/init.d/cupsys start &
+  fi
+fi
+
+####
+#
+# Start NetworkManager, if it exists in the main module
+#
+####
+
+NONW="$(getbootparam nonetworkmanager)"
+
+if [ -z "$NONW" ]; then
+  if [ -e /mnt/main/etc/init.d/network-manager ]; then
+    chroot /mnt/main /etc/init.d/network-manager start &
+  fi
+fi
+
+####
+#
+# Check /deb /copy /exec cdrom-directories for files
+#
+####
+
 deb_copy_exec /media/cdrom
 
-# ---
-# Load minimodules
+####
+#
+# Load minimodules (from chroot)
+#
+####
 
-sh /etc/init.d/load-minimodules.sh
+cp /etc/init.d/load-minimodules /mnt/main/etc/init.d/
+chroot /mnt/main sh /etc/init.d/load-minimodules.sh
 
 ###
 #

Modified: trunk/scripts-base/usr/sbin/rebuildfstab-morphix
===================================================================
--- trunk/scripts-base/usr/sbin/rebuildfstab-morphix	2008-03-30 20:09:22 UTC (rev 2621)
+++ trunk/scripts-base/usr/sbin/rebuildfstab-morphix	2008-04-05 13:27:18 UTC (rev 2622)
@@ -24,8 +24,8 @@
 fstab = "/proc /proc proc defaults 0 0\n\
 /sys /sys sysfs noauto 0 0\n\
 /dev/pts /dev/pts devpts mode=0622 0 0\n\
-/dev/fd0 /media/floppy auto user,noauto,exec,umask=000,uid=" + username + " 0 0\n\
-/dev/cdrom /media/cdrom auto user,noauto,exec,ro,uid=" + username + " 0 0\n"
+/dev/fd0 /media/floppy auto users,auto,exec 0 0\n\
+/dev/cdrom /media/cdrom auto user,auto,exec,ro 0 0\n"
 
 os.system("mkdir -p /media/cdrom")
 os.system("mkdir -p /media/floppy")
@@ -34,7 +34,7 @@
 
     for p in partitions:
         os.system("mkdir -p /media/" + p[2])
-        line = "/dev/" + p[2] + " /media/" + p[2] + " auto defaults,users,uid=" + username + " 0 0\n"
+        line = "/dev/" + p[2] + " /media/" + p[2] + " auto defaults,users,auto,exec 0 0\n"
         fstab += line
     return fstab
 


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