[debian-edu-commits] debian-edu/ 01/01: In LTSP setup, allow the purging of openvpn to fail (which happen if it is unknown to apt), to get LTSP installation working using the usbstick ISO (Closes: #770312).

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 06bb51be8cbfef69a21d536e9286e1024127f91a
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Nov 20 13:22:37 2014 +0100

    In LTSP setup, allow the purging of openvpn to fail (which happen if it is unknown to apt), to get LTSP installation working using the usbstick ISO (Closes: #770312).
---
 debian/changelog                                                | 3 +++
 share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5149035..a726785 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ debian-edu-config (1.814) UNRELEASED; urgency=low
     automatically too (Closes: #769559).
   * Add new dhclient hook to work around bug #710490 where a race in
     autofs make it fail with slow DHCP servers (Closes: #769561).
+  * In LTSP setup, allow the purging of openvpn to fail (which happen if
+    it is unknown to apt), to get LTSP installation working using the
+    usbstick ISO (Closes: #770312).
 
   [ Wolfgang Schweer ]
   * testsuite/network: cover case that udev persistent network card rules
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
index f4eb7d3..6b7c31f 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
@@ -232,8 +232,10 @@ setup_diskless_workstation() {
 
     # 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 \
-	openvpn
+	network-manager-openvpn network-manager-pptp network-manager-vpnc
+
+    # Do not fail if openvpn isn't installed.  This is the case in Jessie
+    in_target apt-get -y purge openvpn || true
 
     # No VPN nor serial network either
     in_target apt-get -y purge ppp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git