aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-30 16:17:19 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-30 16:17:19 -0200
commit70741ef216e860e850611a0c6f915e06955252be (patch)
treee0f3c4be9f90d72513149a3ef69fdd4cb07074d7
parent1b7233799714c0ba115708ad46661fd9c77c624c (diff)
downloadpuppet-nodo-70741ef216e860e850611a0c6f915e06955252be.tar.gz
puppet-nodo-70741ef216e860e850611a0c6f915e06955252be.tar.bz2
Using wicd just on squeeze
-rw-r--r--manifests/subsystems/utils/laptop.pp23
1 files changed, 15 insertions, 8 deletions
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)