[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: Adjust sbin/debian-edu-ltsp-install

[Wolfgang Schweer]

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


Commits:
2144175b by Wolfgang Schweer at 2020-12-14T22:13:18+01:00
Adjust sbin/debian-edu-ltsp-install

Improve IP address determination for the dedicated LTSP network.

Add nameserver stanza to /etc/network/interfaces.

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

- - - - -
a8b4acf4 by Wolfgang Schweer at 2020-12-14T22:18:06+01:00
Adjust share/debian-edu-config/d-i/finish-install

Only run debian-edu-ltsp-install in case of a combined server. Leave it up to
the local admin what type of LTSP clients should be supported.
(Still needs to be documented in the manual.)

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

- - - - -


3 changed files:

- debian/changelog
- sbin/debian-edu-ltsp-install
- share/debian-edu-config/d-i/finish-install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+debian-edu-config (2.11.40) UNRELEASED; urgency=medium
+
+  * Adjust sbin/debian-edu-ltsp-install:
+    - Improve IP address determination for the dedicated LTSP network.
+    - Add nameserver stanza to /etc/network/interfaces.
+  * share/debian-edu-config/d-i/finish-install: Only run debian-edu-ltsp-install
+    in case of a combined server. Leave it up to the local admin what type of
+    LTSP clients should be supported. (Still needs to be documented.)
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 14 Dec 2020 21:32:53 +0100
+
 debian-edu-config (2.11.39) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -100,8 +100,9 @@ fi
 # Common Debian Edu specific configuration (dirs and HERE documents), only minor
 # difference for thin clients and diskless workstation (in ltsp.conf), see below.
 # Next two lines are needed in case of a separate LTSP server.
-ETH0_IP="$(hostname -i)"
+ETH0_IP="$(hostname -I | cut -d' ' -f1)"
 ETH1_IP="$(hostname -I | cut -d' ' -f2)"
+ETH1_IP=${ETH1_IP:-"192.168.0.254"}
 HOSTNAME="$(hostname -s)"
 if [ ! -d /etc/ltsp/client ] ; then
 	mkdir -p /etc/ltsp/client/init
@@ -483,6 +484,7 @@ iface eth0 inet static
 	address 10.0.2.2
 	gateway 10.0.0.1
 	dns-search intern
+	dns-nameserver 127.0.0.1
 
 iface eth1 inet static
 	address $ETH1_IP


=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -33,8 +33,8 @@ preserve_network_interfaces() {
 db_get debian-edu-install/profile
 PROFILE="$RET"
 
-# Create LTSP diskless workstation image and iPXE setup.
-if echo $PROFILE | grep -q LTSP-Server ; then
+# 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"



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/cdf1e3d690ee13d9196edbe397ed454f38244688...a8b4acf4e032279db2dc2a3c7cf019f90f8e5394

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/cdf1e3d690ee13d9196edbe397ed454f38244688...a8b4acf4e032279db2dc2a3c7cf019f90f8e5394
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/20201214/46de331c/attachment-0001.html>