[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 3 commits: Improve share/debian-edu-config/tools/update-cert-dbs

[WolfgangSchweer]

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


Commits:
62641603 by Wolfgang Schweer at 2019-01-27T15:30:32Z
Improve share/debian-edu-config/tools/update-cert-dbs

Extend the script's scope as there might be more home dirs than just home0.
Provide more useful logging information.

- - - - -
2199d66d by Wolfgang Schweer at 2019-01-27T15:34:08Z
Make share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs more robust

Don't let apt-get fail in case a package isn't installed; this could be the case
if the BD image is used in offline mode and related recommended packages are
missing on the image.

- - - - -
2458aeac by Wolfgang Schweer at 2019-01-27T15:43:30Z
Add changelog entries for last commits.

- - - - -


3 changed files:

- debian/changelog
- share/debian-edu-config/tools/update-cert-dbs
- share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+debian-edu-config (2.10.56) UNRELEASED; urgency=medium
+
+  * share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs:
+    - Don't let apt-get fail in case a package isn't installed.
+  * Improve share/debian-edu-config/tools/update-cert-dbs:
+    - Extend the script's scope; there might be more home dirs than just home0.
+    - Let the script provide more useful logging information.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 27 Jan 2019 16:38:28 +0100
+
 debian-edu-config (2.10.55) unstable; urgency=medium
 
   [ Dominik George ]


=====================================
share/debian-edu-config/tools/update-cert-dbs
=====================================
@@ -5,8 +5,8 @@
 
 set -e
 
-BASE_HOME=/skole/tjener/home0
-for dir in "$BASE_HOME"/*; do
+BASE_HOME=/skole/tjener
+for dir in "$BASE_HOME"/*/*; do
     # Skip if not a directory
     test -d "$dir" || continue
 
@@ -25,5 +25,5 @@ for dir in "$BASE_HOME"/*; do
     if [ -d "$dir/.pki/nssdb" ] ; then
         su - $username sh -c 'certutil  -A -d sql:$HOME/.pki/nssdb/ -t "CT,CT," -n "DebianEdu" -i /etc/ssl/certs/Debian-Edu_rootCA.crt'
     fi
-    logger -t update-cert-dbs "Updated nssdb files for user accounts in $BASE_HOME/."
+    logger -t update-cert-dbs "Updated nssdb files for user $username in $dir"
 done


=====================================
share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
=====================================
@@ -173,33 +173,34 @@ after_install_diskless_workstation() {
 
 finalization_diskless_workstation() {
     # Get rid of lvm2, as it causes the shutdown to hang.
-    in_target apt-get -y purge lvm2
+    in_target apt-get -y purge lvm2 || true
 
     # Get rid of munin-node which we do not want on diskless workstations
-    in_target apt-get -y purge munin-node
+    in_target apt-get -y purge munin-node || true
 
     # LTSP take care of updating resolv.conf, no need to have
     # resolvconf try to do the same.
-    in_target apt-get -y purge resolvconf
+    in_target apt-get -y purge resolvconf || true
 
     # No dynamic network configuration on diskless clients.
-    in_target apt-get -y purge network-manager wpasupplicant \
-	network-manager-openvpn network-manager-pptp network-manager-vpnc
+    in_target apt-get -y purge network-manager wpasupplicant || true
+    in_target apt-get -y purge network-manager-openvpn \
+        network-manager-pptp network-manager-vpnc || true
 
     # No VPN nor serial network either
-    in_target apt-get -y purge ppp
+    in_target apt-get -y purge ppp || true
 
     # No modem either
-    in_target apt-get -y purge modemmanager
+    in_target apt-get -y purge modemmanager || true
 
     # cups isn't needed for LTSP clients to be able to print.
-    in_target apt-get -y purge cups
+    in_target apt-get -y purge cups || true
 
     # Missing unique ID on the clients, so no use keeping it around
-    in_target apt-get -y purge popularity-contest
+    in_target apt-get -y purge popularity-contest || true
 
     # Probably not very useful without a disk
-    in_target apt-get -y purge hdparm hddtemp
+    in_target apt-get -y purge hdparm hddtemp || true
 
     # Remove dependencies pulled in by removed packages
     in_target apt-get -y --purge autoremove



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/25aa09b6cda394b72e8b071ac113ec2fd177e729...2458aeac3f18945c4ecfed227a4e28eb6e41b896

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/25aa09b6cda394b72e8b071ac113ec2fd177e729...2458aeac3f18945c4ecfed227a4e28eb6e41b896
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/20190127/cf7d8ad2/attachment-0001.html>