From e4568b525190677213f0a3290219145c32a6c146 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 6 Mar 2011 20:04:51 +0100 Subject: 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) --- debian/changelog | 3 +++ debian/ifblacklist_migrate.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0558a9dd..67abd8a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ network-manager (0.8.2-6) UNRELEASED; urgency=low - Bump Breaks against network-manager-gnome to (<< 0.8.2) to avoid partial upgrades which can lead to problems with user settings for ethernet connections. (Closes: #612291) + * debian/ifblacklist_migrate.sh + - Only comment out iface lines if we have an exact match for the network + interface. (Closes: #612247) -- Michael Biebl Sun, 06 Mar 2011 17:12:47 +0100 diff --git a/debian/ifblacklist_migrate.sh b/debian/ifblacklist_migrate.sh index 1d41266c..c30971c2 100644 --- a/debian/ifblacklist_migrate.sh +++ b/debian/ifblacklist_migrate.sh @@ -41,7 +41,7 @@ for i in $auto_ifs; do if test x$nulled_line != x; then line_count=$(expr $line_count + 1) fi - done + done if test $line_count -eq 0 -a $word_count -gt 0; then ifaces_to_disable="$ifaces_to_disable $i" @@ -59,7 +59,7 @@ if [ -n "$ifaces_to_disable" ]; then cp $NIF_FILE "$NIF_FILE.bak-${backup_suffix}" for i in $ifaces_to_disable; do echo -n "Disabling interface: $i ... " - sed -i -e "s/^\([ \t]*iface.*$i.*\)$/#NetworkManager#\1/" $NIF_FILE + sed -i -e "s/^\([ \t]*iface.*[ \t]$i[ \t].*\)$/#NetworkManager#\1/" $NIF_FILE echo done. done fi -- cgit 1.3.0-6-gf8a5