Package: release.debian.org Severity: normal Tags: trixie X-Debbugs-Cc: [email protected] Control: affects -1 + src:debian-edu-install User: [email protected] Usertags: pu
This upload of debian-edu-config targets at releasing Debian Edu 13 (available via D-I / debian-cd) after the Debian 13.8 point release. Note that Debian Edu 13 development has only started around end of August 2026 and Debian Edu in trixie is currently totally non-functional. [ Reason ] Fix installation of main server during packaging installation phase in D-I. Fix auto-selecting Debian Edu installation profile (by fixing the counting of network cards). Improve etckeeper setup. [ Impact ] No functional Debian Edu 13. [ Tests ] All code changes have been tested on Debian Edu 13 machines during developemnt. All recent debian-edu-* changes are now also backed by a range of integration tests in Debian's openQA. Tests in openQA run against the latest Debian Edu 13 ISO images, complemented by packages from trixie-proposed-updates and for a selected range of packages we include package builds created by Salsa CI. [ Risks ] Minimal. Only for Debian Edu. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable [ Changes ] +debian-edu-install (2.12.11+deb13u2) trixie; urgency=medium + + [ Roland Clobus ] + * Fixed network card counting + * Profile: do not always select LTSP-Server (Closes: 1148259) + * Whitespace: normalisation + * etckeeper: nicer log messages + + -- Mike Gabriel <[email protected]> Tue, 03 Nov 2026 16:52:30 +0100 + +debian-edu-install (2.12.11+deb13u1) trixie; urgency=medium + + [ Daniel Teichmann ] + * preseed-values/defaults.main-server: Preseed + icinga2-ido-mysql/dbconfig-install to false. Needed after + debian-edu 2.13.1 (d5c688a7) and debian-edu-config 858a9689. + + -- Mike Gabriel <[email protected]> Tue, 25 Aug 2026 20:45:27 +0200 [ Other info ] Getting this package into trixie before the Debian 13.8 point release will be highly appreciated!!!
diff -Nru debian-edu-install-2.12.11/debian/changelog debian-edu-install-2.12.11+deb13u2/debian/changelog --- debian-edu-install-2.12.11/debian/changelog 2025-03-13 20:39:32.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/debian/changelog 2026-11-03 16:52:30.000000000 +0100 @@ -1,3 +1,22 @@ +debian-edu-install (2.12.11+deb13u2) trixie; urgency=medium + + [ Roland Clobus ] + * Fixed network card counting + * Profile: do not always select LTSP-Server (Closes: 1148259) + * Whitespace: normalisation + * etckeeper: nicer log messages + + -- Mike Gabriel <[email protected]> Tue, 03 Nov 2026 16:52:30 +0100 + +debian-edu-install (2.12.11+deb13u1) trixie; urgency=medium + + [ Daniel Teichmann ] + * preseed-values/defaults.main-server: Preseed + icinga2-ido-mysql/dbconfig-install to false. Needed after + debian-edu 2.13.1 (d5c688a7) and debian-edu-config 858a9689. + + -- Mike Gabriel <[email protected]> Tue, 25 Aug 2026 20:45:27 +0200 + debian-edu-install (2.12.11) unstable; urgency=medium * Team upload. diff -Nru debian-edu-install-2.12.11/debian-edu-profile debian-edu-install-2.12.11+deb13u2/debian-edu-profile --- debian-edu-install-2.12.11/debian-edu-profile 2023-12-23 19:05:40.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/debian-edu-profile 2026-09-28 10:01:34.000000000 +0200 @@ -117,7 +117,7 @@ # Return the number of non-wireless network interfaces non_wifi_iface_count() { count=0 - for iface in $(ip -o link | grep '^.: eth'|cut -d: -f2) ; do + for iface in $(ip -o link | cut -d: -f2 | grep -v '^ lo$'); do if [ -d /sys/class/net/$iface/wireless ] ; then : else @@ -166,12 +166,11 @@ defaultprofile="Standalone" laptop=true else - defaultprofile="Main-Server, LTSP-Server, Workstation" - mainserver=true + defaultprofile="Main-Server, Workstation" fi fi -if [ true != "$mainserver" ] && [ true != "$laptop" ] \ +if [ true != "$laptop" ] \ && [ 1 -lt $(non_wifi_iface_count) ] ; then log "several network cards detected, preselecting ltsp-server" defaultprofile="$defaultprofile, LTSP-Server" diff -Nru debian-edu-install-2.12.11/preseed-values/defaults.main-server debian-edu-install-2.12.11+deb13u2/preseed-values/defaults.main-server --- debian-edu-install-2.12.11/preseed-values/defaults.main-server 2020-03-26 00:10:30.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/preseed-values/defaults.main-server 2026-08-25 20:44:13.000000000 +0200 @@ -29,6 +29,13 @@ # Kerberos KDC and admin server krb5-admin-server krb5-admin-server/kadmind boolean true +# Skip Icinga 2 IDO MySQL dbconfig setup during d-i. The package moved +# from cfengine (debian-edu-config 858a9689) to pkgsel (debian-edu +# d5c688a7 / 2.13.1). policy-rc.d does not start mariadb in the installer, +# so dbconfig-common would fail connecting to /run/mysqld/mysqld.sock. +# edu-icinga-setup creates the database later. +icinga2-ido-mysql icinga2-ido-mysql/dbconfig-install boolean false + # Do not enable the WINS feature of samba-common, because this profile # does not get a address via DHCP samba-common samba-common/dhcp boolean false diff -Nru debian-edu-install-2.12.11/tools/edu-etcvcs debian-edu-install-2.12.11+deb13u2/tools/edu-etcvcs --- debian-edu-install-2.12.11/tools/edu-etcvcs 2017-03-02 20:20:10.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/tools/edu-etcvcs 2026-09-28 10:01:34.000000000 +0200 @@ -17,23 +17,39 @@ commit() { info "Running etckeeper commit" if [ -x /target/usr/bin/etckeeper ] ; then - in-target /usr/bin/etckeeper \ - commit "Automatic commit during installation" || true + in-target /usr/bin/etckeeper \ + commit "Automatic commit during installation" || true fi } init() { if [ -x /target/usr/bin/etckeeper ] && [ -d /target/etc/.git ]; then - return + # Already installed and initialised + return fi + if [ ! -x /target/usr/bin/git ]; then + apt-install git || true + fi + # Configure git to prevent messages about the default branch + OLD_DEFAULTBRANCH=$(in-target --pass-stdout git config get --global init.defaultBranch || true) + in-target git config set --global init.defaultBranch main + # The postinst of etckeeper initialises /etc/.git apt-install etckeeper || true + # Restore the original git configuration + if [ -z ${OLDDEFAULTBRANCH} ]; then + in-target git config unset --global init.defaultBranch + else + in-target git config set --global init.defaultBranch "${OLD_DEFAULTBRANCH}" + fi + # If this was a fresh installation, $HOME was not set and the configuration file is empty + if [ ! -s /target/.gitconfig ]; then + rm -f /target/.gitconfig + fi if [ -x /target/usr/bin/etckeeper ] ; then - if in-target /usr/bin/etckeeper init ; then - in-target /usr/bin/etckeeper vcs config --global user.name "Local Administrator" - in-target /usr/bin/etckeeper vcs config --global user.email "root@localhost" - else - info "Running etckeeper init failed" - fi + echo -e "#!/bin/sh\ncd /etc\ngit config user.name \"STOP! Use 'etckeeper commit' instead\"" > /target/set_git_username.sh + chmod a+x /target/set_git_username.sh + in-target /set_git_username.sh + rm -f /target/set_git_username.sh else error "Unable to install and enable etckeeper" fi @@ -41,9 +57,9 @@ case "$1" in init) - init - ;; + init + ;; commit) - commit - ;; + commit + ;; esac
diff -Nru debian-edu-install-2.12.11/debian/changelog debian-edu-install-2.12.11+deb13u2/debian/changelog --- debian-edu-install-2.12.11/debian/changelog 2025-03-13 20:39:32.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/debian/changelog 2026-11-03 16:52:30.000000000 +0100 @@ -1,3 +1,22 @@ +debian-edu-install (2.12.11+deb13u2) trixie; urgency=medium + + [ Roland Clobus ] + * Fixed network card counting + * Profile: do not always select LTSP-Server (Closes: 1148259) + * Whitespace: normalisation + * etckeeper: nicer log messages + + -- Mike Gabriel <[email protected]> Tue, 03 Nov 2026 16:52:30 +0100 + +debian-edu-install (2.12.11+deb13u1) trixie; urgency=medium + + [ Daniel Teichmann ] + * preseed-values/defaults.main-server: Preseed + icinga2-ido-mysql/dbconfig-install to false. Needed after + debian-edu 2.13.1 (d5c688a7) and debian-edu-config 858a9689. + + -- Mike Gabriel <[email protected]> Tue, 25 Aug 2026 20:45:27 +0200 + debian-edu-install (2.12.11) unstable; urgency=medium * Team upload. diff -Nru debian-edu-install-2.12.11/debian-edu-profile debian-edu-install-2.12.11+deb13u2/debian-edu-profile --- debian-edu-install-2.12.11/debian-edu-profile 2023-12-23 19:05:40.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/debian-edu-profile 2026-09-28 10:01:34.000000000 +0200 @@ -117,7 +117,7 @@ # Return the number of non-wireless network interfaces non_wifi_iface_count() { count=0 - for iface in $(ip -o link | grep '^.: eth'|cut -d: -f2) ; do + for iface in $(ip -o link | cut -d: -f2 | grep -v '^ lo$'); do if [ -d /sys/class/net/$iface/wireless ] ; then : else @@ -166,12 +166,11 @@ defaultprofile="Standalone" laptop=true else - defaultprofile="Main-Server, LTSP-Server, Workstation" - mainserver=true + defaultprofile="Main-Server, Workstation" fi fi -if [ true != "$mainserver" ] && [ true != "$laptop" ] \ +if [ true != "$laptop" ] \ && [ 1 -lt $(non_wifi_iface_count) ] ; then log "several network cards detected, preselecting ltsp-server" defaultprofile="$defaultprofile, LTSP-Server" diff -Nru debian-edu-install-2.12.11/preseed-values/defaults.main-server debian-edu-install-2.12.11+deb13u2/preseed-values/defaults.main-server --- debian-edu-install-2.12.11/preseed-values/defaults.main-server 2020-03-26 00:10:30.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/preseed-values/defaults.main-server 2026-08-25 20:44:13.000000000 +0200 @@ -29,6 +29,13 @@ # Kerberos KDC and admin server krb5-admin-server krb5-admin-server/kadmind boolean true +# Skip Icinga 2 IDO MySQL dbconfig setup during d-i. The package moved +# from cfengine (debian-edu-config 858a9689) to pkgsel (debian-edu +# d5c688a7 / 2.13.1). policy-rc.d does not start mariadb in the installer, +# so dbconfig-common would fail connecting to /run/mysqld/mysqld.sock. +# edu-icinga-setup creates the database later. +icinga2-ido-mysql icinga2-ido-mysql/dbconfig-install boolean false + # Do not enable the WINS feature of samba-common, because this profile # does not get a address via DHCP samba-common samba-common/dhcp boolean false diff -Nru debian-edu-install-2.12.11/tools/edu-etcvcs debian-edu-install-2.12.11+deb13u2/tools/edu-etcvcs --- debian-edu-install-2.12.11/tools/edu-etcvcs 2017-03-02 20:20:10.000000000 +0100 +++ debian-edu-install-2.12.11+deb13u2/tools/edu-etcvcs 2026-09-28 10:01:34.000000000 +0200 @@ -17,23 +17,39 @@ commit() { info "Running etckeeper commit" if [ -x /target/usr/bin/etckeeper ] ; then - in-target /usr/bin/etckeeper \ - commit "Automatic commit during installation" || true + in-target /usr/bin/etckeeper \ + commit "Automatic commit during installation" || true fi } init() { if [ -x /target/usr/bin/etckeeper ] && [ -d /target/etc/.git ]; then - return + # Already installed and initialised + return fi + if [ ! -x /target/usr/bin/git ]; then + apt-install git || true + fi + # Configure git to prevent messages about the default branch + OLD_DEFAULTBRANCH=$(in-target --pass-stdout git config get --global init.defaultBranch || true) + in-target git config set --global init.defaultBranch main + # The postinst of etckeeper initialises /etc/.git apt-install etckeeper || true + # Restore the original git configuration + if [ -z ${OLDDEFAULTBRANCH} ]; then + in-target git config unset --global init.defaultBranch + else + in-target git config set --global init.defaultBranch "${OLD_DEFAULTBRANCH}" + fi + # If this was a fresh installation, $HOME was not set and the configuration file is empty + if [ ! -s /target/.gitconfig ]; then + rm -f /target/.gitconfig + fi if [ -x /target/usr/bin/etckeeper ] ; then - if in-target /usr/bin/etckeeper init ; then - in-target /usr/bin/etckeeper vcs config --global user.name "Local Administrator" - in-target /usr/bin/etckeeper vcs config --global user.email "root@localhost" - else - info "Running etckeeper init failed" - fi + echo -e "#!/bin/sh\ncd /etc\ngit config user.name \"STOP! Use 'etckeeper commit' instead\"" > /target/set_git_username.sh + chmod a+x /target/set_git_username.sh + in-target /set_git_username.sh + rm -f /target/set_git_username.sh else error "Unable to install and enable etckeeper" fi @@ -41,9 +57,9 @@ case "$1" in init) - init - ;; + init + ;; commit) - commit - ;; + commit + ;; esac
