Let the script load the other acpi modules, too.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1050 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 418d3f7a2dccb2183a16c81826569aa2fe47e868..8b3be32ff55740e0b4d62346a8fc9de4765e7a76 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -143,7 +143,6 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.16.55
 * linux-2.6.16.56
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0

diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index ec940c1e64bf7a95dfcfc98d732905eb82b5fe8f..66d134e5fe2c6737f1adeea0315a01c0b519212d 100644 (file)
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -15,8 +15,19 @@
 # a space or a tab.
 ########################################################################
 
+### ACPI
+#
+ac
+battery
+button
+fan
+processor
+thermal
+video
+
+### parport
+#
 parport_pc
 lp
-button
 
 # End /etc/sysconfig/modules

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 1c4a2f67d0bb68e16738f36ce6b7ce2e6e165f3f..a9981fd8325f7f867d334d405b48a9895097237f 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -19,6 +19,11 @@
 #                                                                             #
 ###############################################################################
 
+       ### Clean up our environment
+       #
+       delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
+       $< = $>;
+
        require "/opt/pakfire/lib/functions.pl";
        
        my $interactive = 1;