morphix-cvs

[Morphix-cvs] SF.net SVN: morphix: [2180] trunk/scripts-base/etc/init.d/morphix-start

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

Revision: 2180
Author:   alextreme
Date:     2006-03-28 13:28:47 -0800 (Tue, 28 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2180&view=rev

Log Message:
-----------
  * adding a chown $USER

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/morphix-start
Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2006-03-28 11:03:11 UTC (rev 2179)
+++ trunk/scripts-base/etc/init.d/morphix-start	2006-03-28 21:28:47 UTC (rev 2180)
@@ -587,8 +587,9 @@
 
 # /home dir's, check permissions...
 # 
-# chown $USERNAME.users /home/$USERNAME
 
+chown $USERNAME.users /home/$USERNAME
+
 # Mount all harddisk partitions read-only (backgrounded)
 
 for i in /mnt/main/mnt/[sh]d[a-z][1-9] /mnt/[sh]d[a-z][1-9]?*; do


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

[Morphix-cvs] SF.net SVN: morphix: [2353] trunk/scripts-base/etc/init.d/morphix-start

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

Revision: 2353
Author:   alextreme
Date:     2006-07-11 17:09:49 -0700 (Tue, 11 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2353&view=rev

Log Message:
-----------
  * adding a few network-related bootoptions which have been bugging me for some time

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/morphix-start
Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2006-07-11 22:50:49 UTC (rev 2352)
+++ trunk/scripts-base/etc/init.d/morphix-start	2006-07-12 00:09:49 UTC (rev 2353)
@@ -895,6 +895,32 @@
     done
 fi
 
+####
+#
+# Bootoptions for setting the networkaddress at boottime
+# (useful for networks without DHCP) 
+#
+# ip=XXX.XXX.XXX.XXX
+# gateway=XXX.XXX.XXX.XXX
+# dns=XXX.XXX.XXX.XXX
+#
+#
+####
+
+ETHIPADDR="$(getbootparam ip)"
+ETHGW="$(getbootparam gateway)"
+ETHDNS="$(getbootparam dns)"
+
+if [ -n "$ETHIPADDR" ]; then
+    ifconfig eth0 $ETHIPADDR
+fi
+if [ -n "$ETHGW" ]; then
+    route add default gw $ETHGW
+fi
+if [ -n "$ETHDNS" ]; then
+    echo "nameserver $ETHDNS" >> /mnt/main/etc/resolv.conf
+fi
+
 # If not using usb as /cdrom, also check the mounted /mnt/usb for
 # DCE directories
 


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

[Morphix-cvs] SF.net SVN: morphix: [2432] trunk/scripts-base/etc/init.d/morphix-start

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

Revision: 2432
          http://svn.sourceforge.net/morphix/?rev=2432&view=rev
Author:   alextreme
Date:     2006-10-18 13:06:39 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
 * moving usb-homedir down to after the user has been created...

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/morphix-start

Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2006-10-13 21:23:32 UTC (rev 2431)
+++ trunk/scripts-base/etc/init.d/morphix-start	2006-10-18 20:06:39 UTC (rev 2432)
@@ -533,56 +533,6 @@
 
 mount --bind /home /mnt/main/home
 
-# save the persistant configuration
-
-echo "HOMEDIR='$MYHOMEDIR'">> /etc/sysconfig/morphix
-
-if [ -n "$MYHOMEDIR" -a -z "$BINDHOME" ]; then
-    if trymount "$MYHOMEDEVICE" "$MYHOMEMOUNTPOINT"; then
-	[ -f "$MYHOMEMOUNTPOINT/morphix.img" ] && MYHOMEDIR="$MYHOMEMOUNTPOINT/morphix.img"
-	while read device mountpoint fs relax; do
-	    case "$mountpoint" in *$MYHOMEMOUNTPOINT*)
-		    case "$fs" in *[Nn][Tt][Ff][Ss]*)
-		    umount "$MYHOMEMOUNTPOINT"; eerror "ERROR: WON'T MOUNT NTFS FILESYSTEM ON $MYHOMEDEVICE READ/WRITE!"
-		    break
-		    ;;
-			*[Ff][Aa][Tt]*)
-# Note: This currently won't work with encrypted partitions
-			umount "$MYHOMEMOUNTPOINT"; mount -t vfat -o rw,uid=$USERNAME,gid=users,umask=002 "$MYHOMEDEVICE" "$MYHOMEMOUNTPOINT"
-			if [ ! -f "$MYHOMEDIR" ]; then
-			    ewarn "WARNING: FAT32 is not a good filesystem option for /home/$USERNAME (missing socket/symlink support)."
-			    ewarn "WARNING: Better use an ext2 loopback file on this device, and boot with home=$MYHOMEDEVICE/morphix.img."
-			fi
-			;;
-			esac
-			if mount -o remount,rw "$MYHOMEMOUNTPOINT"; then
-			    ebegin "Mounting ${YELLOW}$MYHOMEDIR${NORMAL} as ${YELLOW}/home/$USERNAME${NORMAL}... "
-			    if [ -f "$MYHOMEDIR" ]; then
-# It's a loopback file, mount it over the /home/$USERNAME directory
-				mkdir /home/$USERNAME &>/dev/null
-
-				trymount "$MYHOMEDIR" /home/$USERNAME
-				RC="$?"
-				[ "$RC" = "0" ] && ERROR="$(mount -o remount,rw,sync /home/$USERNAME 2>&1)"
-				RC="$?"
-			    else
-# Do a --bind mount
-				ERROR="$(mount --bind "$MYHOMEDIR" /home/$USERNAME 2>&1)"
-				RC="$?"
-			    fi
-			    mount --bind /home/$USERNAME /mnt/main/home/$USERNAME
-			    [ "$RC" = "0" ] && einfo "/home/$USERNAME mounted OK." || { eerror "FAILED."; einfo "$ERROR"; }
-			fi
-			eend $?
-			break
-			;;
-			esac
-			done <<EOT
-$(cat /proc/mounts)
-EOT
-			fi
-fi
-
 mount --bind /home/root /mnt/main/root
 
 # /home dir's, check permissions...
