[Astlinux-commits] SF.net SVN: astlinux: [261] trunk/package/iproute2

[<kr...@us...>]

Revision: 261
Author:   krisk84
Date:     2006-08-15 13:01:37 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/astlinux/?rev=261&view=rev

Log Message:
-----------
astshape init fix, remove support for opt

Modified Paths:
--------------
    trunk/package/iproute2/astshape.init
    trunk/target/device/geni586/target_skeleton/boot/grub/grub.conf
    trunk/target/device/net4801/target_skeleton/boot/grub/grub.conf
    trunk/target/device/wrap/target_skeleton/boot/grub/grub.conf
    trunk/target/generic/target_skeleton/etc/rc
Modified: trunk/package/iproute2/astshape.init
===================================================================
--- trunk/package/iproute2/astshape.init	2006-08-15 19:52:10 UTC (rev 260)
+++ trunk/package/iproute2/astshape.init	2006-08-15 20:01:37 UTC (rev 261)
@@ -8,7 +8,7 @@
 if [ "$EXTUP" -a "$EXTDOWN" ]
 then
 
-if [ -x /usr/sbin/shape ]
+if [ -x /usr/sbin/astshape ]
 then
 echo "Starting AstShape..."
 /usr/sbin/astshape

Modified: trunk/target/device/geni586/target_skeleton/boot/grub/grub.conf
===================================================================
--- trunk/target/device/geni586/target_skeleton/boot/grub/grub.conf	2006-08-15 19:52:10 UTC (rev 260)
+++ trunk/target/device/geni586/target_skeleton/boot/grub/grub.conf	2006-08-15 20:01:37 UTC (rev 261)
@@ -3,25 +3,25 @@
 
 title AstLinux (Boot from IDE CF, USB KeyDisk)
 	root (hd0,0)
-	kernel /boot/bzImage root=/dev/hda1 astlinux=i586 astkd=/dev/sda1 astopt=/dev/hda2 ide=nodma
+	kernel /boot/bzImage root=/dev/hda1 astlinux=i586 astkd=/dev/sda1 ide=nodma
 	savedefault
 
 title AstLinux (Boot from USB, IDE CF/HD KeyDisk)
 	root (hd0,0)
-	kernel /boot/bzImage root=/dev/sda1 astlinux=i586 astkd=/dev/hda1 astopt=/dev/sda2 ide=nodma rootdelay=10
+	kernel /boot/bzImage root=/dev/sda1 astlinux=i586 astkd=/dev/hda1 ide=nodma rootdelay=10
 	savedefault
 
 title AstLinux (Boot from USB, Use third partition for KeyDisk)
         root (hd0,0)
-        kernel /boot/bzImage root=/dev/sda1 astlinux=i586 astkd=/dev/sda3 astopt=/dev/sda2 ide=nodma rootdelay=10
+        kernel /boot/bzImage root=/dev/sda1 astlinux=i586 astkd=/dev/sda3 ide=nodma rootdelay=10
         savedefault
 
 title AstLinux (Boot from IDE CF, IDE CF/HD KeyDisk - secondary master)
 	root (hd0,0)
-	kernel /boot/bzImage root=/dev/hda1 astlinux=i586 astkd=/dev/hdc1 astopt=/dev/hda2 ide=nodma
+	kernel /boot/bzImage root=/dev/hda1 astlinux=i586 astkd=/dev/hdc1 ide=nodma
 	savedefault
 
 title AstLinux (Boot from IDE CF, Use third partition for KeyDisk)
         root (hd0,0)
-        kernel /boot/bzImage root=/dev/hda1 astlinux=i586 astkd=/dev/hda3 astopt=/dev/hda2 ide=nodma
+        kernel /boot/bzImage root=/dev/hda1 astlinux=i586 astkd=/dev/hda3 ide=nodma
         savedefault

Modified: trunk/target/device/net4801/target_skeleton/boot/grub/grub.conf
===================================================================
--- trunk/target/device/net4801/target_skeleton/boot/grub/grub.conf	2006-08-15 19:52:10 UTC (rev 260)
+++ trunk/target/device/net4801/target_skeleton/boot/grub/grub.conf	2006-08-15 20:01:37 UTC (rev 261)
@@ -5,10 +5,10 @@
 
 title AstLinux (Boot from CF - Use USB KeyDisk)
 	root (hd0,0)
-	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,19200n8 astlinux=net4801 astkd=/dev/sda1 astopt=/dev/hda2 ide=nodma
+	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,19200n8 astlinux=net4801 astkd=/dev/sda1 ide=nodma
 	savedefault
 
 title AstLinux (Boot from CF - Use third partition for KeyDisk)
 	root (hd0,0)
-	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,19200n8 astlinux=net4801 astkd=/dev/hda3 astopt=/dev/hda2 ide=nodma
+	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,19200n8 astlinux=net4801 astkd=/dev/hda3 ide=nodma
 	savedefault

Modified: trunk/target/device/wrap/target_skeleton/boot/grub/grub.conf
===================================================================
--- trunk/target/device/wrap/target_skeleton/boot/grub/grub.conf	2006-08-15 19:52:10 UTC (rev 260)
+++ trunk/target/device/wrap/target_skeleton/boot/grub/grub.conf	2006-08-15 20:01:37 UTC (rev 261)
@@ -5,10 +5,10 @@
 
 title AstLinux (Boot from CF - Use USB KeyDisk)
 	root (hd0,0)
-	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,38400n8 astlinux=net4801 astkd=/dev/sda1 astopt=/dev/hda2 ide=nodma reboot=bios
+	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,38400n8 astlinux=net4801 astkd=/dev/sda1 ide=nodma reboot=bios
 	savedefault
 
 title AstLinux (Boot from CF - Use third partition for KeyDisk)
 	root (hd0,0)
-	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,38400n8 astlinux=net4801 astkd=/dev/hda3 astopt=/dev/hda2 ide=nodma reboot=bios
+	kernel /boot/bzImage root=/dev/hda1 console=ttyS0,38400n8 astlinux=net4801 astkd=/dev/hda3 ide=nodma reboot=bios
 	savedefault

Modified: trunk/target/generic/target_skeleton/etc/rc
===================================================================
--- trunk/target/generic/target_skeleton/etc/rc	2006-08-15 19:52:10 UTC (rev 260)
+++ trunk/target/generic/target_skeleton/etc/rc	2006-08-15 20:01:37 UTC (rev 261)
@@ -200,13 +200,8 @@
 
 if [ $OPTDEV ]
 then
-echo "$OPTDEV /mnt/opt ext2 ro,noauto 0 0" >> /tmp/etc/fstab
-export PATH=$PATH:/mnt/opt/sbin:/mnt/opt/bin
-if `mount /mnt/opt > /dev/null 2> /dev/null`
-then
-echo "$OPTDEV mounted"
+echo "ASTOPT IS NO LONGER SUPPORTED - $OPTDEV WILL NOT BE MOUNTED"
 fi
-fi
 
 if [ "$KDDEV" ]
 then


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