[debian-edu-commits] debian-edu/ 01/01: Drop share/debian-edu-config/tools/workaround-udev-bug-765577 as this has been fixed in udev in Jessie.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit a52e431b1c5e59b41dbcb390f57d13779afb58fa
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri May 20 01:05:02 2016 +0200

    Drop share/debian-edu-config/tools/workaround-udev-bug-765577 as this has been fixed in udev in Jessie.
---
 Makefile                                           |  1 -
 debian/changelog                                   |  2 +
 share/debian-edu-config/d-i/pre-pkgsel             | 10 ---
 .../tools/workaround-udev-bug-765577               | 71 ----------------------
 4 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/Makefile b/Makefile
index e398d33..bc835fd 100644
--- a/Makefile
+++ b/Makefile
@@ -393,7 +393,6 @@ install: install-testsuite
 		share/debian-edu-config/tools/subnet-change \
 		share/debian-edu-config/tools/update-firefox-homepage \
 		share/debian-edu-config/tools/update-proxy-from-wpad \
-		share/debian-edu-config/tools/workaround-udev-bug-765577 \
 		share/debian-edu-config/tools/wpad-extract \
 		share/debian-edu-config/tools/debian-edu-dovecot-create-cert \
 		share/debian-edu-config/tools/migrate-squid-to-squid3 \
diff --git a/debian/changelog b/debian/changelog
index 52c8c5e..074777f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debian-edu-config (1.902) UNRELEASED; urgency=medium
       packages. 
   * Drop bin/debconf-set-selections-edu workaround and use debconf's
     debconf-set-selections as both #636219 and #711693 are fixed since Jessie.
+  * Drop share/debian-edu-config/tools/workaround-udev-bug-765577 as this has
+    been fixed in udev in Jessie.
 
  -- Holger Levsen <holger at debian.org>  Fri, 20 May 2016 00:39:38 +0200
 
diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel
index 33a5472..c60d883 100644
--- a/share/debian-edu-config/d-i/pre-pkgsel
+++ b/share/debian-edu-config/d-i/pre-pkgsel
@@ -205,16 +205,6 @@ EOF
 	echo "$MAILNAME" > /target/etc/mailname
     fi
 
-    # Workaround for bug in d-i/udev, causing duplicate entries in
-    # /etc/udev/rules.d/70-persistent-net.rules in both d-i and
-    # /target/.  See bug $765577 for the details.
-    # FIXME remember to remove this code when the bug is fixed
-    if in-target /usr/share/debian-edu-config/tools/workaround-udev-bug-765577 ; then
-	error "disabled duplicate udev rule (bug #765577)"
-    else
-	log "no duplicate udev rule (bug #765577)"
-    fi
-
     # Make sure that the interfaces are there for the cfengine run if
     # network isn't already configured
     if route | grep -q default ; then
diff --git a/share/debian-edu-config/tools/workaround-udev-bug-765577 b/share/debian-edu-config/tools/workaround-udev-bug-765577
deleted file mode 100755
index 7054c58..0000000
--- a/share/debian-edu-config/tools/workaround-udev-bug-765577
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/perl
-#
-# Implement workaround for bug #765577 by removing duplicate entries
-# from the persistent network interface name rule before rebooting for
-# the first time, to make sure eth0 is present on the machines with
-# fixed network setup in /etc/network/interfaces
-
-use strict;
-use warnings;
-use Getopt::Std;
-
-my $bugurl = "https://bugs.debian.org/765577";
-
-my $rulefile = "/etc/udev/rules.d/70-persistent-net.rules";
-my $newfile = "$rulefile.new";
-
-my $debug = 0;
-my %linecache;
-my $modified = 0;
-my %opts;
-
-sub usage {
-    my $retval = shift;
-    print <<EOF;
-Usage: $0: [-dn]
-Fix
-  -d   enable debugging
-  -n   do not modify $rulefile
-EOF
-  exit($retval) if $retval;
-}
-
-getopts("dn", \%opts) || usage(1);
-
-open(my $rh, '<', $rulefile) || die "error: unable to read from $rulefile";
-my $wh;
-if (!$opts{'n'}) {
-    open($wh, '>', "$newfile") || die "error: unable to write to $newfile";
-}
-my $shortline;
-while (my $line = <$rh>) {
-    $shortline = $line;
-    $shortline =~ s/, NAME="[^"]+"//;
-    print STDERR "shortline: '$shortline'\n" if $opts{'d'};
-    if ($shortline !~ m/^\s*$/
-        && $shortline =~ m/^SUBSYSTEM=/
-        && exists $linecache{$shortline}) {
-        # Seen the same line before, skip it.
-        print STDERR "skipping line\n" if $opts{'d'};
-        $modified = 1;
-        if (!$opts{'n'}) {
-            print $wh "# Duplicate entry disabled, workaround for $bugurl\n#$line";
-        }
-        next;
-    }
-    $linecache{$shortline} = 1;
-    if (!$opts{'n'}) {
-        print $wh $line;
-    }
-}
-close($rh);
-if (!$opts{'n'}) {
-    close($wh);
-    if ($modified) {
-        rename("$newfile", "$rulefile") || die "error: unable to rename $newfile to $rulefile";
-    } else {
-        unlink $newfile;
-    }
-} else {
-}
-exit ! $modified;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git