diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-07-15 09:42:17 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-07-15 09:42:17 +0000 |
| commit | a0f887f7eef39de57d925ae8c5b29ff7087f4d0d (patch) | |
| tree | 34874b38f84996c2b7ed39e914c076d352689178 /sys-apps/module-init-tools/files | |
| parent | Added to ~ppc (diff) | |
| download | gentoo-2-a0f887f7eef39de57d925ae8c5b29ff7087f4d0d.tar.gz gentoo-2-a0f887f7eef39de57d925ae8c5b29ff7087f4d0d.tar.bz2 gentoo-2-a0f887f7eef39de57d925ae8c5b29ff7087f4d0d.zip | |
Abort generate-modprobe.conf if modprobe fails, bug #68689.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-apps/module-init-tools/files')
| -rw-r--r-- | sys-apps/module-init-tools/files/digest-module-init-tools-3.2_pre7-r1 | 2 | ||||
| -rw-r--r-- | sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch | 35 |
2 files changed, 37 insertions, 0 deletions
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.2_pre7-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2_pre7-r1 new file mode 100644 index 000000000000..d4743db71ac4 --- /dev/null +++ b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2_pre7-r1 @@ -0,0 +1,2 @@ +MD5 90eec11f7afa255a7202432fa0d8a39d module-init-tools-3.2-pre7.tar.bz2 163764 +MD5 bac989c74ed10f3bf86177fc5b4b89b6 modutils-2.4.27.tar.bz2 234963 diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch b/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch new file mode 100644 index 000000000000..af89c4d29a66 --- /dev/null +++ b/sys-apps/module-init-tools/files/module-init-tools-3.2_pre7-abort-on-modprobe-failure.patch @@ -0,0 +1,35 @@ +--- module-init-tools-3.2-pre7/generate-modprobe.conf 2005-07-15 11:21:54.000000000 +0200 ++++ module-init-tools-3.2-pre7.az/generate-modprobe.conf 2005-07-15 11:24:33.000000000 +0200 +@@ -35,22 +35,28 @@ + MODPROBECONF=`mktemp /tmp/modprobe.XXXXXX || tempfile || echo /tmp/modprobe.$$` + trap "rm -f $MODPROBECONF" 0 + ++modprobe_abort() ++{ ++ echo Failed to to run modprobe. Giving up. 2>&1 ++ exit 1 ++} ++ + if [ x"$TESTING_MODPROBE_CONF" != x ]; then + cp $TESTING_MODPROBE_CONF $MODPROBECONF + elif [ "$STDIN" = "1" ]; then + cat > $MODPROBECONF + elif [ -x /sbin/modprobe.old ]; then + # In sbin. +- /sbin/modprobe.old -c > $MODPROBECONF ++ /sbin/modprobe.old -c > $MODPROBECONF || modprobe_abort + elif modprobe.old -c >/dev/null 2>&1; then + # Somewhere in path. +- modprobe.old -c > $MODPROBECONF ++ modprobe.old -c > $MODPROBECONF || modprobe_abort + elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then + # Running /sbin/modprobe gives old version. +- /sbin/modprobe -c > $MODPROBECONF ++ /sbin/modprobe -c > $MODPROBECONF || modprobe_abort + elif modprobe -V 2>/dev/null | grep -q 'modprobe version'; then + # Running modprobe gives old version. +- modprobe -c > $MODPROBECONF ++ modprobe -c > $MODPROBECONF || modprobe_abort + else + echo Cannot find old version of modprobe. Giving up. 2>&1 + exit 1 |