[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: 032-edu-pkgs: refactor

[Holger Levsen]

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


Commits:
1a5ef7be by Holger Levsen at 2019-01-29T14:01:25Z
032-edu-pkgs: refactor

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
a0197d6b by Holger Levsen at 2019-01-29T14:03:23Z
release as 2.10.58

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- debian/changelog
- share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,14 @@
-debian-edu-config (2.10.58) UNRELEASED; urgency=medium
+debian-edu-config (2.10.58) unstable; urgency=medium
 
+  [ Wolfgang Schweer ]
   * Improve share/ltsp/plugin/ltsp-build-client/Debian-custom/032-edu-pkgs:
     - Generate list of actually installed packages intended to be purged.
     - Purge selected packages to make LTSP clients work.
 
- -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 28 Jan 2019 21:16:18 +0100
+  [ Holger Levsen ]
+  * 032-edu-pkgs: minor refactoring.
+
+ -- Holger Levsen <holger at debian.org>  Tue, 29 Jan 2019 15:02:50 +0100
 
 debian-edu-config (2.10.57) unstable; urgency=medium
 


=====================================
share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
=====================================
@@ -172,45 +172,45 @@ after_install_diskless_workstation() {
 }
 
 finalization_diskless_workstation() {
+    local CANDIDATE=""
     local PURGE=""
-    local PURGE2=""
     # Get rid of lvm2, as it causes the shutdown to hang.
-    PURGE="lvm2"
+    CANDIDATE="lvm2"
 
     # Get rid of munin-node which we do not want on diskless workstations
-    PURGE="$PURGE munin-node"
+    CANDIDATE="$CANDIDATE munin-node"
 
     # LTSP take care of updating resolv.conf, no need to have
     # resolvconf try to do the same.
-    PURGE="$PURGE resolvconf"
+    CANDIDATE="$CANDIDATE resolvconf"
 
     # No dynamic network configuration on diskless clients.
-    PURGE="$PURGE network-manager wpasupplicant network-manager-openvpn network-manager-pptp network-manager-vpnc"
+    CANDIDATE="$CANDIDATE network-manager wpasupplicant network-manager-openvpn network-manager-pptp network-manager-vpnc"
 
     # No VPN nor serial network either
-    PURGE="$PURGE ppp"
+    CANDIDATE="$CANDIDATE ppp"
 
     # No modem either
-    PURGE="$PURGE modemmanager"
+    CANDIDATE="$CANDIDATE modemmanager"
 
     # cups isn't needed for LTSP clients to be able to print.
-    PURGE="$PURGE cups"
+    CANDIDATE="$CANDIDATE cups"
 
     # Missing unique ID on the clients, so no use keeping it around
-    PURGE="$PURGE popularity-contest"
+    CANDIDATE="$CANDIDATE popularity-contest"
 
     # Probably not very useful without a disk
-    PURGE="$PURGE hdparm hddtemp"
+    CANDIDATE="$CANDIDATE hdparm hddtemp"
 
     # Match only installed packages to avoid breaking the installation.
-    for p in $(echo $PURGE) ; do
+    for p in $(echo $CANDIDATE) ; do
         if in_target dpkg -l $p 2>/dev/null | tail -1 | grep -q  ^ii ; then
-            PURGE2="$PURGE2 $p"
+            PURGE="$PURGE $p"
         fi
     done
 
     # purge them alltogether
-    in_target apt-get -y purge $PURGE2
+    in_target apt-get -y purge $PURGE
 
     # 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/b0439b86a7626fd2367e0708c84bb047fe1321fb...a0197d6bd7607a671b0a211fba247a45a122b141

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/b0439b86a7626fd2367e0708c84bb047fe1321fb...a0197d6bd7607a671b0a211fba247a45a122b141
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/20190129/ff9425a6/attachment-0001.html>