~ubuntu-branches/debian/sid/network-manager/sid

« back to all changes in this revision

Viewing changes to debian/ifblacklist_migrate.sh

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2011-03-06 20:59:46 UTC
  • Revision ID: james.westby@ubuntu.com-20110306205946-fpdcb3ordico3ylg
Tags: 0.8.2-6
* debian/patches/83-dnsmasq-send-no-config-file-instead-of-a-bogus-one.patch
  - Newer versions of dnsmasq validate the option parameters more strictly.
    Instead of passing a bogus file name simply use --conf-file without
    additional parameters. (Closes: #615082)
* debian/control
  - Remove old Conflicts/Replaces which were required for upgrades to
    squeeze.
  - 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)
* debian/patches/51-normalized-keys.patch
  - Normalize keys in ifupdown parser, so we accept options with either
    hyphens or underscores, like e.g. bridge_ports and bridge-ports.
    (Closes: #609831)

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
      if test x$nulled_line != x; then
42
42
          line_count=$(expr $line_count + 1)
43
43
      fi
44
 
  done  
 
44
  done
45
45
 
46
46
  if test $line_count -eq 0 -a $word_count -gt 0; then
47
47
     ifaces_to_disable="$ifaces_to_disable $i"
59
59
    cp $NIF_FILE "$NIF_FILE.bak-${backup_suffix}"
60
60
    for i in $ifaces_to_disable; do
61
61
        echo -n "Disabling interface: $i ... "
62
 
        sed -i -e "s/^\([ \t]*iface.*$i.*\)$/#NetworkManager#\1/" $NIF_FILE
 
62
        sed -i -e "s/^\([ \t]*iface.*[ \t]$i[ \t].*\)$/#NetworkManager#\1/" $NIF_FILE
63
63
        echo done.
64
64
    done
65
65
fi