[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] share/debian-edu-config/tools/run-at-firstboot: Make script more robust

[Wolfgang Schweer]

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


Commits:
0a2a57a6 by Wolfgang Schweer at 2020-05-13T10:57:26+02:00
share/debian-edu-config/tools/run-at-firstboot: Make script more robust
just in case the LTSP SquashFS image for diskless workstations has already
been created, but xdebian-edu-firstrun failed due to some other reason.

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

- - - - -


2 changed files:

- debian/changelog
- share/debian-edu-config/tools/run-at-firstboot


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+debian-edu-config (2.11.25) UNRELEASED; urgency=medium
+
+  * share/debian-edu-config/tools/run-at-firstboot: Make script more robust
+    (just in case the LTSP SquashFS image for diskless workstations has already
+    been created, but xdebian-edu-firstrun failed due to some other reason).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 13 May 2020 10:46:52 +0200
+
 debian-edu-config (2.11.24) unstable; urgency=medium
 
   [ Mike Gabriel ]


=====================================
share/debian-edu-config/tools/run-at-firstboot
=====================================
@@ -13,6 +13,8 @@ if grep -q / /etc/debian_version ; then
 else
 	dist=$(lsb_release -sc)
 fi
+# Set LTSP image name (diskless workstations).
+ltspimg="$(uname -m).img"
 
 log() { logger -t debian-edu-config "$@"; }
 info() { log "info: $@"; }
@@ -54,9 +56,8 @@ if echo "$PROFILE" | grep -q Main-Server ; then
 fi
 
 # Create SquashFS image for diskless workstations. This is done here because
-# information from some daemons isn't yet inside of the Debian Installer
-# environment.
-if echo "$PROFILE" | grep -q LTSP-Server ; then
+# information from some daemons isn't available during installation.
+if echo "$PROFILE" | grep -q LTSP-Server && [ ! -f /srv/ltsp/images/$ltspimg ] ; then
 	/usr/share/debian-edu-config/tools/edu-ltsp-install --dist $dist
 fi
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/0a2a57a6586052df02be66aa8ae26e6c54887504

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/0a2a57a6586052df02be66aa8ae26e6c54887504
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/20200513/a3ce6e4c/attachment-0001.html>