[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Improve LTSP related tools
Wolfgang Schweer (@schweer-guest)
gitlab at salsa.debian.org
Mon Nov 8 23:17:15 GMT 2021
Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config
Commits:
bba22c98 by Wolfgang Schweer at 2021-11-09T00:15:52+01:00
Improve LTSP related tools
sbin/debian-edu-ltsp-install: Care for sitesummary-client installation and
LTSP client type specific configuration.
sbin/debian-edu-ltsp-ipxe: Care for PXE installation related menu items.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
3 changed files:
- debian/changelog
- sbin/debian-edu-ltsp-install
- sbin/debian-edu-ltsp-ipxe
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+debian-edu-config (2.12.12) UNRELEASED; urgency=medium
+
+ * Improve LTSP related tools:
+ - sbin/debian-edu-ltsp-install: Care for sitesummary-client installation and
+ LTSP client type specific configuration.
+ - sbin/debian-edu-ltsp-ipxe: Care for PXE installation related menu items.
+
+ -- Wolfgang Schweer <wschweer at arcor.de> Mon, 08 Nov 2021 17:37:34 +0100
+
debian-edu-config (2.12.11) unstable; urgency=medium
[ Wolfgang Schweer ]
=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -18,7 +18,7 @@
# Licence: GPL2+
# first edited: 2019-11-21
-version=2021-10-02
+version=2021-11-08
set -e
@@ -431,7 +431,7 @@ export DEBIAN_FRONTEND=noninteractive
if ! [ "" == "$thin_type" ] && [ ! -d /srv/tftp/ltsp/x2go-"$thin_type"-"$arch"/etc/ltsp ] ; then
mkdir -p /srv/tftp/ltsp/x2go-"$thin_type"-"$arch"
# Install common thin client packages.
-debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=linux-image-"$kernel_arch" \
+debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=sitesummary-client,linux-image-"$kernel_arch" \
"$dist" /srv/ltsp/x2go-"$thin_type"-"$arch" "$mirror"
# Unset temporary directory variables to avoid problems when directory
# is missing inside the chroot. https://bugs.debian.org/765443
@@ -466,12 +466,18 @@ debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=linux-imag
rm -rf /srv/ltsp/x2go-"$thin_type"-"$arch"/var/cache/debconf
rm -rf /srv/ltsp/x2go-"$thin_type"-"$arch"/var/cache/man
fi
+ # Configure locale et al.
cp /etc/locale.gen /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/
cp /etc/default/locale /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/default
chroot /srv/ltsp/x2go-"$thin_type"-"$arch" locale-gen
cp /etc/default/keyboard /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/default
cp /etc/default/console-setup /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/default
chroot /srv/ltsp/x2go-"$thin_type"-"$arch" setupcon -k
+ # Configure Sitesummary.
+ cp -r /etc/sitesummary/config.d/ /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/sitesummary/
+ cp -f /etc/sitesummary/site /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/sitesummary/
+ cp -f /etc/sitesummary/sitegroup /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/sitesummary/
+ echo ltsp-client > /srv/ltsp/x2go-"$thin_type"-"$arch"/etc/sitesummary/hostclass
# Customize X2Go client for Debian Edu use.
if [ "display" == "$thin_type" ] || [ "desktop" == "$thin_type" ] ; then
@@ -547,6 +553,7 @@ if [ "yes" == "$diskless_workstation" ] ; then
PRE_INIT_AUTOFS="echo 'LDAPURI=ldap://ldap' >> /etc/default/autofs"
PRE_INIT_MAIN_SERVER="systemctl enable autofs"
POST_INIT_USE_FQDN="sed -i '/10.0.2.2/ s/server/tjener.intern tjener/' /etc/hosts"
+POST_INIT_SITESUMMARY="sed -i 's/main-server/ltsp-client/' /etc/sitesummary/hostclass"
MASK_SYSTEM_SERVICES="apache2 named cups dovecot etckeeper exim4 squid tftpd-hpa \
icinga2 nmbd slapd smbd systemd-journald xrdp xrdp-sesman krb5-kdc mariadb cfengine3 isc-dhcp-server"
EOF
@@ -638,6 +645,10 @@ EOF
cp /etc/ssl/certs/debian-edu-server.crt /srv/ltsp/dlw/etc/ssl/certs/
cp /usr/local/share/ca-certificates/*.crt /srv/ltsp/dlw/usr/local/share/ca-certificates/
chroot /srv/ltsp/dlw update-ca-certificates
+ # Adjust Sitesummary configuration
+ cp -f /etc/sitesummary/site /srv/ltsp/dlw/etc/sitesummary/
+ cp -f /etc/sitesummary/sitegroup /srv/ltsp/dlw/etc/sitesummary/
+ echo ltsp-client > /srv/ltsp/dlw/etc/sitesummary/hostclass
# Care for temporary mounts.
umount /srv/ltsp/dlw/dev/pts
=====================================
sbin/debian-edu-ltsp-ipxe
=====================================
@@ -2,8 +2,23 @@
set -e
+# Generate the LTSP specific iPXE menu
ltsp ipxe 2> /dev/null
+
+# Add PXE installation related entries to iPXE menu.
+if ! grep -q main-server /srv/tftp/ltsp/ltsp.ipxe && \
+ [ -f /srv/tftp/debian-installer/amd64/linux ] ; then
+ echo "Modifying /srv/tftp/ltsp/ltsp.ipxe"
+ sed -i '/^menu.*/ a item\
+item --gap Installation:\
+item --key a amd64 Install Debian Edu/amd64 (64-Bit)\
+item --key i i386 Install Debian Edu/i386 (32-Bit)\
+item\
+' /srv/tftp/ltsp/ltsp.ipxe
+ cat /srv/tftp/debian-edu/install.cfg >>/srv/tftp/ltsp/ltsp.ipxe
+fi
+
# Make sure /srv/tftp/ltsp/ltsp.ipxe is Debian Edu specific.
sed -i 's#ltsp/ltsp.img#ltsp/${img}/ltsp.img#' /srv/tftp/ltsp/ltsp.ipxe
echo ""
-echo "/srv/tftp/ltsp/ltsp.ipxe has been modified."
\ No newline at end of file
+echo "/srv/tftp/ltsp/ltsp.ipxe has been modified."
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/bba22c98d5508be4808aeba437f434987dd7143a
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/bba22c98d5508be4808aeba437f434987dd7143a
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/20211108/0aa34ca2/attachment-0001.htm>
More information about the debian-edu-commits
mailing list