SVN: geninitrd/trunk: functions mod-ide.sh

[arekm]

Author: arekm
Date: Sat Feb 19 08:56:43 2011
New Revision: 12162

Modified:
   geninitrd/trunk/functions
   geninitrd/trunk/mod-ide.sh
Log:
Revert, this wasn't meant to be in previous commit.

Modified: geninitrd/trunk/functions
==============================================================================
--- geninitrd/trunk/functions	(original)
+++ geninitrd/trunk/functions	Sat Feb 19 08:56:43 2011
@@ -165,24 +165,3 @@
 	local node="$1"
 	printf "/dev/mapper/%s" $(dm_name "$node")
 }
-
-# checks option in /proc/cmdline
-# returns:
-# "$1-set" if option is set without any value
-# "value" if option has some value specified
-get_cmdline_string='get_cmdline() {
-        local opt="$1" cmdline
-        read cmdline < /proc/cmdline
-
-        for arg in $cmdline; do
-                if [ "${arg}" = "${opt}" ]; then
-                        echo "${opt}-set"
-                        return
-                fi
-                if [ "${arg##${opt}=}" != "${arg}" ]; then
-                        echo "${arg##${opt}=}"
-                        return
-                fi
-        done
-}'
-eval "$get_cmdline_string"

Modified: geninitrd/trunk/mod-ide.sh
==============================================================================
--- geninitrd/trunk/mod-ide.sh	(original)
+++ geninitrd/trunk/mod-ide.sh	Sat Feb 19 08:56:43 2011
@@ -100,7 +100,7 @@
 							}' /usr/share/pci-database/ide.pci`
 							[ -n "$module" ] && idemodules="$idemodules $module"
 						done
-						if [ "$(get_cmdline ide)" = "reverse" ]; then
+						if is_yes "$(awk ' /ide=reverse/ { print "yes" } ' /proc/cmdline)"; then
 							new_idemodules=""
 							for nc in idemodules; do
 								new_idemodules="$nc $new_idemodules"