Properly quote physical interfaces in blacklist script
* debian/ifblacklist_migrate.sh
- Only comment out iface lines if we have an exact match for the network
interface. (Closes: #612247)
Michael Biebl
13 years ago
| 6 | 6 |
- Newer versions of dnsmasq validate the option parameters more strictly.
|
| 7 | 7 |
Instead of passing a bogus file name simply use --conf-file without
|
| 8 | 8 |
additional parameters. (Closes: #615082)
|
|
9 |
* debian/ifblacklist_migrate.sh
|
|
10 |
- Only comment out iface lines if we have an exact match for the network
|
|
11 |
interface. (Closes: #612247)
|
| 9 | 12 |
|
| 10 | 13 |
-- Michael Biebl <biebl@debian.org> Sat, 22 Jan 2011 16:53:48 +0100
|
| 11 | 14 |
|
| 40 | 40 |
if test x$nulled_line != x; then
|
| 41 | 41 |
line_count=$(expr $line_count + 1)
|
| 42 | 42 |
fi
|
| 43 | |
done
|
|
43 |
done
|
| 44 | 44 |
|
| 45 | 45 |
if test $line_count -eq 0 -a $word_count -gt 0; then
|
| 46 | 46 |
ifaces_to_disable="$ifaces_to_disable $i"
|
|
| 58 | 58 |
cp $NIF_FILE "$NIF_FILE.bak-${backup_suffix}"
|
| 59 | 59 |
for i in $ifaces_to_disable; do
|
| 60 | 60 |
echo -n "Disabling interface: $i ... "
|
| 61 | |
sed -i -e "s/^\([ \t]*iface.*$i.*\)$/#NetworkManager#\1/" $NIF_FILE
|
|
61 |
sed -i -e "s/^\([ \t]*iface.*[ \t]$i[ \t].*\)$/#NetworkManager#\1/" $NIF_FILE
|
| 62 | 62 |
echo done.
|
| 63 | 63 |
done
|
| 64 | 64 |
fi
|