Revert --resolve-names=never in init

That flag is too new to work on most shipping distros, so fall back to
including /etc/group and the libnss_files.

diff --git a/modules.d/95udev-rules/install b/modules.d/95udev-rules/install
index caecbf2d043314dec76dfb0e63c944b1c56b8f58..b53650fc6064c9ffadc9cfcf11ce4b65ba96890f 100755 (executable)
--- a/modules.d/95udev-rules/install
+++ b/modules.d/95udev-rules/install
@@ -2,7 +2,12 @@
 # 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
-dracut_install udevd udevadm /lib*/udev/*_id /etc/udev/udev.conf 
+dracut_install udevd udevadm /lib*/udev/*_id /etc/udev/udev.conf /etc/group
 inst_rules 50-udev-default.rules 60-persistent-storage.rules \
     61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules 
 
+if ldd $(find_binary udevd) |grep -q /lib64/libc; then
+    dracut_install /lib64/libnss_files*
+else
+    dracut_install /lib/libnss_files*
+fi
\ No newline at end of file

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 9ff2ff439813b93949cd526ef25568224bf211c8..9a0181493ca1b39957bc26575a7a24221fdbabb1 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -48,7 +48,7 @@ getarg 'rdbreak=pre-udev' && emergency_shell
 source_all pre-udev
 
 # start up udev and trigger cold plugs
-udevd --daemon --resolve-names=never
+udevd --daemon
 getarg rdudevinfo && udevadm control --log_priority=info
 getarg rdudevdebug && udevadm control --log_priority=debug
 udevadm trigger >/dev/null 2>&1