From 70741ef216e860e850611a0c6f915e06955252be Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 Jan 2013 16:17:19 -0200
Subject: Using wicd just on squeeze

---
 manifests/subsystems/utils/laptop.pp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

(limited to 'manifests/subsystems/utils')

diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp
index 4b4c2da..38c64c8 100644
--- a/manifests/subsystems/utils/laptop.pp
+++ b/manifests/subsystems/utils/laptop.pp
@@ -12,32 +12,39 @@ class utils::laptop {
 class utils::laptop::debian {
   package { [ 'cpufrequtils',  'module-assistant',  'wireless-tools', 
               'wpasupplicant', 'ekiga',             'gnome',
-              'revelation',    'wicd',              'wicd-curses',
+              'revelation',    'arp-scan',          'usb-modeswitch',
               'iw',            'wvdial',            'wavemon',
               'btscanner',     'laptop-mode-tools', 'acpi-support',
               'tftp',          'sharutils',         'wireshark',
               'macchanger',    'weplab',            'wpagui',
-              'gnokii',        'mumble',            'arp-scan',
-              'usb-modeswitch' ]:
+              'gnokii',        'mumble',            'arp-scan' ]:
     ensure => installed,
   }
 
-  # Lenny specific packages
-  package { [ 'madwifi-source', 'madwifi-tools', 'bluez-gnome' ]:
+  # Wheezy specific packages
+  package { 'network-manager':
     ensure => $::lsbdistcodename ? {
-      'lenny' => installed,
-      default => absent,
+      'squeeze' => absent,
+       default  => installed,
     }
   }
 
   # Squeeze specific packages
-  package { 'kismet':
+  package { [ 'kismet', 'wicd', 'wicd-curses' ]:
     ensure => $::lsbdistcodename ? {
       'squeeze' => installed,
        default  => absent,
     }
   }
 
+  # Lenny specific packages
+  package { [ 'madwifi-source', 'madwifi-tools', 'bluez-gnome' ]:
+    ensure => $::lsbdistcodename ? {
+      'lenny' => installed,
+      default => absent,
+    }
+  }
+
   # Hibernation on lenny
   if $::lsbdistcodename == 'lenny' {
     $hibernate = hiera('nodo::laptop::hibernate', false)
-- 
cgit v1.2.3