[Piuparts-commits] [piuparts] 02/08: exception for nsswitch.conf on wheezy->jessie upgrades

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit e57062ffb9d4bb1fc9140b2109f430c2ec695155
Author: Andreas Beckmann <anbe at debian.org>
Date:   Wed Jan 14 23:22:57 2015 +0100

    exception for nsswitch.conf on wheezy->jessie upgrades
    
    delete the gshadow line if it is still present
    base-files only upgrades pristine /etc/nsswitch.conf
    (i.e. no mdns modifications)
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 custom-scripts/scripts/post_distupgrade_exceptions | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/custom-scripts/scripts/post_distupgrade_exceptions b/custom-scripts/scripts/post_distupgrade_exceptions
index 3e8d83d..ff8aaf6 100755
--- a/custom-scripts/scripts/post_distupgrade_exceptions
+++ b/custom-scripts/scripts/post_distupgrade_exceptions
@@ -21,3 +21,13 @@ if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ]; then
 	esac
 
 fi
+
+if [ "$PIUPARTS_DISTRIBUTION" = "jessie" ]; then
+
+	# base-files only upgrades pristine /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

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