@@ -795,6 +745,57 @@
 # unlock the users password
 chroot /mnt/main usermod -U $USERNAME
 
+# save the persistant configuration
+
+echo "HOMEDIR='$MYHOMEDIR'">> /etc/sysconfig/morphix
+
+if [ -n "$MYHOMEDIR" -a -z "$BINDHOME" ]; then
+    if trymount "$MYHOMEDEVICE" "$MYHOMEMOUNTPOINT"; then
+	[ -f "$MYHOMEMOUNTPOINT/morphix.img" ] && MYHOMEDIR="$MYHOMEMOUNTPOINT/morphix.img"
+	while read device mountpoint fs relax; do
+	    case "$mountpoint" in *$MYHOMEMOUNTPOINT*)
+		    case "$fs" in *[Nn][Tt][Ff][Ss]*)
+		    umount "$MYHOMEMOUNTPOINT"; eerror "ERROR: WON'T MOUNT NTFS FILESYSTEM ON $MYHOMEDEVICE READ/WRITE!"
+		    break
+		    ;;
+			*[Ff][Aa][Tt]*)
+# Note: This currently won't work with encrypted partitions
+			umount "$MYHOMEMOUNTPOINT"; mount -t vfat -o rw,uid=$USERNAME,gid=users,umask=002 "$MYHOMEDEVICE" "$MYHOMEMOUNTPOINT"
+			if [ ! -f "$MYHOMEDIR" ]; then
+			    ewarn "WARNING: FAT32 is not a good filesystem option for /home/$USERNAME (missing socket/symlink support)."
+			    ewarn "WARNING: Better use an ext2 loopback file on this device, and boot with home=$MYHOMEDEVICE/morphix.img."
+			fi
+			;;
+			esac
+			if mount -o remount,rw "$MYHOMEMOUNTPOINT"; then
+			    ebegin "Mounting ${YELLOW}$MYHOMEDIR${NORMAL} as ${YELLOW}/home/$USERNAME${NORMAL}... "
+			    if [ -f "$MYHOMEDIR" ]; then
+# It's a loopback file, mount it over the /home/$USERNAME directory
+				mkdir /home/$USERNAME &>/dev/null
+
+				trymount "$MYHOMEDIR" /home/$USERNAME
+				RC="$?"
+				[ "$RC" = "0" ] && ERROR="$(mount -o remount,rw,sync /home/$USERNAME 2>&1)"
+				RC="$?"
+			    else
+# Do a --bind mount
+				ERROR="$(mount --bind "$MYHOMEDIR" /home/$USERNAME 2>&1)"
+				RC="$?"
+			    fi
+			    mount --bind /home/$USERNAME /mnt/main/home/$USERNAME
+			    [ "$RC" = "0" ] && einfo "/home/$USERNAME mounted OK." || { eerror "FAILED."; einfo "$ERROR"; }
+			fi
+			eend $?
+			break
+			;;
+			esac
+			done <<EOT
+$(cat /proc/mounts)
+EOT
+			fi
+fi
+
+
 if test -n "$SPLASH"; then
     if [ -e /proc/splash ]; then
 	echo "show 64000">/proc/splash 2>/dev/null


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

[Morphix-cvs] SF.net SVN: morphix: [2491] trunk/scripts-base/etc/init.d/morphix-start

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

Revision: 2491
          http://svn.sourceforge.net/morphix/?rev=2491&view=rev
