Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
I'd like to upload debian-edu-config/2.10.65+deb10u6 to buster to fix #966129
where Roland F. Teichert reported that normal Edu workstations loose their IP
address after about 30 minutes since system boot. The fix is already in unstable
and has successfully been tested by the bug submitter too.
debian-edu-config (2.10.65+deb10u6) buster; urgency=medium
[ Wolfgang Schweer ]
* Fix loss of dynamically allocated v4 IP address. (Closes: #966129)
- Drop etc/network/if-up.d/wpad-proxy-update. This script fails to work due
to changed behaviour of the ifupdown/dhclient/systemd combination and now
also causes the loss of a dynamically allocated ipv4 IP address about 30
minutes after booting.
- Add code to d/debian-edu-config.postinstall to implement the intended
proxy setting update after a WPAD change just after rebooting the system.
(It would otherwise happen at first DHCP lease renewal ~15 minutes later.)
- Adjust Makefile and debian/dirs.
$ debdiff debian-edu-config_2.10.65+deb10u5.dsc debian-edu-config_2.10.65+deb10u6.dsc |diffstat
Makefile | 1 -
debian/changelog | 15 +++++++++++++++
debian/debian-edu-config.postinst | 20 +++++++++++---------
debian/dirs | 1 -
4 files changed, 26 insertions(+), 11 deletions(-)
The full diff is attached.
Thanks for your work on buster!
--
cheers,
Holger
-------------------------------------------------------------------------------
holger@(debian|reproducible-builds|layer-acht).org
PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C
diff -Nru debian-edu-config-2.10.65+deb10u5/debian/changelog debian-edu-config-2.10.65+deb10u6/debian/changelog
--- debian-edu-config-2.10.65+deb10u5/debian/changelog 2020-04-16 02:34:38.000000000 +0200
+++ debian-edu-config-2.10.65+deb10u6/debian/changelog 2020-07-26 15:13:43.000000000 +0200
@@ -1,3 +1,18 @@
+debian-edu-config (2.10.65+deb10u6) buster; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * Fix loss of dynamically allocated v4 IP address. (Closes: #966129)
+ - Drop etc/network/if-up.d/wpad-proxy-update. This script fails to work due
+ to changed behaviour of the ifupdown/dhclient/systemd combination and now
+ also causes the loss of a dynamically allocated ipv4 IP address about 30
+ minutes after booting.
+ - Add code to d/debian-edu-config.postinstall to implement the intended
+ proxy setting update after a WPAD change just after rebooting the system.
+ (It would otherwise happen at first DHCP lease renewal ~15 minutes later.)
+ - Adjust Makefile and debian/dirs.
+
+ -- Holger Levsen <holger@debian.org> Sun, 26 Jul 2020 15:13:43 +0200
+
debian-edu-config (2.10.65+deb10u5) buster; urgency=medium
[ Wolfgang Schweer ]
diff -Nru debian-edu-config-2.10.65+deb10u5/debian/debian-edu-config.postinst debian-edu-config-2.10.65+deb10u6/debian/debian-edu-config.postinst
--- debian-edu-config-2.10.65+deb10u5/debian/debian-edu-config.postinst 2020-04-16 02:30:54.000000000 +0200
+++ debian-edu-config-2.10.65+deb10u6/debian/debian-edu-config.postinst 2020-07-26 15:04:00.000000000 +0200
@@ -224,20 +224,22 @@
chmod 600 /etc/sssd/sssd-debian-edu.conf
chown root:root /etc/sssd/sssd-debian-edu.conf
- # The scripts in /etc/network/if-up.d need to be executable.
- # Drop wpad-proxy-update for the main server, it makes no sense to run the
- # script at this time. Also drop it for the gateway, it doesn't make sense.
- if egrep -q "(Main-Server)" /etc/debian-edu/config || grep -q gateway /etc/hostname; then
- rm -f /etc/network/if-up.d/wpad-proxy-update
- else
- chmod +x /etc/network/if-up.d/wpad-proxy-update
- fi
+ # Add post-up stanza to interfaces file to let proxy changes take effect
+ # immediately after reboot (would take up to 15 min. otherwise). Exclude the
+ # gateway; the script doesn't make sense and would taint network setup.
+ rm -f /etc/network/if-up.d/wpad-proxy-update
+ 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' \
+ /etc/network/interfaces
+ fi
# Add post-up stanza to interfaces file to let hostname changes take effect
# immediately after reboot (would take up to 15 min. otherwise). Exclude the
# gateway; the script doesn't make sense and would taint network setup.
+ rm -f /etc/network/if-up.d/hostname
if [ -f /etc/network/interfaces ] && ! grep -q gateway /etc/hostname && \
- ! grep -q post-up /etc/network/interfaces ; then
+ ! 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
diff -Nru debian-edu-config-2.10.65+deb10u5/debian/dirs debian-edu-config-2.10.65+deb10u6/debian/dirs
--- debian-edu-config-2.10.65+deb10u5/debian/dirs 2020-04-16 02:30:54.000000000 +0200
+++ debian-edu-config-2.10.65+deb10u6/debian/dirs 2020-07-26 15:04:00.000000000 +0200
@@ -14,7 +14,6 @@
etc/ldap/schema
etc/ldap/ssl
etc/ltsp
-etc/network/if-up.d/
etc/pam.d
etc/slbackup/pre.d
etc/samba
diff -Nru debian-edu-config-2.10.65+deb10u5/Makefile debian-edu-config-2.10.65+deb10u6/Makefile
--- debian-edu-config-2.10.65+deb10u5/Makefile 2020-04-16 02:34:30.000000000 +0200
+++ debian-edu-config-2.10.65+deb10u6/Makefile 2020-07-26 15:04:00.000000000 +0200
@@ -102,7 +102,6 @@
ldap/rootDSE-debian-edu.ldif \
ldap/slapd-debian-edu.conf \
ltsp/ltsp-build-client.conf \
- network/if-up.d/wpad-proxy-update \
samba/netlogon/1stlogon/1stlogon.bat \
samba/netlogon/config/get_time.bat \
samba/netlogon/config/penguin.bat \
Attachment:
signature.asc
Description: PGP signature