Remove sort because busybox is not compiled with it. Remove unnecessary UML fixes

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@216 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 7369ebf88a6320fcb9469e25dc17b7f706baa326..c1f5d1545ea74c5e96141ab0a40407d58029768a 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -292,8 +292,9 @@ cmdline_hwopts() {
            fi
        done
     done
-    
-    MY_HWOPTS=$(echo ${MY_HWOPTS} | sort)
+   
+    # Shouldnt need to sort this the following loop should figure out the duplicates and strip them out
+    #MY_HWOPTS=$(echo ${MY_HWOPTS}|  sort)
     
     for x in ${MY_HWOPTS}
     do

diff --git a/generic/linuxrc b/generic/linuxrc
index a31f058a214339d6d3c5778747d2961d50eb8f3e..1d89f3016c4680e5389b061e4bf4e7fe21f06c3b 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -447,34 +447,12 @@ then
                chmod 1777 tmp
        fi
        
-       UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
-       if [ "${UML}" = 'UML' ]
-       then
-               # UML Fixes
-               good_msg 'Updating for uml system'
-
-               VC=$(cat ${CHROOT}/etc/securetty|grep 'vc/0'|sort|uniq)
-               if [ "${VC}" = 'vc/0' ]
-               then
-                       echo 'vc/0 already exists, skipping'
-               else
-                       echo 'vc/0' >> ${CHROOT}/etc/securetty
-               fi
-               TTY=$(cat ${CHROOT}/etc/securetty|grep 'tty0'|sort|uniq)
-               if [ "${TTY}" = 'vc/0' ]
-               then
-                       echo 'tty0, already exists skipping'
-               else
-                       echo tty0 >> ${CHROOT}/etc/securetty
-               fi
-               
-               # Setup console on 0 for uml
-               if [ -w /${CHROOT}/sbin/livecd-functions.sh ]
-               then
-                       cat /${CHROOT}/sbin/livecd-functions.sh |sed -e 's|for x in 1 2 3 4 5 6|for x in 0 1 2 3 4 5 6|'> /${CHROOT}/sbin/livecd-functions.sh
-               fi
-
-       fi
+       #UML=$(cat /proc/cpuinfo|grep UML|sed -e 's|model name.*: ||')
+       #if [ "${UML}" = 'UML' ]
+       #then
+       #       # UML Fixes
+       #       good_msg 'Updating for uml system'
+       #fi
 
        # Let Init scripts know that we booted from CD
        export CDBOOT