From: Victor Lowther Date: Mon, 1 Jun 2009 09:04:34 +0000 (-0500) Subject: Revert --resolve-names=never in init X-Git-Tag: 0.1~142 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4eba843ddeda59d01a074329e28d423d119b8336;p=thirdparty%2Fdracut.git 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 caecbf2d0..b53650fc6 100755 --- 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 9ff2ff439..9a0181493 100755 --- 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