[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 5 commits: Revert "cf3/cf.cfengine3: Simplify. Use systemctl calls always."

Mike Gabriel (@sunweaver) gitlab at salsa.debian.org
Mon Nov 9 00:22:21 GMT 2026



Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
883fffad by Mike Gabriel at 2026-11-09T00:43:57+01:00
Revert "cf3/cf.cfengine3: Simplify. Use systemctl calls always."

This reverts commit 9caada60507ae6a5737f5e6b0d8072f2f531890d.

- - - - -
47b71cae by Mike Gabriel at 2026-11-09T00:44:11+01:00
cf3/cf.cfengine3: Simplify. Use systemctl calls always.

- - - - -
52f1ff5a by Mike Gabriel at 2026-11-09T00:44:11+01:00
update-firefox-homepage: With Firefox-ESR in Debian 13.7/13.8 the browser.startup.homepage only needs the URL. (Closes: #1153470).

- - - - -
e052e08f by Mike Gabriel at 2026-11-09T00:57:51+01:00
run-at-firstboot: Capture the case that the DLW/X2GoTC chroots don't yet exist.

- - - - -
ce89adfd by Mike Gabriel at 2026-11-09T01:22:04+01:00
release as 2.13.7

Signed-off-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>

- - - - -


2 changed files:

- debian/changelog
- share/debian-edu-config/tools/run-at-firstboot


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-debian-edu-config (2.13.7) UNRELEASED; urgency=medium
+debian-edu-config (2.13.7) unstable; urgency=medium
 
   * libexec/debian-edu-apache2-update-tjener-aliases:
     - Stop modifying the apache2_tjener-aliases.map under /usr at runtime.
@@ -36,13 +36,15 @@ debian-edu-config (2.13.7) UNRELEASED; urgency=medium
       slapd maintainers in Debian or tweak the slapd.service systemd unit
       itself. (Closes: #1153454).
   * cf3/cf.cfengine3:
-    - Ensure better that all cfengine3 related sub-services get stopped and
-      disabled during finish-install.
-    - In fact, cfengine3 in a D-I chroot fails to mask systemd services, so
-      providing an alternative via shell during D-I / FAI installation.
-      (Closes: #1153457). Also, mask the services, not just disable.
+    - Ensure that all cfengine3 related sub-services get stopped and masked
+      during finish-install.
+    - In fact, simplify cfengine3 service deactivations and use systemctl to
+      mask those services. (Closes: #1153457).
+  * update-firefox-homepage:
+    - With Firefox-ESR in Debian 13.7/13.8 the browser.startup.homepage only
+      needs the URL. (Closes: #1153470).
 
- -- Mike Gabriel <sunweaver at debian.org>  Sun, 08 Nov 2026 23:46:21 +0100
+ -- Mike Gabriel <sunweaver at debian.org>  Mon, 09 Nov 2026 00:46:06 +0100
 
 debian-edu-config (2.13.6) unstable; urgency=medium
 


=====================================
share/debian-edu-config/tools/run-at-firstboot
=====================================
@@ -78,7 +78,7 @@ if ! is_ltsp_client; then
 		if [ -d /srv/ltsp/dlw ] && [ -z "$(find /srv/ltsp/dlw/ -name "SUCCESSFULLY_CREATED_*")" ]; then
 			rm -Rf /srv/ltsp/dlw
 		fi
-		if [ -n "$(find /srv/ltsp/dlw/ -name "SUCCESSFULLY_CREATED_*")" ]; then
+		if [ ! -d /srv/ltsp/dlw ] || [ -n "$(find /srv/ltsp/dlw/ -name "SUCCESSFULLY_CREATED_*")" ]; then
 			/usr/sbin/debian-edu-ltsp-install --dlw yes
 		fi
 	# else if this runs on a pure LTSP-Server (no Main-Server role), then
@@ -92,10 +92,10 @@ if ! is_ltsp_client; then
 	fi
 	# Always create the thin client image for all LTSP-Server variants/combinations.
 	if echo "$PROFILE" | grep -Eq 'LTSP-Server'; then
-		if [ -d /srv/ltsp/x2go-bare-amd64/ ] && [ -z "$(find /srv/ltsp/x2go-bare-amd64/ -name "SUCCESSFULLY_CREATED_*")" ]; then
+		if [ -d /srv/ltsp/x2go-bare-amd64 ] && [ -z "$(find /srv/ltsp/x2go-bare-amd64/ -name "SUCCESSFULLY_CREATED_*")" ]; then
 			rm -Rf /srv/ltsp/x2go-bare-amd64/
 		fi
-		if [ -n "$(find /srv/ltsp/x2go-bare-amd64/ -name "SUCCESSFULLY_CREATED_*")" ]; then
+		if [ ! -d /srv/ltsp/x2go-bare-amd64 ] || [ -n "$(find /srv/ltsp/x2go-bare-amd64/ -name "SUCCESSFULLY_CREATED_*")" ]; then
 			/usr/sbin/debian-edu-ltsp-install --thin_type bare
 		fi
 	fi



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/9caada60507ae6a5737f5e6b0d8072f2f531890d...ce89adfd920d8b858e3a1497514c8285ca286485

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/9caada60507ae6a5737f5e6b0d8072f2f531890d...ce89adfd920d8b858e3a1497514c8285ca286485
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


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


More information about the debian-edu-commits mailing list