sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (e6165078bd849ccae182045d7b7865678ee05124)
- From: Justin Boffemmyer <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (e6165078bd849ccae182045d7b7865678ee05124)
- Date: Wed, 1 Oct 2008 01:22:25 -0500
GIT changes to test cauldron by Justin Boffemmyer <flux AT sourcemage.org>:
initrd/sbin/smgl.init | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e6165078bd849ccae182045d7b7865678ee05124
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
smgl.init: make udev handling cleaner
Don't kill the udev daemon until after the user has finished loading
modules and we are ready to pivot_root. Also, don't print FAILED to
STDOUT, since we can reasonably expect some modules to fail (we only
provide the essential modules on the initrd, so modules for the rest
of the kernel will fail). Maybe it will be better to only trigger for
certain subsystems, but this can be determined later.
diff --git a/initrd/sbin/smgl.init b/initrd/sbin/smgl.init
index 0690ce8..9410122 100755
--- a/initrd/sbin/smgl.init
+++ b/initrd/sbin/smgl.init
@@ -115,6 +115,9 @@ main() {
umount -n /sys
umount -n /proc
+ echo "Killing initrd udev..."
+ kill $(pidof udevd)
+
cd $MOUNT
if [ -d initrd ]; then
@@ -147,10 +150,8 @@ mount -n -t sysfs sys /sys
mount -n -t tmpfs dev /dev
udevd --daemon
-udevadm trigger
-udevadm settle --timeout=60
-
-kill $(pidof udevd)
+udevadm trigger 2>/dev/null
+udevadm settle --timeout=60 2>/dev/null
KERNEL=`uname -r`
MOUNT=/mnt/cdrom
- [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (e6165078bd849ccae182045d7b7865678ee05124), Justin Boffemmyer, 10/01/2008
Archive powered by MHonArc 2.6.24.