Changeset 529

Timestamp:

05/15/08 08:41:43 (2 months ago)

Author:

free

Message:

Pass pci=nobios to the kernel on Q1s

Files:

• cdd-utils/trunk/debian/changelog (modified) (1 diff)
• cdd-utils/trunk/lib/common.sh (modified) (2 diffs)
• cdd-utils/trunk/lib/suites.sh (modified) (1 diff)
• cdd-utils/trunk/lib/system.sh (modified) (2 diffs)

cdd-utils/trunk/debian/changelog

@@ -11 +11 @@
-  * Mount /proc/bus/usb to workaround broken udev midisport rule
-  * Don't ask password to sudoers
+  * Pass pci=nobios to the kernel on Q1s
-
- -- Free Ekanayaka <free@64studio.com>  Thu, 08 May 2008 21:55:32 +0200

cdd-utils/trunk/lib/common.sh

@@ -34 +34 @@
-    sed -i -e "s|^${key}${sep}.*|${key}${sep}${val}|g" $cfg
-}
+get_key () {
+    key="$1"
+    sep="$2"
+    cfg="$3"
+    if ! grep -q "^$key" "$cfg"; then
+        warning "key $key not found in $cfg"
+        return
+    fi
+    grep "^${key}${sep}" $cfg | sed -e "s|^${key}${sep}\(.*\)|\1|g"
+}
-del_key () {
-    key="$1"
@@ -39 +49 @@
-    sed -i -e "\|^$key| d" $cfg
-}
+is_ubuntu () {
+
+    if [ "$DISTRIB_ID" = "Ubuntu" ]; then
+        return 0
+    else
+        return 1
+    fi
+
+}

cdd-utils/trunk/lib/suites.sh

@@ -60 +60 @@
-    cdd-config midisport
-    cdd-config sudoers
+    cdd-config kopt pci=nobios
-
-    # Various updates and fixes

cdd-utils/trunk/lib/system.sh

@@ -5 +5 @@
-    if ! exists $cfg; then warning $cfg not found; return; fi
-
-[ "$DISTRIB_ID" = "Ubuntu" ]
+is_ubuntu
-        set_key "%admin" " " "ALL=(ALL) NOPASSWD: ALL" $cfg
-        exit
@@ -212 +212 @@
-    fi
-}
+
+# Boot options
+kopt () {
+    if nullstr $1; then warning "no option given"; return 1; fi
+    opt=$1
+    cfg=/boot/grub/menu.lst
+    if ! exists $cfg; then warning $cfg not found; return; fi
+    key="# kopt"
+    sep="="
+    cur="$(get_key "$key" "$sep" "$cfg")"
+    if [[ "$cur" =~ "${opt}" ]]; then return; fi
+    val="$cur $opt"
+    set_key "$key" "$sep" "$val" "$cfg"
+}