[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 5 commits: Add TERM=linux to share/debian-edu-config/tools/gosa-sync

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
4373b92c by Wolfgang Schweer at 2021-01-29T10:48:09+01:00
Add TERM=linux to share/debian-edu-config/tools/gosa-sync

 Without this explicit setting a password can't be set or modified any longer.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
cfb69940 by Wolfgang Schweer at 2021-01-29T10:51:20+01:00
Make share/debian-edu-config/d-i/finish-installmore robust

Avoid a totally broken installation in case modprobe fails inside the target chroot.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
8a85a509 by Wolfgang Schweer at 2021-01-29T10:52:02+01:00
Adjust cf3/cf.dhcpserver

Correct class statement for several profile cases.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
6f0cdcbd by Wolfgang Schweer at 2021-01-29T10:53:49+01:00
Adjust share/debian-edu-config/isc-dhcp-server.{service,service.eth1}

Make sure the slapd.service is available before the DHCP server tries to fetch
the configuration from LDAP.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
b961c9c6 by Wolfgang Schweer at 2021-01-29T10:57:57+01:00
Add changelog entries for last commits

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


6 changed files:

- cf3/cf.dhcpserver
- debian/changelog
- share/debian-edu-config/d-i/finish-install
- share/debian-edu-config/isc-dhcp-server.service
- share/debian-edu-config/isc-dhcp-server.service.eth1_only
- share/debian-edu-config/tools/gosa-sync


Changes:

=====================================
cf3/cf.dhcpserver
=====================================
@@ -16,12 +16,12 @@ files:
       link_from => ln_s("/etc/dhcp/dhclient-debian-edu.conf"),
       move_obstructions => "true";
 
-  debian.server.ltspserver::
+  debian.(server|server.ltspserver).installation::
 
     "/etc/systemd/system/isc-dhcp-server.service"
       copy_from => local_cp("/usr/share/debian-edu-config/isc-dhcp-server.service");
 
-  debian.!server.ltspserver::
+  debian.!server.ltspserver.installation::
 
     "/etc/systemd/system/isc-dhcp-server.service"
       copy_from => local_cp("/usr/share/debian-edu-config/isc-dhcp-server.service.eth1_only");


=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+debian-edu-config (2.11.47) UNRELEASED; urgency=medium
+
+  * Cope with issues found during recent installations.
+    - share/debian-edu-config/tools/gosa-sync: Add TERM=linux. Without this
+      explicit setting a password can't be set or modified any longer.
+    - share/debian-edu-config/d-i/finish-install: Make script more robust to
+      avoid a totally broken installation in case modprobe fails inside target.
+    - cf3/cf.dhcpserver: Correct class statement for several profile cases.
+    - share/debian-edu-config/isc-dhcp-server.service and
+      share/debian-edu-config/isc-dhcp-server.service.eth1: Make sure the
+      slapd.service is available before the DHCP server tries to fetch the
+      configuration from LDAP.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 28 Jan 2021 11:40:39 +0100
+
 debian-edu-config (2.11.46) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -35,9 +35,9 @@ PROFILE="$RET"
 
 # Create LTSP thin client image and iPXE setup in case of a combined server.
 if echo "$PROFILE" | grep -Eq 'Main-Server.*LTSP-Server' ; then
-	in-target /bin/sh -c "modprobe squashfs"
-	in-target /bin/sh -c "modprobe loop"
-	in-target /bin/sh -c "modprobe overlay"
+	in-target /bin/sh -c "modprobe squashfs" || true
+	in-target /bin/sh -c "modprobe loop" || true
+	in-target /bin/sh -c "modprobe overlay" || true
 	if in-target /bin/sh -c "/usr/sbin/debian-edu-ltsp-install --diskless_workstation no --thin_type bare" ; then
 		log "info: Running 'debian-edu-ltsp-install' succeeded"
 	else


=====================================
share/debian-edu-config/isc-dhcp-server.service
=====================================
@@ -1,16 +1,13 @@
-# Automatically generated by systemd-sysv-generator
-
 [Unit]
 Description=DHCP server
-After=network.target network-online.target slapd.service
-Wants=network-online.target
+After=network.target network-online.target
+Requires=slapd.service
 
 [Service]
 Type=forking
-KillSignal=SIGINT
 RestartSec=2s
 Restart=on-failure
-StartLimitInterval=12s
+ExecStartPre=-sleep 2
 ExecStart=/usr/sbin/dhcpd -4 -q -cf /etc/dhcp/dhcpd.conf
 
 [Install]


=====================================
share/debian-edu-config/isc-dhcp-server.service.eth1_only
=====================================
@@ -1,16 +1,13 @@
-# Automatically generated by systemd-sysv-generator
-
 [Unit]
 Description=DHCP server
-After=network.target network-online.target slapd.service
-Wants=network-online.target
+After=network.target network-online.target
+Requires=slapd.service
 
 [Service]
 Type=forking
-KillSignal=SIGINT
 RestartSec=2s
 Restart=on-failure
-StartLimitInterval=12s
+ExecStartPre=-sleep 2
 ExecStart=/usr/sbin/dhcpd -4 -q -cf /etc/dhcp/dhcpd.conf eth1
 
 [Install]


=====================================
share/debian-edu-config/tools/gosa-sync
=====================================
@@ -14,6 +14,7 @@ set -e
 ## A caller not knowing the correct ldap password cannot change the
 ## principal's one.
 
+TERM=linux
 USERDN="$1"
 USERID=`echo "$USERDN" | sed "s/^uid=\([^,]*\),.*$/\1/"`
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/f30965423de8f56aa04bfe00af5d2ef68d927e6a...b961c9c634341ac0f562906e14c8c484b942fd79

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/f30965423de8f56aa04bfe00af5d2ef68d927e6a...b961c9c634341ac0f562906e14c8c484b942fd79
You're receiving this email because of your account on salsa.debian.org.


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