]>
Commit | Line | Data |
---|---|---|
5e993f12 | 1 | --- generate-modprobe.conf |
2 | +++ generate-modprobe.conf | |
3 | @@ -22,24 +22,30 @@ | |
4 | MODPROBECONF=`mktemp /tmp/modprobe.XXXXXX || tempfile || echo /tmp/modprobe.$$` | |
5 | trap "rm -f $MODPROBECONF" 0 | |
6 | ||
7 | +modprobe_abort() | |
8 | +{ | |
9 | + echo Failed to to run modprobe. Giving up. 1>&2 | |
10 | + exit 1 | |
11 | +} | |
12 | + | |
13 | if [ x"$TESTING_MODPROBE_CONF" != x ]; then | |
14 | - cp $TESTING_MODPROBE_CONF $MODPROBECONF | |
15 | + cp $TESTING_MODPROBE_CONF $MODPROBECONF || modprobe_abort | |
16 | elif [ "$STDIN" = "1" ]; then | |
17 | - cat > $MODPROBECONF | |
18 | + cat > $MODPROBECONF || modprobe_abort | |
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 | + echo Cannot find old version of modprobe. Giving up. 1>&2 | |
38 | exit 1 | |
39 | fi | |
40 |