From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Apr 2011 13:37:00 +0000
Subject: Slackware 13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!
---
 source/a/mkinitrd/init | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'source/a/mkinitrd/init')

diff --git a/source/a/mkinitrd/init b/source/a/mkinitrd/init
index a6f1091e8..2205a5928 100755
--- a/source/a/mkinitrd/init
+++ b/source/a/mkinitrd/init
@@ -56,12 +56,7 @@
 # Optional:
 #
 # /load_kernel_modules
-#                 A script that uses insmod to load the desired
-#                 modules.  If this file is not present, all the modules
-#                 in /lib/modules/$(uname -r)/ will be loaded in the usual
-#                 sorted order.  If you need to load the modules in a
-#                 certain order, or if the modules need extra options,
-#                 then use a load_kernel_modules script.
+#                 A script that uses modprobe to load the desired modules.
 #
 #                 There's an example in here.  To actually use it, you'll
 #                 need to make it executable:  
@@ -138,7 +133,7 @@ else # load modules (if any) in order:
   if ls /lib/modules/$(uname -r)/*.*o 1> /dev/null 2> /dev/null ; then
     echo "${INITRD}:  Loading kernel modules from initrd image:"
     for module in /lib/modules/$(uname -r)/*.*o ; do
-      /sbin/insmod $module
+      /sbin/modprobe $module
     done
     unset module
   fi
@@ -151,11 +146,9 @@ sleep $WAIT
 # If udevd is available, use it to generate block devices
 # else use mdev to read sysfs and generate the needed devices 
 if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then
-  /sbin/udevd --daemon
-  /sbin/udevadm control --property=STARTUP=1
+  /sbin/udevd --daemon --resolve-names=never
   /sbin/udevadm trigger --subsystem-match=block --action=add
   /sbin/udevadm settle --timeout=10
-  /sbin/udevadm control --property=STARTUP=
 else
   [ "$DEVTMPFS" != "1" ] && mdev -s
 fi
@@ -170,7 +163,10 @@ if [ "$RESCUE" = "" ]; then
   # Initialize RAID:
   if [ -x /sbin/mdadm ]; then
     /sbin/mdadm -E -s >/etc/mdadm.conf
+    /sbin/mdadm -S -s
     /sbin/mdadm -A -s
+    # This seems to make the kernel see partitions more reliably:
+    fdisk -l /dev/md* 1> /dev/null 2> /dev/null
   fi
 
   # Unlock any encrypted partitions necessary to access the
@@ -301,6 +297,7 @@ else
 fi
 
 if pgrep udevd >/dev/null ; then
+  /sbin/udevadm settle --timeout=30
   pkill udevd
 fi
 
-- 
cgit v1.2.3-65-gdbad