Rollback

diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp
index 67fd43f4dac9f3405e39e0cb8d4848bd6091ba2c..72c490e4b32da35fd15e069809d65e6f8d235eb2 100644 (file)
--- a/manifests/subsystems/utils/laptop.pp
+++ b/manifests/subsystems/utils/laptop.pp
@@ -14,20 +14,14 @@ class utils::laptop::debian {
               'wpasupplicant', 'ekiga',             'gnome',
               'revelation',    'wicd',              'wicd-curses',
               'iw',            'wvdial',            'wavemon',
-              'btscanner',     'usb-modeswitch',    'tftp',
+              'btscanner',     'laptop-mode-tools', 'acpi-support',
               'kismet',        'sharutils',         'wireshark',
               'macchanger',    'weplab',            'wpagui',
-              'gnokii',        'mumble',            'arp-scan' ]:
+              'gnokii',        'mumble',            'arp-scan',
+              'tftp',          'usb-modeswitch' ]:
     ensure => installed,
   }
 
-  # Squeeze specific packages
-  if $lsbdistcodename == 'squeeze' {
-    package { [ 'laptop-mode-tools', 'acpi-support' ]:
-      ensure => present,
-    }
-  }
-
   # Lenny specific packages
   package { [ 'madwifi-source', 'madwifi-tools', 'bluez-gnome' ]:
     ensure => $lsbdistcodename ? {