[debian-edu-commits] r81380 - in branches/wheezy/debian-edu-config: cf debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-07-05 21:32:34 +0000 (Fri, 05 Jul 2013)
New Revision: 81380

Modified:
   branches/wheezy/debian-edu-config/cf/cf.apt
   branches/wheezy/debian-edu-config/debian/changelog
Log:
Remove cfengine code to purge network-manager on roaming
workstations, as we now use it.

Modified: branches/wheezy/debian-edu-config/cf/cf.apt
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.apt	2013-07-05 21:32:33 UTC (rev 81379)
+++ branches/wheezy/debian-edu-config/cf/cf.apt	2013-07-05 21:32:34 UTC (rev 81380)
@@ -33,9 +33,3 @@
   debian::
 
     "/usr/sbin/debian-edu-hwsetup"
-
-  # We use wicd not network-manager on Roaming Workstation.  Remove
-  # the alternative.
-  debian.installation.roaming::
-    "/usr/bin/apt-get purge -y network-manager"
-

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-07-05 21:32:33 UTC (rev 81379)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-07-05 21:32:34 UTC (rev 81380)
@@ -11,6 +11,8 @@
   * Correct cfengine rules creating
     /etc/skel/.mozilla/firefox/profiles.ini to make sure the file is
     given mode 644.
+  * Remove cfengine code to purge network-manager on roaming
+    workstations, as we now use it.
 
  -- Holger Levsen <holger at debian.org>  Fri, 05 Jul 2013 12:55:23 +0200