Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/module-init-tools/patches/module-init-tools-3.1-abort-on-modprobe-failure.patch

    Contents of /trunk/module-init-tools/patches/module-init-tools-3.1-abort-on-modprobe-failure.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 1425 byte(s) 
    -import
    1 Abort generate-modprobe.conf if modprobe fails, bug #68689.
    2
    3 --- module-init-tools-3.2-pre7/generate-modprobe.conf 2005-07-15 11:21:54.000000000 +0200
    4 +++ module-init-tools-3.2-pre7.az/generate-modprobe.conf 2005-07-15 11:24:33.000000000 +0200
    5 @@ -35,22 +35,28 @@
    6 MODPROBECONF=`mktemp /tmp/modprobe.XXXXXX || tempfile || echo /tmp/modprobe.$$`
    7 trap "rm -f $MODPROBECONF" 0
    8
    9 +modprobe_abort()
    10 +{
    11 + echo Failed to to run modprobe. Giving up. 2>&1
    12 + exit 1
    13 +}
    14 +
    15 if [ x"$TESTING_MODPROBE_CONF" != x ]; then
    16 cp $TESTING_MODPROBE_CONF $MODPROBECONF
    17 elif [ "$STDIN" = "1" ]; then
    18 cat > $MODPROBECONF
    19 elif [ -x /sbin/modprobe.old ]; then
    20 # In sbin.
    21 - /sbin/modprobe.old -c > $MODPROBECONF
    22 + /sbin/modprobe.old -c > $MODPROBECONF || modprobe_abort
    23 elif modprobe.old -c >/dev/null 2>&1; then
    24 # Somewhere in path.
    25 - modprobe.old -c > $MODPROBECONF
    26 + modprobe.old -c > $MODPROBECONF || modprobe_abort
    27 elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
    28 # Running /sbin/modprobe gives old version.
    29 - /sbin/modprobe -c > $MODPROBECONF
    30 + /sbin/modprobe -c > $MODPROBECONF || modprobe_abort
    31 elif modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
    32 # Running modprobe gives old version.
    33 - modprobe -c > $MODPROBECONF
    34 + modprobe -c > $MODPROBECONF || modprobe_abort
    35 else
    36 echo Cannot find old version of modprobe. Giving up. 2>&1
    37 exit 1