[Piuparts-commits] [piuparts] 02/03: Revert "fix the nsswitch.conf upgrade workarounds"

[Holger Levsen]

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

holger pushed a commit to branch master
in repository piuparts.

commit 0f5f6ace5edfab9daa96c0f25b57453d45f1f949
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jun 17 15:13:04 2015 +0200

    Revert "fix the nsswitch.conf upgrade workarounds"
    
    This reverts commit 6889df7ba21a909c26e26fc2f55bb1ef899e888d.
---
 custom-scripts/scripts/post_distupgrade_exceptions | 6 +++---
 debian/changelog                                   | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/custom-scripts/scripts/post_distupgrade_exceptions b/custom-scripts/scripts/post_distupgrade_exceptions
index cfc1ab7..cfebbcb 100755
--- a/custom-scripts/scripts/post_distupgrade_exceptions
+++ b/custom-scripts/scripts/post_distupgrade_exceptions
@@ -50,9 +50,9 @@ fi
 if [ "$PIUPARTS_DISTRIBUTION" = "jessie" ]; then
 
 	# base-files only upgrades pristine /etc/nsswitch.conf
-	if ! grep -q ^gshadow: /etc/nsswitch.conf ; then
-		echo "Adding gshadow line to /etc/nsswitch.conf"
-		sed -i '/^shadow:/a gshadow:        files' /etc/nsswitch.conf
+	if grep -q ^gshadow: /etc/nsswitch.conf ; then
+		echo "Removing gshadow line from /etc/nsswitch.conf"
+		sed -i /^gshadow:/d /etc/nsswitch.conf
 	fi
 
 fi
diff --git a/debian/changelog b/debian/changelog
index ad91717..fa00be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ piuparts (0.65) UNRELEASED; urgency=medium
   [ Andreas Beckmann ]
   * piuparts.py:
     - Ensure /etc/mtab exists in the chroot.
-  * scripts/post_distupgrade_exceptions:
-    - Fix the /etc/nsswitch.conf wheezy -> jessie upgrade handling.
 
  -- Holger Levsen <holger at debian.org>  Fri, 12 Jun 2015 13:43:42 +0200
 

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