[Git][debian-edu/debian-edu-config][personal/sunweaver/cfengine-no-service-policy] 6 commits: debian/control: Add to D: (debian-edu-config): procps. (Closes: #1136493).

Mike Gabriel pushed to branch personal/sunweaver/cfengine-no-service-policy at Debian Edu / debian-edu-config


Commits:
9710a70a by Mike Gabriel at 2026-08-19T23:25:59+02:00
debian/control: Add to D: (debian-edu-config): procps. (Closes: #1136493).

- - - - -
760801e3 by Wolfgang Schweer at 2026-08-19T23:42:53+02:00
share/debian-edu-config/d-i/pre-pkgsel: Cleanup pre-pkgsel from cruft. (Closes: #1055648).

- - - - -
63575146 by Mike Gabriel at 2026-08-20T18:10:19+02:00
ldap-tools/ldap-debian-edu-install: Make sure interactions with debconf are UTF-8 based.

This resolves GECOS field transliteration after having retrieved
debian-edu-config/first-user-fullname from the debconf db.

(Closes: #939717).

- - - - -
6e60cafb by Daniel Teichmann at 2026-08-21T11:22:45+02:00
debian/debian-edu-config.lintian-overrides: Fix stale reference. (Fixes commit: 63575146)

https://jenkins.debian.net/job/edu-packages_sid_debian-edu-config/1078/console

- - - - -
0033de22 by Daniel Teichmann at 2026-08-21T14:49:39+00:00
Drop unused wicd preconnect hook

wicd is no longer in Debian. The hook was the only remaining wicd
integration and is not referenced anywhere else in the package.

- - - - -
732692c0 by Mike Gabriel at 2026-08-21T14:50:23+00:00
cf3/cf.cfengine3: Stop cfengine3 service on all Debian Edu machines

Esp. cf-execd (calling cf-agent command) clobbers the log on all Debian
Edu clients (Debian Edu 12 and onwards) and thus on syslog.intern (aka
tjener).

In Debian Edu, we use cfengine3 for managing configuration adjustments
via manual invocation of the cf-agent command, but we don't support
(yet?) to use cfengine3 for constant system management.

Partially addresses #1051834.

- - - - -


8 changed files:

- Makefile
- cf3/cf.cfengine3
- debian/control
- debian/debian-edu-config.lintian-overrides
- debian/debian-edu-config.maintscript
- − etc/wicd/scripts/preconnect/set_wireless_mac_from_eth0
- ldap-tools/ldap-debian-edu-install
- share/debian-edu-config/d-i/pre-pkgsel


Changes:

=====================================
Makefile
=====================================
@@ -158,7 +158,6 @@ SYSCONFSCRIPTS = \
 	mklocaluser.d/20-debian-edu-config \
 	shutdown-at-night/clients-generator \
 	resolvconf/update.d/bind-debian-edu \
-	wicd/scripts/preconnect/set_wireless_mac_from_eth0 \
 	X11/Xsession-debian-edu \
 	$(NULL)
 


=====================================
cf3/cf.cfengine3
=====================================
@@ -4,7 +4,7 @@ bundle agent cfengine3
 
 services:
 
-  debian.systemd.(server|ltspserver).installation::
+  debian.systemd.installation::
 
     "cfengine3.service"
       service_policy => "stop";


=====================================
debian/control
=====================================
@@ -54,6 +54,7 @@ Depends: ${misc:Depends},
          ng-utils,
          openssl,
          patch,
+         procps,
          python3,
          python3-notify2,
          ssl-cert,


=====================================
debian/debian-edu-config.lintian-overrides
=====================================
@@ -1,5 +1,5 @@
 debian-edu-config: non-standard-apache2-configuration-name debian-edu-config-doc.conf != debian-edu-config.conf [etc/apache2/conf-available/debian-edu-config-doc.conf]
-debian-edu-config: debconf-is-not-a-registry [usr/bin/ldap-debian-edu-install:12]
+debian-edu-config: debconf-is-not-a-registry [usr/bin/ldap-debian-edu-install:15]
 debian-edu-config: debconf-is-not-a-registry [usr/share/debian-edu-config/d-i/finish-install:10]
 debian-edu-config: debconf-is-not-a-registry [usr/share/debian-edu-config/d-i/pre-pkgsel:9]
 debian-edu-config: debconf-is-not-a-registry [usr/share/debian-edu-config/tools/edu-icinga-setup:24]


=====================================
debian/debian-edu-config.maintscript
=====================================
@@ -4,3 +4,4 @@ rm_conffile /etc/cfengine3/debian-edu/cf.ldapscripts 2.12.6~
 dir_to_symlink /etc/debian-edu/host-keytabs /var/lib/debian-edu/host-keytabs 2.12.18~
 rm_conffile /etc/init.d/fetch-ldap-cert 2.12.34~
 rm_conffile /etc/dhcp/dhclient-exit-hooks.d/fetch-ldap-cert 2.12.44~
+rm_conffile /etc/wicd/scripts/preconnect/set_wireless_mac_from_eth0 2.13.1~


=====================================
etc/wicd/scripts/preconnect/set_wireless_mac_from_eth0 deleted
=====================================
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Make sure wifi MAC is the same as wired MAC, to get DHCP to work with
-# static assignment.
-
-set -e
-
-PATH=/sbin:$PATH
-export PATH
-
-iface_mac() {
-    IF="$1"
-    LC_ALL=C ifconfig $IF | grep HWa | cut -c39-55
-}
-
-MAC1=$(iface_mac eth0)
-MACW0=$(iface_mac wlan0)
-if [ "$MACW0" ] ; then
-    logger -t wicd/set_wireless_mac_from_eth0 \
-	"changing MAC address of wlan0 from $MACW0 to $MAC1"
-    ifconfig wlan0 down
-    ifconfig wlan0 hw ether $MAC1
-    ifconfig wlan0 up
-fi


=====================================
ldap-tools/ldap-debian-edu-install
=====================================
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+# Assure that interactions with debconf database are UTF-8 interactions.
+export LANG=C.UTF-8
+
 # This script is run during installation of the main server inside Debian Installer.
 # Don't ever use it manually! You will definitely ruin your main server!
 
@@ -111,7 +114,7 @@ fi
 ################# password available now ##################
 
 lookup_mac_addrs() {
-    PATH=/sbin:$PATH LANG=C ifconfig 2>/dev/null | grep -i hwaddr | awk '{print $5}' | sort -u
+    PATH=/sbin:$PATH ifconfig 2>/dev/null | grep -i hwaddr | awk '{print $5}' | sort -u
 }
 
 slapd_stop() {


=====================================
share/debian-edu-config/d-i/pre-pkgsel
=====================================
@@ -266,37 +266,6 @@ EOF
     fi
 }
 
-create_initial_localadmin_user() {
-    LOCAL_USER_ID="localadmin"
-    LOCAL_USER_GECOS="Local Administrator"
-    LOCAL_USER_UIDNUMBER="1000"
-    LOCAL_USER_PRIMGIDNUMBER="1000"
-
-    LOCAL_USER_INGROUPS="$LOCAL_USER_INGROUPS adm sudo"
-
-    if db_get passwd/root-password-crypted && [ "$RET" ] ; then
-	log "No clear text root password, unable to use it for creating the initial local user"
-    else
-	# retrieve root password
-	db_get passwd/root-password
-	LOCAL_USER_PASSWD=$RET
-	# create initial local user
-	in-target /usr/sbin/addgroup --gid $LOCAL_USER_PRIMGIDNUMBER $LOCAL_USER_ID 1>&2 || true
-	in-target /usr/sbin/adduser --gid $LOCAL_USER_PRIMGIDNUMBER \
-		--firstuid $LOCAL_USER_UIDNUMBER \
-		--home /home/$LOCAL_USER_ID \
-		--shell /bin/bash \
-		--disabled-login \
-		--gecos "$LOCAL_USER_GECOS" $LOCAL_USER_ID 1>&2 || true
-	# add initial local user to some standard system groups
-	for group in ${LOCAL_USER_INGROUPS}; do
-		in-target /usr/sbin/adduser $LOCAL_USER_ID $group 1>&2 || true
-	done
-	# set password (batch mode)
-	in-target /bin/sh -c "echo ${LOCAL_USER_ID}:${LOCAL_USER_PASSWD} | /usr/sbin/chpasswd" 1>&2 || true
-    fi
-}
-
 # Work around grub bug #712907 (see also bug #763580) by preseeding
 # grub-installer/choose_device to the disk used by /target/boot
 # This fix it for the most common case.
@@ -348,7 +317,6 @@ for p in $(echo $PROFILE | tr , " ") ; do
     case $p in
 	# Only do this for the networked tasks, not for standalone
 	Main-Server|Workstation|Roaming-Workstation|LTSP-Server|Minimal)
-	    #create_initial_localadmin_user
 	    in-target /usr/share/debian-edu-config/tools/preseed-ldap-kerberos
 	    in-target /usr/share/debian-edu-config/tools/preseed-sitesummary
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/5b62e0c259ac4fe37d6c148e2b455e6f1d92e86d...732692c0cfbca41807b4620bf1f88ad9bf4b241a

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/5b62e0c259ac4fe37d6c148e2b455e6f1d92e86d...732692c0cfbca41807b4620bf1f88ad9bf4b241a
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

_______________________________________________
debian-edu-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-edu-commits