[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 4 commits: Don't delete the /var/cache/apt directory after X2Go client chroot creation

[Wolfgang Schweer (@schweer-guest)]

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


Commits:
28c3f90b by Wolfgang Schweer at 2021-11-18T17:33:35+01:00
Don't delete the /var/cache/apt directory after X2Go client chroot creation

Adjust sbin/debian-edu-ltsp-install accordingly

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

- - - - -
d1885c4b by Wolfgang Schweer at 2021-11-18T17:35:05+01:00
share/man/man8/debian-edu-ltsp-install.8: Improve wording

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

- - - - -
511a22d6 by Wolfgang Schweer at 2021-11-18T17:36:25+01:00
share/debian-edu-config/tools/ltsp-addfirmware: Improve usage information

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

- - - - -
fbeea712 by Wolfgang Schweer at 2021-11-18T17:37:18+01:00
Update changelog to reflect last commits

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

- - - - -


4 changed files:

- debian/changelog
- sbin/debian-edu-ltsp-install
- share/debian-edu-config/tools/ltsp-addfirmware
- share/man/man8/debian-edu-ltsp-install.8


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,9 @@ debian-edu-config (2.12.14) UNRELEASED; urgency=medium
   * Create the SquashFS image by default for LTSP chroots:
     - sbin/debian-edu-ltsp-install: Adjust option setting accordingly.
     - share/man/man8/debian-edu-ltsp-install.8: Update and improve content.
+  * Don't delete the /var/cache/apt directory after X2Go client chroot creation,
+    adjust sbin/debian-edu-ltsp-install accordingly.
+  * share/debian-edu-config/tools/ltsp-addfirmware: Improve usage information.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 15 Nov 2021 22:55:34 +0100
 


=====================================
sbin/debian-edu-ltsp-install
=====================================
@@ -462,7 +462,6 @@ debootstrap --arch="$arch" --no-check-gpg --variant=minbase --include=sitesummar
 	umount /srv/ltsp/x2go-"$thin_type"-"$arch"/dev/pts
 	umount /srv/ltsp/x2go-"$thin_type"-"$arch"/proc
 	if [ "bare" == "$thin_type" ] ; then
-		rm -rf /srv/ltsp/x2go-"$thin_type"-"$arch"/var/cache/apt
 		rm -rf /srv/ltsp/x2go-"$thin_type"-"$arch"/var/cache/debconf
 		rm -rf /srv/ltsp/x2go-"$thin_type"-"$arch"/var/cache/man
 	fi


=====================================
share/debian-edu-config/tools/ltsp-addfirmware
=====================================
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# Adds non-free firmware to the chroot used by LTSP to enable certain
+# Add non-free firmware to the chroot used by LTSP to enable certain
 # network cards (Intel, Broadcom, ...). Takes package name as param,
-# or adds all firmware packages if no package name is given.
+# or add all firmware packages if no package name is given.
 
 set -e
 
@@ -25,7 +25,8 @@ Usage information:
 Please note:
 Prepend BASE=<non default LTSP chroot> to the command in case such a chroot
 should be modified.
-Example: BASE=/srv/ltsp/x2go-display-amd64 ltsp-addfirmware firmware-linux
+Example:
+BASE=/srv/ltsp/x2go-display-amd64 /usr/share/debian-edu-config/tools/ltsp-addfirmware firmware-linux
 
 EOF
     exit 0


=====================================
share/man/man8/debian-edu-ltsp-install.8
=====================================
@@ -9,7 +9,7 @@ debian-edu-ltsp-install - setup, configure and manage LTSP chroot and SquashFS i
 
 .SH DESCRIPTION
 .TP
-Tool to configure a Debian Edu system with 'LTSP-Server' profile' for both diskless workstations and also thin clients (using X2Go). The configuration applies to a Debian Edu machine in the internal backbone network with two NICs. This system needs to be registered using GOsa² in case it isn't the main server (i.e. a 'combined' server).
+Tool to configure a Debian Edu system with 'LTSP-Server' profile' for both diskless workstations and also thin clients (using X2Go). The configuration applies to a Debian Edu machine on the internal backbone network with two NICs. This system needs to be registered using GOsa² in case it isn't the main server (i.e. a 'combined' server).
 .TQ
 This script applies to a system with two NICs on the internal backbone network.
 



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/eca3955f357089200df73941eeda92cc8a9c5a52...fbeea712766c56335c115f2ef501273433e34489

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/compare/eca3955f357089200df73941eeda92cc8a9c5a52...fbeea712766c56335c115f2ef501273433e34489
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/20211118/b179ee1d/attachment-0001.htm>