Version in base suite: 2.12.11+deb13u1

Base version: debian-edu-install_2.12.11+deb13u1
Target version: debian-edu-install_2.12.11+deb13u2
Base file: /srv/ftp-master.debian.org/ftp/pool/main/d/debian-edu-install/debian-edu-install_2.12.11+deb13u1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/d/debian-edu-install/debian-edu-install_2.12.11+deb13u2.dsc

 debian-edu-profile |    7 +++----
 debian/changelog   |   10 ++++++++++
 tools/edu-etcvcs   |   42 +++++++++++++++++++++++++++++-------------
 3 files changed, 42 insertions(+), 17 deletions(-)

dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmp4t17y3p0/debian-edu-install_2.12.11+deb13u1.dsc: no acceptable signature found
dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmp4t17y3p0/debian-edu-install_2.12.11+deb13u2.dsc: no acceptable signature found
diff -Nru debian-edu-install-2.12.11+deb13u1/debian/changelog debian-edu-install-2.12.11+deb13u2/debian/changelog
--- debian-edu-install-2.12.11+deb13u1/debian/changelog	2026-08-25 18:45:27.000000000 +0000
+++ debian-edu-install-2.12.11+deb13u2/debian/changelog	2026-11-03 15:52:30.000000000 +0000
@@ -1,3 +1,13 @@
+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 <sunweaver@debian.org>  Tue, 03 Nov 2026 16:52:30 +0100
+
 debian-edu-install (2.12.11+deb13u1) trixie; urgency=medium
 
   [ Daniel Teichmann ]
diff -Nru debian-edu-install-2.12.11+deb13u1/debian-edu-profile debian-edu-install-2.12.11+deb13u2/debian-edu-profile
--- debian-edu-install-2.12.11+deb13u1/debian-edu-profile	2023-08-29 21:10:13.000000000 +0000
+++ debian-edu-install-2.12.11+deb13u2/debian-edu-profile	2026-09-28 08:01:34.000000000 +0000
@@ -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+deb13u1/tools/edu-etcvcs debian-edu-install-2.12.11+deb13u2/tools/edu-etcvcs
--- debian-edu-install-2.12.11+deb13u1/tools/edu-etcvcs	2017-08-21 18:22:46.000000000 +0000
+++ debian-edu-install-2.12.11+deb13u2/tools/edu-etcvcs	2026-09-28 08:01:34.000000000 +0000
@@ -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