commit mkinitrd for openSUSE:Factory
Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Tue Aug 4 22:41:22 CEST 2009. -------- --- mkinitrd/mkinitrd.changes 2009-06-24 18:48:36.000000000 +0200 +++ mkinitrd/mkinitrd.changes 2009-08-04 13:30:58.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 4 13:24:33 CEST 2009 - mmarek@suse.cz + +- do not warn about built-in modules +- prefix modprobe errors with "modprobe:" (less scary than "FATAL:") + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mkinitrd-2.5.9-builtin-modules.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.mHzHUk/_old 2009-08-04 22:40:33.000000000 +0200 +++ /var/tmp/diff_new_pack.mHzHUk/_new 2009-08-04 22:40:33.000000000 +0200 @@ -26,7 +26,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.5.9 -Release: 7 +Release: 8 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -36,6 +36,7 @@ Patch1: mkinitrd-setup-udev-firmware-fix Patch2: mkinitrd-silence.patch Patch3: mkinitrd-2.5.9_selinux.patch +Patch4: mkinitrd-2.5.9-builtin-modules.patch %description Mkinitrd creates file system images for use as initial RAM disk @@ -70,6 +71,7 @@ %patch1 -p1 %patch2 %patch3 -p1 +%patch4 -p1 %build gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c ++++++ mkinitrd-2.5.9-builtin-modules.patch ++++++ --- scripts/setup-modules.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- mkinitrd-2.5.9.orig/scripts/setup-modules.sh +++ mkinitrd-2.5.9/scripts/setup-modules.sh @@ -301,12 +301,13 @@ resolve_modules() { -C /dev/null \ --set-version $kernel_version --ignore-install \ --show-depends $module \ - $additional_args \ - | sed -rn 's:.*insmod[[:blank:]]+/?::;s:[[:blank:]].*?$::;p' ) - if [ ! "$module_list" ]; then + $additional_args 2> >(sed 's/^FATAL:/modprobe:/' >&2) \ + | grep -E '^(insmod|builtin) ') + if [ -z "$module_list" ]; then echo \ "WARNING: no dependencies for kernel module '$module' found." >&2 fi + module_list=$(echo "$module_list" | sed -rn 's/^insmod +//p') for mod in $module_list ; do if ! $(echo $resolved_modules | grep -q $mod) ; then resolved_modules="$resolved_modules $mod" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de