Author:   alextreme
Date:     2007-04-14 13:33:36 -0700 (Sat, 14 Apr 2007)

Log Message:
-----------
  * dhclient patch (from dcesari@forum)

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/morphix-start

Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2007-04-14 20:18:46 UTC (rev 2490)
+++ trunk/scripts-base/etc/init.d/morphix-start	2007-04-14 20:33:36 UTC (rev 2491)
@@ -871,7 +871,7 @@
 #      trap 2 3 11
       if [ -x /sbin/dhclient3 ]; then
 	  (
-	      dhclient -cf /etc/dhcp3/dhclient.conf -sf /etc/dhcp3/dhclient-script $DEVICE >/dev/null 2>&1
+	      dhclient -cf /etc/dhcp3/dhclient.conf $DEVICE >/dev/null 2>&1
 	      if [ "$?" = 0 ];then
 		  cp -af /etc/resolv.conf /mnt/main/etc/resolv.conf 2>/dev/null
 		  cp -af /etc/yp.conf /mnt/main/etc/yp.conf 2>/dev/null


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

[Morphix-cvs] SF.net SVN: morphix: [2602] trunk/scripts-base/etc/init.d/morphix-start

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

Revision: 2602
          http://morphix.svn.sourceforge.net/morphix/?rev=2602&view=rev
Author:   alextreme
Date:     2007-12-05 05:28:11 -0800 (Wed, 05 Dec 2007)

Log Message:
-----------
 * removing debug-option from unionfs-mount commands

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/morphix-start

Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2007-11-26 20:28:00 UTC (rev 2601)
+++ trunk/scripts-base/etc/init.d/morphix-start	2007-12-05 13:28:11 UTC (rev 2602)
@@ -352,15 +352,20 @@
 	mkdir -p $DIR2/modules >/dev/null 2>&1
 
         if [ -x /sbin/unionctl -o -x /usr/bin/unionctl ];then
-	  mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main
+	  mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT} none /mnt/main
+
+# debug is no longer a unionfs-option since unionfs-2.1.x.
+# Old mount-line:
+#	  mount -t unionfs -o dirs=/mnt/main${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main
+#
 	  unionctl /mnt/main --add --mode ro /mnt/main_ro
 	  unionctl /mnt/main --add --mode rw $DIR2/root
         else
-	  mount -t unionfs -o dirs=$DIR2/root=rw:/mnt/main_ro=ro${UNIONFS_MOUNT_OPT},debug=$DEBUGOVERLAY none /mnt/main
+	  mount -t unionfs -o dirs=$DIR2/root=rw:/mnt/main_ro=ro${UNIONFS_MOUNT_OPT} none /mnt/main
         fi
 	eend $?
 
-	mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro,debug=$DEBUGOVERLAY none /mnt/main/lib/modules
+	mount -t unionfs -o dirs=$DIR2/modules=rw:/MorphixCD/lib/modules=ro none /mnt/main/lib/modules
 
     elif [ -n "$COWLOOP" ]; then
 	ebegin "Overlaying using cowloop"
@@ -386,7 +391,7 @@
 
     else
 	  if [ -n "$UNIONFS" ]; then
-	    mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro,debug=$DEBUGOVERLAY none /mnt/main/dev 2>&1
+	    mount -t unionfs -o dirs=$DIR2/dev=rw:/MorphixCD/dev=ro none /mnt/main/dev 2>&1
 	  else
 	    mount --bind /MorphixCD/dev /mnt/main/dev
 	  fi


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

[Morphix-cvs] SF.net SVN: morphix: [2634] trunk/scripts-base/etc/init.d/morphix-start

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

Revision: 2634
          http://morphix.svn.sourceforge.net/morphix/?rev=2634&view=rev
Author:   alextreme
Date:     2008-06-20 02:07:55 -0700 (Fri, 20 Jun 2008)

Log Message:
-----------
 * fix for iso not appearing via /mnt/main/media/cdrom (*urg*)

Modified Paths:
--------------
    trunk/scripts-base/etc/init.d/morphix-start

Modified: trunk/scripts-base/etc/init.d/morphix-start
===================================================================
--- trunk/scripts-base/etc/init.d/morphix-start	2008-06-19 14:30:15 UTC (rev 2633)
+++ trunk/scripts-base/etc/init.d/morphix-start	2008-06-20 09:07:55 UTC (rev 2634)
@@ -239,6 +239,7 @@
 
 mkdir /mnt/main/cdrom >/dev/null 2>&1
 mkdir /mnt/main/floppy >/dev/null 2>&1
+mkdir -p /mnt/main/media/cdrom >/dev/null 2>&1
 
 mount --bind /mnt /mnt/main/mnt
 mount --bind -o ro /media/cdrom /mnt/main/media/cdrom


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