Your message dated Wed, 3 Dec 2014 13:18:58 +0100 with message-id <20141203121857.GD1823@ugent.be> and subject line Re: Bug#771686: unblock: debian-edu-config/1.814 (pre-approval) has caused the Debian Bug report #771686, regarding unblock: debian-edu-config/1.814 (pre-approval) to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 771686: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771686 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: submit@bugs.debian.org
- Subject: unblock: debian-edu-config/1.814 (pre-approval)
- From: Holger Levsen <holger@layer-acht.org>
- Date: Mon, 1 Dec 2014 18:04:42 +0100
- Message-id: <[🔎] 201412011804.50273.holger@layer-acht.org>
Package: release.debian.org Severity: normal x-debbugs-cc: debian-edu@lists.debian.org User: release.debian.org@packages.debian.org Usertags: unblock Hi, this is a pre-approval unblock request for debian-edu-config, which fixes five important bugs and works around another and fixes a testsuite-problem. debian-edu-config (1.814) UNRELEASED; urgency=low [ Petter Reinholdtsen ] * Extend grub workaround to automatically handle /dev/vd*, /dev/hd* and /dev/xvd* in addition to /dev/sd*, allowing virtual machines using virtio, Xen and the old device names to install automatically too (Closes: #769559). * Add new dhclient hook to work around bug #710490 where a race in autofs make it fail with slow DHCP servers (Closes: #769561). * In LTSP setup, allow the purging of openvpn to fail (which happen if it is unknown to apt), to get LTSP installation working using the usbstick ISO (Closes: #770312). [ Wolfgang Schweer ] * testsuite/network: cover case that udev persistent network card rules file isn't written at all. * Provide slbackup-php configuration file etc/slbackup-php/config.php. Without a proper configuration the backupserver default 'localhost' leads to errors if 'https://backup/slbackup-php' isn't called on the backupserver. (Previously the default was 'backup'; it was changed to 'localhost' some time ago to make the package useable on vanilla Debian systems, but a config file for Debian Edu wasn't provided.) (Closes: #769806). * sbin/debian-edu-pxeinstall: add 'mirror/http/mirror' (select entry) from the installed system to the preseed file to avoid manual selection during PXE installations. (Closes: #770302). [ Petter Reinholdtsen ] * Also set mirror/http/mirror when installing from DVD/USB stick. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 $ git diff 1.813..master|diffstat Makefile | 3 debian/changelog | 34 +++++++++- debian/dirs | 1 etc/dhcp/dhclient-exit-hooks.d/autofs-reload | 20 +++++ etc/slbackup-php/config.php | 4 + sbin/debian-edu-pxeinstall | 8 +- share/debian-edu-config/d-i/pre-pkgsel | 4 - share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs | 6 + testsuite/network | 12 ++- 9 files changed, 80 insertions(+), 12 deletions(-) $ git diff 1.813..master > debian-edu-config.1.814.diff $ git log -p 1.813..master > debian-edu-config.1.814.gitdiff # both these files are attached, the gitdiff is sadly not as clean as it could # be... As usual with debian-edu-config, these changes will only affect Debian Edu installations. Thanks for your work on jessie! cheers, Holgerdiff --git a/Makefile b/Makefile index 2586b7d..24d5eb3 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ docdir = $(prefix)/share/doc/$(PACKAGE) mandir = $(prefix)/share/man gosadir = $(sysconfdir)/gosa ldapdir = $(sysconfdir)/ldap +slbackupphpdir = $(sysconfdir)/slbackup-php schemadir = $(ldapdir)/schema dhcpdir = $(sysconfdir)/dhcp libdir = /usr/lib @@ -100,6 +101,7 @@ SYSCONFFILES = \ cfengine/update.conf \ cfengine/inputs/cfagent.conf \ cups/cupsd-debian-edu.conf \ + dhcp/dhclient-exit-hooks.d/autofs-reload \ dhcp/dhclient-exit-hooks.d/wpad-proxy-update \ dhcp/dhclient-exit-hooks.d/fetch-ldap-cert \ dhcp/dhclient-exit-hooks.d/hostname \ @@ -144,6 +146,7 @@ SYSCONFFILES = \ samba/samba-domain-policy.ldif \ security/pam_mount-winbind-debian-edu.conf \ security/pam_mount-stateless-debian-edu.conf \ + slbackup-php/config.php \ smbldap-tools/smbldap_bind.conf \ smbldap-tools/smbldap.conf \ sssd/sssd-debian-edu.conf \ diff --git a/debian/changelog b/debian/changelog index 6ed3c9d..a1c1fc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,36 @@ -debian-edu-config (1.813) unstable; urgency=mmedium +debian-edu-config (1.814) UNRELEASED; urgency=low + + [ Petter Reinholdtsen ] + * Extend grub workaround to automatically handle /dev/vd*, /dev/hd* + and /dev/xvd* in addition to /dev/sd*, allowing virtual machines + using virtio, Xen and the old device names to install + automatically too (Closes: #769559). + * Add new dhclient hook to work around bug #710490 where a race in + autofs make it fail with slow DHCP servers (Closes: #769561). + * In LTSP setup, allow the purging of openvpn to fail (which happen if + it is unknown to apt), to get LTSP installation working using the + usbstick ISO (Closes: #770312). + + [ Wolfgang Schweer ] + * testsuite/network: cover case that udev persistent network card rules + file isn't written at all. + * Provide slbackup-php configuration file etc/slbackup-php/config.php. + Without a proper configuration the backupserver default 'localhost' + leads to errors if 'https://backup/slbackup-php' isn't called on the + backupserver. (Previously the default was 'backup'; it was changed to + 'localhost' some time ago to make the package useable on vanilla + Debian systems, but a config file for Debian Edu wasn't provided.) + (Closes: #769806). + * sbin/debian-edu-pxeinstall: add 'mirror/http/mirror' (select entry) + from the installed system to the preseed file to avoid manual + selection during PXE installations. (Closes: #770302). + + [ Petter Reinholdtsen ] + * Also set mirror/http/mirror when installing from DVD/USB stick. + + -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 + +debian-edu-config (1.813) unstable; urgency=medium * Make LTSP mirror editing more robust. Do not add corrupt APT source when no dist value is set and only add our local mirror if it exist. diff --git a/debian/dirs b/debian/dirs index 7a8dec4..a29294c 100644 --- a/debian/dirs +++ b/debian/dirs @@ -17,6 +17,7 @@ etc/slbackup/pre.d etc/samba etc/samba/netlogon etc/slbackup/pre.d +etc/slbackup-php etc/skel/.local/share etc/X11/Xsession.d usr/bin diff --git a/etc/dhcp/dhclient-exit-hooks.d/autofs-reload b/etc/dhcp/dhclient-exit-hooks.d/autofs-reload new file mode 100755 index 0000000..7276ba1 --- /dev/null +++ b/etc/dhcp/dhclient-exit-hooks.d/autofs-reload @@ -0,0 +1,20 @@ +#!/bin/sh +# Workaround for 710490 where autofs cache failing DNS entries +# when started before the network is up. + +if [ -r /etc/debian-edu/config ] ; then + . /etc/debian-edu/config +fi + +if [ false = "$DHCP_AUTOFS_UPDATE" ] ; then + exit 0 +fi + +case $reason in + BOUND|RENEW|REBIND|REBOOT) + logger -t autofs-reload "reloading autofs from dhcp exit hook" + service autofs reload + ;; + EXPIRE|FAIL|RELEASE|STOP) + ;; +esac diff --git a/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert b/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert old mode 100644 new mode 100755 diff --git a/etc/slbackup-php/config.php b/etc/slbackup-php/config.php new file mode 100644 index 0000000..f72c8ce --- /dev/null +++ b/etc/slbackup-php/config.php @@ -0,0 +1,4 @@ +<?php +$backuphost = 'backup'; +$backupuser = 'root'; +?> diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall index c1682f4..4d5df0b 100755 --- a/sbin/debian-edu-pxeinstall +++ b/sbin/debian-edu-pxeinstall @@ -236,18 +236,20 @@ d-i apt-setup/local0/source boolean true EOF fi - # No use copying the installation mirror setting if a DVD was used - if grep -qi dvd /etc/apt/sources.list ; then + # No use copying the installation mirror setting if a DVD or USB + # stick was used. + if grep -qi 'dvd|bd' /etc/apt/sources.list ; then cat <<EOF # Avoid questions about mirrors, using manual setup choose-mirror-bin mirror/country string manual choose-mirror-bin mirror/protocol select http +choose-mirror-bin mirror/http/mirror select choose-mirror-bin mirror/http/hostname string http.debian.net choose-mirror-bin mirror/http/directory string /debian EOF else - debconf-get-selections --installer | egrep -w 'mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory' | sort + debconf-get-selections --installer | egrep -w 'mirror/http/mirror|mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory' | sort fi # Make it easier to have local overrides and still be able to diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel index 23511c2..1a810c4 100644 --- a/share/debian-edu-config/d-i/pre-pkgsel +++ b/share/debian-edu-config/d-i/pre-pkgsel @@ -314,7 +314,7 @@ create_initial_localadmin_user() { workaround_grub_issue() { log "checking if grub workaround for bug #712907 should be activated." bootdev=$(grep /target/boot /proc/mounts | cut -d" " -f1) - grubdev=$(echo $bootdev | sed -rn 's/(\/sd.).*$/\1/p') + grubdev=$(echo $bootdev | sed -rn 's/^(\/dev\/.*d.)[0-9].*$/\1/p') # Only override if it is set to manual or do not have a value, # otherwise we assume someone is preseeding it to the value they @@ -326,7 +326,7 @@ workaround_grub_issue() { fi case "$bootdev" in - /dev/sd*) + /dev/sd*|/dev/vd*|/dev/hd*|/dev/xvd*) log "overriding grub-installer/choose_bootdev, setting it to $grubdev" db_set grub-installer/choose_bootdev "$grubdev" || true ;; diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs index f4eb7d3..6b7c31f 100644 --- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs +++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs @@ -232,8 +232,10 @@ setup_diskless_workstation() { # No dynamic network configuration on diskless clients. in_target apt-get -y purge network-manager wpasupplicant \ - network-manager-openvpn network-manager-pptp network-manager-vpnc \ - openvpn + network-manager-openvpn network-manager-pptp network-manager-vpnc + + # Do not fail if openvpn isn't installed. This is the case in Jessie + in_target apt-get -y purge openvpn || true # No VPN nor serial network either in_target apt-get -y purge ppp diff --git a/testsuite/network b/testsuite/network index 4782917..8df344c 100755 --- a/testsuite/network +++ b/testsuite/network @@ -153,10 +153,14 @@ fi # Look for bug #765577, duplicate udev entries. rules=/etc/udev/rules.d/70-persistent-net.rules -if [ 1 -lt "$(sed -rn 's/^(SUBSYSTEM=="net", .*)NAME=.*$/\1/p' $rules | sort | uniq -c | sort -nr | awk '{ print $1; exit}')" ] ; then - error "duplicate persistent udev rules for network card in $rules (bug #765577)." -else - success "no duplicate presistent udev rule for network card found." +if [ -f $rules ] ; then + if [ 1 -lt "$(sed -rn 's/^(SUBSYSTEM=="net", .*)NAME=.*$/\1/p' $rules | sort | uniq -c | sort -nr | awk '{ print $1; exit}')" ] ; then + error "duplicate persistent udev rules for network card in $rules (bug #765577)." + else + success "no duplicate persistent udev rule for network card found." + fi + else + success "no network card related udev rules problem; file wasn't even created." fi exit 0commit 1a807fbbd5b926d46488cff6471e7b7016a03280 Author: Petter Reinholdtsen <pere@hungry.com> Date: Thu Nov 20 15:30:14 2014 +0100 Also set mirror/http/mirror when installing from DVD/USB stick. diff --git a/debian/changelog b/debian/changelog index a726785..a1c1fc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ debian-edu-config (1.814) UNRELEASED; urgency=low from the installed system to the preseed file to avoid manual selection during PXE installations. (Closes: #770302). + [ Petter Reinholdtsen ] + * Also set mirror/http/mirror when installing from DVD/USB stick. + -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 debian-edu-config (1.813) unstable; urgency=medium diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall index ef2c2e4..4d5df0b 100755 --- a/sbin/debian-edu-pxeinstall +++ b/sbin/debian-edu-pxeinstall @@ -236,13 +236,15 @@ d-i apt-setup/local0/source boolean true EOF fi - # No use copying the installation mirror setting if a DVD was used - if grep -qi dvd /etc/apt/sources.list ; then + # No use copying the installation mirror setting if a DVD or USB + # stick was used. + if grep -qi 'dvd|bd' /etc/apt/sources.list ; then cat <<EOF # Avoid questions about mirrors, using manual setup choose-mirror-bin mirror/country string manual choose-mirror-bin mirror/protocol select http +choose-mirror-bin mirror/http/mirror select choose-mirror-bin mirror/http/hostname string http.debian.net choose-mirror-bin mirror/http/directory string /debian EOF commit 06bb51be8cbfef69a21d536e9286e1024127f91a Author: Petter Reinholdtsen <pere@hungry.com> Date: Thu Nov 20 13:22:37 2014 +0100 In LTSP setup, allow the purging of openvpn to fail (which happen if it is unknown to apt), to get LTSP installation working using the usbstick ISO (Closes: #770312). diff --git a/debian/changelog b/debian/changelog index 5149035..a726785 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ debian-edu-config (1.814) UNRELEASED; urgency=low automatically too (Closes: #769559). * Add new dhclient hook to work around bug #710490 where a race in autofs make it fail with slow DHCP servers (Closes: #769561). + * In LTSP setup, allow the purging of openvpn to fail (which happen if + it is unknown to apt), to get LTSP installation working using the + usbstick ISO (Closes: #770312). [ Wolfgang Schweer ] * testsuite/network: cover case that udev persistent network card rules diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs index f4eb7d3..6b7c31f 100644 --- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs +++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs @@ -232,8 +232,10 @@ setup_diskless_workstation() { # No dynamic network configuration on diskless clients. in_target apt-get -y purge network-manager wpasupplicant \ - network-manager-openvpn network-manager-pptp network-manager-vpnc \ - openvpn + network-manager-openvpn network-manager-pptp network-manager-vpnc + + # Do not fail if openvpn isn't installed. This is the case in Jessie + in_target apt-get -y purge openvpn || true # No VPN nor serial network either in_target apt-get -y purge ppp commit 59f1966be1a10aca4f9fae6c60bf1bdeee1c7719 Author: Wolfgang Schweer <wschweer@arcor.de> Date: Thu Nov 20 12:22:50 2014 +0100 Add bug number to changelog. diff --git a/debian/changelog b/debian/changelog index 19577ca..5149035 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,7 @@ debian-edu-config (1.814) UNRELEASED; urgency=low (Closes: #769806). * sbin/debian-edu-pxeinstall: add 'mirror/http/mirror' (select entry) from the installed system to the preseed file to avoid manual - selection during PXE installations. + selection during PXE installations. (Closes: #770302). -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 commit 442fecf14e4991696fdae8a48c04780d7744dc44 Author: Wolfgang Schweer <wschweer@arcor.de> Date: Thu Nov 20 12:17:34 2014 +0100 sbin/debian-edu-pxeinstall: add 'mirror/http/mirror' (select entry) from the installed system to the preseed file to avoid manual selection during PXE installations. diff --git a/debian/changelog b/debian/changelog index 1ddc461..19577ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ debian-edu-config (1.814) UNRELEASED; urgency=low 'localhost' some time ago to make the package useable on vanilla Debian systems, but a config file for Debian Edu wasn't provided.) (Closes: #769806). + * sbin/debian-edu-pxeinstall: add 'mirror/http/mirror' (select entry) + from the installed system to the preseed file to avoid manual + selection during PXE installations. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall index c1682f4..ef2c2e4 100755 --- a/sbin/debian-edu-pxeinstall +++ b/sbin/debian-edu-pxeinstall @@ -247,7 +247,7 @@ choose-mirror-bin mirror/http/hostname string http.debian.net choose-mirror-bin mirror/http/directory string /debian EOF else - debconf-get-selections --installer | egrep -w 'mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory' | sort + debconf-get-selections --installer | egrep -w 'mirror/http/mirror|mirror/country|mirror/protocol|mirror/http/hostname|mirror/http/directory|mirror/ftp/hostname|mirror/ftp/directory' | sort fi # Make it easier to have local overrides and still be able to commit 00931d4b26fc191de6317c74dee2d798608b66ff Author: Wolfgang Schweer <wschweer@arcor.de> Date: Sun Nov 16 16:59:59 2014 +0100 Add bug number to changelog. diff --git a/debian/changelog b/debian/changelog index 465dfb8..1ddc461 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ debian-edu-config (1.814) UNRELEASED; urgency=low backupserver. (Previously the default was 'backup'; it was changed to 'localhost' some time ago to make the package useable on vanilla Debian systems, but a config file for Debian Edu wasn't provided.) + (Closes: #769806). -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 commit 24223bbff369d30cb2c090f1ae0cf96065c3fa24 Author: Wolfgang Schweer <wschweer@arcor.de> Date: Sun Nov 16 16:52:08 2014 +0100 Provide slbackup-php configuration file etc/slbackup-php/config.php. Without a proper configuration the backupserver default 'localhost' leads to errors if 'https://backup/slbackup-php' isn't called on the backupserver. (Previously the default was 'backup'; it was changed to 'localhost' some time ago to make the package useable on vanilla Debian systems, but a config file for Debian Edu wasn't provided.) diff --git a/Makefile b/Makefile index b5a1c04..24d5eb3 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ docdir = $(prefix)/share/doc/$(PACKAGE) mandir = $(prefix)/share/man gosadir = $(sysconfdir)/gosa ldapdir = $(sysconfdir)/ldap +slbackupphpdir = $(sysconfdir)/slbackup-php schemadir = $(ldapdir)/schema dhcpdir = $(sysconfdir)/dhcp libdir = /usr/lib @@ -145,6 +146,7 @@ SYSCONFFILES = \ samba/samba-domain-policy.ldif \ security/pam_mount-winbind-debian-edu.conf \ security/pam_mount-stateless-debian-edu.conf \ + slbackup-php/config.php \ smbldap-tools/smbldap_bind.conf \ smbldap-tools/smbldap.conf \ sssd/sssd-debian-edu.conf \ diff --git a/debian/changelog b/debian/changelog index 27e6ba5..465dfb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,12 @@ debian-edu-config (1.814) UNRELEASED; urgency=low [ Wolfgang Schweer ] * testsuite/network: cover case that udev persistent network card rules file isn't written at all. + * Provide slbackup-php configuration file etc/slbackup-php/config.php. + Without a proper configuration the backupserver default 'localhost' + leads to errors if 'https://backup/slbackup-php' isn't called on the + backupserver. (Previously the default was 'backup'; it was changed to + 'localhost' some time ago to make the package useable on vanilla + Debian systems, but a config file for Debian Edu wasn't provided.) -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 diff --git a/debian/dirs b/debian/dirs index 7a8dec4..a29294c 100644 --- a/debian/dirs +++ b/debian/dirs @@ -17,6 +17,7 @@ etc/slbackup/pre.d etc/samba etc/samba/netlogon etc/slbackup/pre.d +etc/slbackup-php etc/skel/.local/share etc/X11/Xsession.d usr/bin diff --git a/etc/slbackup-php/config.php b/etc/slbackup-php/config.php new file mode 100644 index 0000000..f72c8ce --- /dev/null +++ b/etc/slbackup-php/config.php @@ -0,0 +1,4 @@ +<?php +$backuphost = 'backup'; +$backupuser = 'root'; +?> commit 7c75045731b7d04f646ce7d0662ed2ed94ffb3d2 Author: Petter Reinholdtsen <pere@hungry.com> Date: Fri Nov 14 15:16:14 2014 +0100 Add bug numbers to the changelog. diff --git a/debian/changelog b/debian/changelog index aef83ac..27e6ba5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,9 @@ debian-edu-config (1.814) UNRELEASED; urgency=low * Extend grub workaround to automatically handle /dev/vd*, /dev/hd* and /dev/xvd* in addition to /dev/sd*, allowing virtual machines using virtio, Xen and the old device names to install - automatically too. + automatically too (Closes: #769559). * Add new dhclient hook to work around bug #710490 where a race in - autofs make it fail with slow DHCP servers. + autofs make it fail with slow DHCP servers (Closes: #769561). [ Wolfgang Schweer ] * testsuite/network: cover case that udev persistent network card rules commit f62463add6f7e8f0f07b54cbbdea402f482c0e4c Author: Petter Reinholdtsen <pere@hungry.com> Date: Thu Nov 13 22:42:04 2014 +0100 Syslog when reloading autofs from dhclient, to make it easier to track why it happen. diff --git a/etc/dhcp/dhclient-exit-hooks.d/autofs-reload b/etc/dhcp/dhclient-exit-hooks.d/autofs-reload index 7e9830c..7276ba1 100755 --- a/etc/dhcp/dhclient-exit-hooks.d/autofs-reload +++ b/etc/dhcp/dhclient-exit-hooks.d/autofs-reload @@ -12,6 +12,7 @@ fi case $reason in BOUND|RENEW|REBIND|REBOOT) + logger -t autofs-reload "reloading autofs from dhcp exit hook" service autofs reload ;; EXPIRE|FAIL|RELEASE|STOP) commit 8452c25daad4a1f65147277f0b9fff4047f3db1f Author: Petter Reinholdtsen <pere@hungry.com> Date: Thu Nov 13 20:00:09 2014 +0100 Remember to include new script in deb. diff --git a/Makefile b/Makefile index 2586b7d..b5a1c04 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,7 @@ SYSCONFFILES = \ cfengine/update.conf \ cfengine/inputs/cfagent.conf \ cups/cupsd-debian-edu.conf \ + dhcp/dhclient-exit-hooks.d/autofs-reload \ dhcp/dhclient-exit-hooks.d/wpad-proxy-update \ dhcp/dhclient-exit-hooks.d/fetch-ldap-cert \ dhcp/dhclient-exit-hooks.d/hostname \ commit 72b181854febf23a51dc0d9a5df1d439b2a7ca73 Author: Petter Reinholdtsen <pere@hungry.com> Date: Thu Nov 13 17:58:47 2014 +0100 Add new dhclient hook to work around bug #710490 where a race in autofs make it fail with slow DHCP servers. diff --git a/debian/changelog b/debian/changelog index 4a09780..aef83ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ debian-edu-config (1.814) UNRELEASED; urgency=low and /dev/xvd* in addition to /dev/sd*, allowing virtual machines using virtio, Xen and the old device names to install automatically too. + * Add new dhclient hook to work around bug #710490 where a race in + autofs make it fail with slow DHCP servers. [ Wolfgang Schweer ] * testsuite/network: cover case that udev persistent network card rules diff --git a/etc/dhcp/dhclient-exit-hooks.d/autofs-reload b/etc/dhcp/dhclient-exit-hooks.d/autofs-reload new file mode 100755 index 0000000..7e9830c --- /dev/null +++ b/etc/dhcp/dhclient-exit-hooks.d/autofs-reload @@ -0,0 +1,19 @@ +#!/bin/sh +# Workaround for 710490 where autofs cache failing DNS entries +# when started before the network is up. + +if [ -r /etc/debian-edu/config ] ; then + . /etc/debian-edu/config +fi + +if [ false = "$DHCP_AUTOFS_UPDATE" ] ; then + exit 0 +fi + +case $reason in + BOUND|RENEW|REBIND|REBOOT) + service autofs reload + ;; + EXPIRE|FAIL|RELEASE|STOP) + ;; +esac commit 989c9bbfc33af35d6e2f09eab5c14a45eaafb064 Author: Petter Reinholdtsen <pere@hungry.com> Date: Thu Nov 13 17:57:05 2014 +0100 Make dhclient hook executable. diff --git a/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert b/etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert old mode 100644 new mode 100755 commit 31a23ccc6644c605846099760dcf3248e5f69708 Author: Petter Reinholdtsen <pere@hungry.com> Date: Sun Nov 9 07:48:24 2014 +0100 Correct grub workaround to reallyi work with /dev/hdX, /dev/sdX, /dev/vdX and /dev/xvdX. diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel index 16e5f49..1a810c4 100644 --- a/share/debian-edu-config/d-i/pre-pkgsel +++ b/share/debian-edu-config/d-i/pre-pkgsel @@ -314,7 +314,7 @@ create_initial_localadmin_user() { workaround_grub_issue() { log "checking if grub workaround for bug #712907 should be activated." bootdev=$(grep /target/boot /proc/mounts | cut -d" " -f1) - grubdev=$(echo $bootdev | sed -rn 's/(\/sd.).*$/\1/p') + grubdev=$(echo $bootdev | sed -rn 's/^(\/dev\/.*d.)[0-9].*$/\1/p') # Only override if it is set to manual or do not have a value, # otherwise we assume someone is preseeding it to the value they commit cde7f7dc0867f29f742f4f0d8efdbfd7a475d1d9 Author: Wolfgang Schweer <wschweer@arcor.de> Date: Sat Nov 1 23:34:04 2014 +0100 Update changelog. diff --git a/debian/changelog b/debian/changelog index 5a277a8..4a09780 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ debian-edu-config (1.814) UNRELEASED; urgency=low automatically too. [ Wolfgang Schweer ] + * testsuite/network: cover case that udev persistent network card rules + file isn't written at all. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 commit fe79e876ae5079062ff1e5bb5bf4c92c158a50c6 Author: Wolfgang Schweer <wschweer@arcor.de> Date: Sat Nov 1 22:06:34 2014 +0100 Revert "testsuite/network: fix typo to match profile types in file /etc/debian-edu/config." This reverts commit 4ea65971e3ff857faee6f6fc3e4d000b93021d3f. diff --git a/debian/changelog b/debian/changelog index ced6222..5a277a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,10 +7,6 @@ debian-edu-config (1.814) UNRELEASED; urgency=low automatically too. [ Wolfgang Schweer ] - * testsuite/network: cover case that udev persistent network card rules - file isn't written at all. - * testsuite/network: fix typo to match profile types in file - /etc/debian-edu/config. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 diff --git a/testsuite/network b/testsuite/network index 147b936..8df344c 100755 --- a/testsuite/network +++ b/testsuite/network @@ -78,7 +78,7 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do networked=true workstation=true ;; - Thinclient-Server|LTSP-server) + Thin-Client-Server|LTSP-server) networked=true workstation=true ltspserver=true commit 4ea65971e3ff857faee6f6fc3e4d000b93021d3f Author: Wolfgang Schweer <wschweer@arcor.de> Date: Sat Nov 1 21:38:45 2014 +0100 testsuite/network: fix typo to match profile types in file /etc/debian-edu/config. diff --git a/debian/changelog b/debian/changelog index 5a277a8..ced6222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ debian-edu-config (1.814) UNRELEASED; urgency=low automatically too. [ Wolfgang Schweer ] + * testsuite/network: cover case that udev persistent network card rules + file isn't written at all. + * testsuite/network: fix typo to match profile types in file + /etc/debian-edu/config. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 diff --git a/testsuite/network b/testsuite/network index 8df344c..147b936 100755 --- a/testsuite/network +++ b/testsuite/network @@ -78,7 +78,7 @@ for value in `echo $PROFILE |sed 's/ /-/g' | sed 's/,-/ /g'`; do networked=true workstation=true ;; - Thin-Client-Server|LTSP-server) + Thinclient-Server|LTSP-server) networked=true workstation=true ltspserver=true commit 96c0dc3813b7e4577d2d6d0f462ac829f3c7ed98 Author: Wolfgang Schweer <wschweer@arcor.de> Date: Sat Nov 1 21:32:48 2014 +0100 testsuite/network: cover case that udev persistent network card rules file isn't written at all. diff --git a/debian/changelog b/debian/changelog index 15e5e05..5a277a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ debian-edu-config (1.814) UNRELEASED; urgency=low + [ Petter Reinholdtsen ] * Extend grub workaround to automatically handle /dev/vd*, /dev/hd* and /dev/xvd* in addition to /dev/sd*, allowing virtual machines using virtio, Xen and the old device names to install automatically too. + [ Wolfgang Schweer ] + -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 debian-edu-config (1.813) unstable; urgency=medium diff --git a/testsuite/network b/testsuite/network index 4782917..8df344c 100755 --- a/testsuite/network +++ b/testsuite/network @@ -153,10 +153,14 @@ fi # Look for bug #765577, duplicate udev entries. rules=/etc/udev/rules.d/70-persistent-net.rules -if [ 1 -lt "$(sed -rn 's/^(SUBSYSTEM=="net", .*)NAME=.*$/\1/p' $rules | sort | uniq -c | sort -nr | awk '{ print $1; exit}')" ] ; then - error "duplicate persistent udev rules for network card in $rules (bug #765577)." -else - success "no duplicate presistent udev rule for network card found." +if [ -f $rules ] ; then + if [ 1 -lt "$(sed -rn 's/^(SUBSYSTEM=="net", .*)NAME=.*$/\1/p' $rules | sort | uniq -c | sort -nr | awk '{ print $1; exit}')" ] ; then + error "duplicate persistent udev rules for network card in $rules (bug #765577)." + else + success "no duplicate persistent udev rule for network card found." + fi + else + success "no network card related udev rules problem; file wasn't even created." fi exit 0 commit ba562dd2da21860804e5454ebaae4b91b92f5afb Author: Petter Reinholdtsen <pere@hungry.com> Date: Sat Nov 1 19:43:48 2014 +0100 Revert "Enable grub workaround for /dev/ud* devices too." The uda device was a OCR error. This reverts commit 94093add0921824579142d8eee4c8356fd08d29c. diff --git a/debian/changelog b/debian/changelog index 0c32d4a..15e5e05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ debian-edu-config (1.814) UNRELEASED; urgency=low - * Extend grub workaround to automatically handle /dev/vd*, /dev/hd*, - /dev/ud* and /dev/xvd* in addition to /dev/sd*, allowing virtual - machines using virtio, Xen and the old device names to install + * Extend grub workaround to automatically handle /dev/vd*, /dev/hd* + and /dev/xvd* in addition to /dev/sd*, allowing virtual machines + using virtio, Xen and the old device names to install automatically too. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel index 9bc19a2..16e5f49 100644 --- a/share/debian-edu-config/d-i/pre-pkgsel +++ b/share/debian-edu-config/d-i/pre-pkgsel @@ -326,7 +326,7 @@ workaround_grub_issue() { fi case "$bootdev" in - /dev/sd*|/dev/vd*|/dev/hd*|/dev/xvd*|/dev/ud*) + /dev/sd*|/dev/vd*|/dev/hd*|/dev/xvd*) log "overriding grub-installer/choose_bootdev, setting it to $grubdev" db_set grub-installer/choose_bootdev "$grubdev" || true ;; commit 94093add0921824579142d8eee4c8356fd08d29c Author: Petter Reinholdtsen <pere@hungry.com> Date: Sat Nov 1 19:39:55 2014 +0100 Enable grub workaround for /dev/ud* devices too. diff --git a/debian/changelog b/debian/changelog index 15e5e05..0c32d4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ debian-edu-config (1.814) UNRELEASED; urgency=low - * Extend grub workaround to automatically handle /dev/vd*, /dev/hd* - and /dev/xvd* in addition to /dev/sd*, allowing virtual machines - using virtio, Xen and the old device names to install + * Extend grub workaround to automatically handle /dev/vd*, /dev/hd*, + /dev/ud* and /dev/xvd* in addition to /dev/sd*, allowing virtual + machines using virtio, Xen and the old device names to install automatically too. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel index 16e5f49..9bc19a2 100644 --- a/share/debian-edu-config/d-i/pre-pkgsel +++ b/share/debian-edu-config/d-i/pre-pkgsel @@ -326,7 +326,7 @@ workaround_grub_issue() { fi case "$bootdev" in - /dev/sd*|/dev/vd*|/dev/hd*|/dev/xvd*) + /dev/sd*|/dev/vd*|/dev/hd*|/dev/xvd*|/dev/ud*) log "overriding grub-installer/choose_bootdev, setting it to $grubdev" db_set grub-installer/choose_bootdev "$grubdev" || true ;; commit 2f38dfe931c2cf82140a70fe3ad2aec3b9286647 Author: Petter Reinholdtsen <pere@hungry.com> Date: Sat Nov 1 11:32:47 2014 +0100 Extend grub workaround to automatically handle /dev/vd*, /dev/hd* and /dev/xvd* in addition to /dev/sd*, allowing virtual machines using virtio, Xen and the old device names to install diff --git a/debian/changelog b/debian/changelog index 6ff7cd4..15e5e05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ debian-edu-config (1.814) UNRELEASED; urgency=low - * Extend grub workaround to automatically handle /dev/vd* in addition - to /dev/sd*, allowing virtio virtual machines to install + * Extend grub workaround to automatically handle /dev/vd*, /dev/hd* + and /dev/xvd* in addition to /dev/sd*, allowing virtual machines + using virtio, Xen and the old device names to install automatically too. -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel index db23b3b..16e5f49 100644 --- a/share/debian-edu-config/d-i/pre-pkgsel +++ b/share/debian-edu-config/d-i/pre-pkgsel @@ -326,7 +326,7 @@ workaround_grub_issue() { fi case "$bootdev" in - /dev/sd*|/dev/vd*) + /dev/sd*|/dev/vd*|/dev/hd*|/dev/xvd*) log "overriding grub-installer/choose_bootdev, setting it to $grubdev" db_set grub-installer/choose_bootdev "$grubdev" || true ;; commit 8bc5b191c74343ad7ea528c0b46f52c8e9d8c7d0 Author: Petter Reinholdtsen <pere@hungry.com> Date: Sat Nov 1 07:27:53 2014 +0100 Extend grub workaround to automatically handle /dev/vd* in addition to /dev/sd*, allowing virtio virtual machines to install automatically too. diff --git a/debian/changelog b/debian/changelog index 6e8a594..6ff7cd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debian-edu-config (1.814) UNRELEASED; urgency=low + + * Extend grub workaround to automatically handle /dev/vd* in addition + to /dev/sd*, allowing virtio virtual machines to install + automatically too. + + -- Petter Reinholdtsen <pere@debian.org> Sat, 01 Nov 2014 07:25:41 +0100 + debian-edu-config (1.813) unstable; urgency=medium * Make LTSP mirror editing more robust. Do not add corrupt APT source diff --git a/share/debian-edu-config/d-i/pre-pkgsel b/share/debian-edu-config/d-i/pre-pkgsel index 23511c2..db23b3b 100644 --- a/share/debian-edu-config/d-i/pre-pkgsel +++ b/share/debian-edu-config/d-i/pre-pkgsel @@ -326,7 +326,7 @@ workaround_grub_issue() { fi case "$bootdev" in - /dev/sd*) + /dev/sd*|/dev/vd*) log "overriding grub-installer/choose_bootdev, setting it to $grubdev" db_set grub-installer/choose_bootdev "$grubdev" || true ;; commit 20da7e7658dcc191f42d225a536b11634d41d75b Author: Holger Levsen <holger@layer-acht.org> Date: Sat Oct 25 19:18:39 2014 +0200 correct urgency diff --git a/debian/changelog b/debian/changelog index 6ed3c9d..6e8a594 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debian-edu-config (1.813) unstable; urgency=mmedium +debian-edu-config (1.813) unstable; urgency=medium * Make LTSP mirror editing more robust. Do not add corrupt APT source when no dist value is set and only add our local mirror if it exist.Attachment: signature.asc
Description: This is a digitally signed message part.
--- End Message ---
--- Begin Message ---
- To: Holger Levsen <holger@layer-acht.org>, 771686-done@bugs.debian.org
- Subject: Re: Bug#771686: unblock: debian-edu-config/1.814 (pre-approval)
- From: Ivo De Decker <ivodd@debian.org>
- Date: Wed, 3 Dec 2014 13:18:58 +0100
- Message-id: <20141203121857.GD1823@ugent.be>
- In-reply-to: <[🔎] 201412021325.43857.holger@layer-acht.org>
- References: <[🔎] 201412011804.50273.holger@layer-acht.org> <[🔎] 20141201210753.GT23644@lupin.home.powdarrmonkey.net> <[🔎] 201412021325.43857.holger@layer-acht.org>
Hi Holger, On Tue, Dec 02, 2014 at 01:25:32PM +0100, Holger Levsen wrote: > thanks, uploaded and accepted. Unblocked. Cheers, Ivo
--- End Message ---