[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 3 commits: Adjust workaround for isc-dhcp-server-ldap bug. (Closes: #989340)

[Wolfgang Schweer (@schweer-guest)]

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


Commits:
7849a194 by Wolfgang Schweer at 2021-06-01T15:00:50+02:00
Adjust workaround for isc-dhcp-server-ldap bug. (Closes: #989340)

share/debian-edu-config/isc-dhcp-server.{service,service.eth1_only}:
Use ExecStartPre command inspired by the isc-dhcp-server init script
instead of a sleep command.

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

- - - - -
8306ef39 by Wolfgang Schweer at 2021-06-01T15:05:53+02:00
Fix Exim configuration on client systems. (Closes: #989338)

cf3/cf.exim: Use exim-ldap-client-v4.conf file as exim4.conf on client machines.

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

- - - - -
b010b3b5 by Wolfgang Schweer at 2021-06-01T15:10:40+02:00
Adjust sbin/debian-edu-ltsp-install. (Closes: #989342)

Use the BD ISO image to setup X2Go thin client support only if the script is run
inside the Debian Installer environment.

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

- - - - -


5 changed files:

- cf3/cf.exim
- debian/changelog
- sbin/debian-edu-ltsp-install
- share/debian-edu-config/isc-dhcp-server.service
- share/debian-edu-config/isc-dhcp-server.service.eth1_only


Changes:

=====================================
cf3/cf.exim
=====================================
@@ -10,6 +10,12 @@ files:
       move_obstructions => "true";
     "/etc/default/exim4"
       edit_line => exim_default;
+
+  debian.!server.(workstation|minimal).installation::
+
+    "/etc/exim4/exim4.conf"
+      link_from => ln_s("/etc/exim4/exim-ldap-client-v4.conf"),
+      move_obstructions => "true";
 }
 
 bundle edit_line exim_default


=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+debian-edu-config (2.11.56) UNRELEASED; urgency=medium
+
+  * Adjust workaround for isc-dhcp-server-ldap bug. (Closes: #989340)
+    - share/debian-edu-config/isc-dhcp-server.{service,service.eth1_only}:
+      Use ExecStartPre command inspired by the isc-dhcp-server init script
+      instead of a sleep command.
+  * Fix Exim configuration on client systems. (Closes: #989338)
+    - cf3/cf.exim:
+      Use exim-ldap-client-v4.conf file as exim4.conf on client machines.
+  * Adjust sbin/debian-edu-ltsp-install. (Closes: #989342)
+    - Use the BD ISO image to setup X2Go thin client support only if the script
+      is run inside the Debian Installer environment.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 01 Jun 2021 14:47:38 +0200
+
 debian-edu-config (2.11.55) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -341,8 +341,8 @@ cat <<EOF > /etc/ltsp/skel/.x2goclient/settings
 show=false
 EOF
 
-# Specific settings needed if BD ISO image is used for installation.
-if grep -q BD /etc/apt/sources.list ; then
+# Specific settings needed if BD ISO image is used for installation inside d-i.
+if [ -e /etc/apt/apt.conf.d/00IgnoreTimeConflict ] && grep -q BD /etc/apt/sources.list ; then
 	BD_ISO="true";
 	device="$(grep media/cdrom /etc/fstab | cut -d' ' -f1)"
 	mirror="file:///media/cdrom/"
@@ -365,7 +365,6 @@ debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=linux-imag
 	if [ "true" == "$BD_ISO" ] ; then
 		mkdir -p /srv/ltsp/thin/"$thin_type"-"$arch"/media/cdrom
 		mount $device /srv/ltsp/thin/"$thin_type"-"$arch"/media/cdrom
-		cp /var/cache/apt/*.bin /srv/ltsp/thin/"$thin_type"-"$arch"/var/cache/apt/
 		echo "deb [trusted=yes] $mirror $dist main" > /srv/ltsp/thin/"$thin_type"-"$arch"/etc/apt/sources.list
 	fi
 	chroot /srv/ltsp/thin/"$thin_type"-"$arch"/ apt -y -qq install education-thin-client p910nd


=====================================
share/debian-edu-config/isc-dhcp-server.service
=====================================
@@ -7,7 +7,7 @@ Requires=slapd.service
 Type=forking
 RestartSec=2s
 Restart=on-failure
-ExecStartPre=-sleep 2
+ExecStartPre=-/usr/bin/touch /var/lib/dhcp/dhcpd.leases
 ExecStart=/usr/sbin/dhcpd -4 -q -cf /etc/dhcp/dhcpd.conf
 
 [Install]


=====================================
share/debian-edu-config/isc-dhcp-server.service.eth1_only
=====================================
@@ -7,7 +7,7 @@ Requires=slapd.service
 Type=forking
 RestartSec=2s
 Restart=on-failure
-ExecStartPre=-sleep 2
+ExecStartPre=-/usr/bin/touch /var/lib/dhcp/dhcpd.leases
 ExecStart=/usr/sbin/dhcpd -4 -q -cf /etc/dhcp/dhcpd.conf eth1
 
 [Install]



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/32376c9ba3dd4ba9e9995e3937afb2a17b560063...b010b3b50987b9520eafb053e6f8e780e175813b

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/32376c9ba3dd4ba9e9995e3937afb2a17b560063...b010b3b50987b9520eafb053e6f8e780e175813b
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/20210601/f0f97a48/attachment-0001.htm>