>> 3.0.2c. Added more PCMCIA modules to the x86 module list; and added the bug

#52561 patch.

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

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 9f6e5bfd918f915d8a8a3afca773656e30510f6e..74ae3d79197337dee1a1a7458132aa7681fd4077 100755 (executable)
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -211,3 +211,15 @@ has_loop() {
                return 1
        fi
 }
+
+isBootRO()
+{
+       for mo in `grep ' /boot ' /proc/mounts | cut -d ' ' -f 4 | sed -e 's/,/ /'`
+       do
+               if [ "x${mo}x" == "xrox" ]
+               then
+                       return 0
+               fi
+       done
+       return 1
+}

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 8a9dcca7d448753bf331ead2c46956f806354f5c..93303f12d7bcbc881229a7bc7d700faaf4ef8c37 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -117,7 +117,7 @@ create_initrd_modules() {
        print_info 2 "initrd: >> Searching for modules..."
        for i in `gen_dep_list`
        do
-               mymod=`find /lib/modules/${KV} -name "${i}${MOD_EXT}"`
+               mymod=`find /lib/modules/${KV} -name "${i}${MOD_EXT}" | head -n 1`
                if [ -z "${mymod}" ]
                then
                        print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."

diff --git a/genkernel b/genkernel
index 9f3d90637d3f713dce0e2ae7b45b42db795011ee..70dfb489b058f7dc59e9abf6e98bc30a149f87dd 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V='3.0.2b'
+GK_V='3.0.2c'
 TEMP='/var/tmp/genkernel'
 
 small_die() {
@@ -91,6 +91,19 @@ then
                        print_warning 1 '         Run ``mount /boot`` to mount it!'
                        echo
                fi
+       elif isBootRO
+       then
+               if isTrue ${MOUNTBOOT}
+               then
+                       if ! mount -o remount,rw /boot
+                       then
+                               print_warning 1 "${BOLD}WARNING${NORMAL}: Failed to remount /boot RW!"
+                               echo
+                       else
+                               print_info 1 "mount: /boot remounted read/write successfully!"
+                               BOOTRW=1
+                       fi
+               fi
        fi
 fi
 
@@ -232,6 +245,8 @@ else
        print_info 1 'initrd compiled successfully!'
 fi
 
+[ "${BOOTRW}" != '' ] && mount -o remount,ro /boot
+
 print_info 1 ''
 print_info 1 'Do NOT report kernel bugs as genkernel bugs unless your bug'
 print_info 1 'is about the default genkernel configuration...'

diff --git a/x86/modules_load b/x86/modules_load
index 9fe3a5308bf0c20ed3485ca215472b4e8b4ecaf0..cb6b0ccc270a80c265c8c114b73a723294644389 100644 (file)
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -13,5 +13,5 @@ sim710 sym53c416"
 
 MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
 MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_PCMCIA="ide-cs"
+MODULES_PCMCIA="pcmcia_core i82365 yenta_socket ds ide-cs"
 MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage"