From: Victor Lowther <victor.lowther@gmail.com>
Date: Sun, 8 Mar 2009 15:38:25 +0000 (-0500)
Subject: Make udevd shut up
X-Git-Tag: 0.1~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bff75da146f3b6bca00be3c40f46932077d7d86;p=thirdparty%2Fdracut.git

Make udevd shut up

Do this by loading /etc/group and /lib*/libnss_files.so.* onto the initramfs
---

diff --git a/modules.d/95udev-rules.ub810/install b/modules.d/95udev-rules.ub810/install
index e1c9a892c..b8f71864e 100755
--- a/modules.d/95udev-rules.ub810/install
+++ b/modules.d/95udev-rules.ub810/install
@@ -5,7 +5,7 @@ mkdir -p "$initdir/var/run"
 
 dracut_install udevd udevadm pkill /lib/udev/*_id /lib/udev/*_device_name \
     /lib/udev/firmware_helper /lib/udev/ide_media /lib/udev/vio_type \
-    /lib/udev/watershed /etc/udev/udev.conf
+    /lib/udev/watershed /etc/udev/udev.conf /etc/group /lib*/libnss_files.*
 
 inst_rules 05-options.rules 20-names.rules 40-basic-permissions.rules \
     60-persistent-storage.rules 61-persistent-storage-edd.rules \
diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install
index 7c04beb69..53c7d010e 100755
--- a/modules.d/95udev-rules/install
+++ b/modules.d/95udev-rules/install
@@ -2,9 +2,8 @@
 # FIXME: would be nice if we didn't have to know which rules to grab....
 # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
 # of the rules we want so that we just copy those in would be best
-mkdir -p "$initdir/lib/udev/rules.d"
-dracut_install udevd udevadm /lib/udev/*_id
+dracut_install udevd udevadm /lib*/udev/*_id /etc/udev/udev.conf \
+    /etc/group /lib*/libnss_files.*
+
 inst_rules 50-udev-default.rules 60-persistent-storage.rules \
-    61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules
-# make udevadm shut up about missing udev.conf
-inst /etc/udev/udev.conf
\ No newline at end of file
+    61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
\ No newline at end of file
diff --git a/modules.d/99base/init b/modules.d/99base/init
index ddefebf29..b45bb7b10 100755
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -31,8 +31,6 @@ source_all() {
 echo "Starting initrd..."
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 export TERM=linux
-CONSOLE=/dev/console
-[ -c $CONSOLE ] && exec >$CONSOLE 2>&1 <$CONSOLE
 trap "emergency_shell" 0
 
 mknod /dev/null c 1 3
@@ -55,7 +53,7 @@ getarg 'break=pre-udev' && emergency_shell
 source_all pre-udev
 
 # start up udev and trigger cold plugs
-udevd --daemon $( [ $(udevd --version) -ge 137 ] && echo --resolve-names=never )
+udevd --daemon
 udevadm trigger >/dev/null 2>&1
 udevadm settle --timeout=30 >/dev/null 2>&1