[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] debian/debian-edu-config.postinst: Adjust to really fix bug ##982448

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
8a3fe14d by Wolfgang Schweer at 2021-02-16T14:08:34+01:00
debian/debian-edu-config.postinst: Adjust to really fix bug ##982448

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


2 changed files:

- debian/changelog
- debian/debian-edu-config.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+debian-edu-config (2.11.50) UNRELEASED; urgency=medium
+
+  * debian/debian-edu-config.postinst: Adjust to really fix bug ##982448.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 16 Feb 2021 14:06:21 +0100
+
 debian-edu-config (2.11.49) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/debian-edu-config.postinst
=====================================
@@ -166,11 +166,15 @@ configure)
 	if [ -s /etc/debian-edu/config ] && ! grep -Eq "(Main-Server)" /etc/debian-edu/config ; then
 		rm -f /etc/network/if-up.d/wpad-proxy-update
 		rm -f /etc/network/if-up.d/hostname
-		if [ -f /etc/network/interfaces ] && ! grep -q gateway /etc/hostname && \
-			! grep -q update-proxy /etc/network/interfaces ; then
-			sed -i '/iface eth0 inet dhcp/a \    post-up \/usr\/share\/debian-edu-config\/tools\/update-proxy-from-wpad' \
-			sed -i '/iface eth0 inet dhcp/a \    post-up \/usr\/sbin\/update-hostname-from-ip' \
-			/etc/network/interfaces
+		if [ -f /etc/network/interfaces ] && ! grep -q gateway /etc/hostname ; then
+			if ! grep -q update-proxy /etc/network/interfaces ; then
+				sed -i '/iface eth0 inet dhcp/a \    post-up \/usr\/share\/debian-edu-config\/tools\/update-proxy-from-wpad' \
+				/etc/network/interfaces
+			fi
+			if ! grep -q update-hostname /etc/network/interfaces ; then
+				sed -i '/iface eth0 inet dhcp/a \    post-up \/usr\/sbin\/update-hostname-from-ip' \
+				/etc/network/interfaces
+			fi
 		fi
 	fi
 
@@ -244,8 +248,8 @@ configure)
         fi
     fi
 	# Ensure the main server interfaces file doesn't contain post-up stanzas.
-	if dpkg --compare-versions "$2" lt "2.11.48" ; then
-		if [ -f /etc/network/interfaces ] ; then
+	if dpkg --compare-versions "$2" lt "2.11.50" ; then
+		if [ -f /etc/network/interfaces ] && grep -qE "(Main-Server)" /etc/debian-edu/config; then
 			sed -i '/post-up/d' /etc/network/interfaces
 		fi
 	fi



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/8a3fe14dae9b8a67edd73e495127ad217ec45cf6

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/8a3fe14dae9b8a67edd73e495127ad217ec45cf6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210216/adb974bb/attachment-0001.html>