From: Eric Edgar <rocket@gentoo.org>
Date: Wed, 22 Jun 2005 14:47:08 +0000 (+0000)
Subject: Remove sort because busybox is not compiled with it.  Remove unnecessary UML fixes
X-Git-Tag: v3.4.10.902~536
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7af8935bec03e15d3f1f0420ad059c4b9165c80e;p=genkernel.git

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 7369ebf..c1f5d15 100644
--- 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 a31f058..1d89f30 100644
--- 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