move hwprofiles enable/disable option to sysconfig/system

old config location still supported (overrides if present)

svn-id: @12684

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index cba87c9d7cf79eb609adccaa0cdc0ddba2913e5a..3343cd6610d0c3b98c27a67f1a9891279bf20369 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -382,7 +382,7 @@ if ! is_yes "$VSERVER"; then
        fi
 
        # Choose Hardware profile
-       if [ -f /etc/sysconfig/hwprof ]; then
+       if ! is_no "$HWPROFILES" && [ -f /etc/sysconfig/hwprof ]; then
                . /etc/sysconfig/hwprof
                if is_yes "${HWPROFILES}" && [ -x /sbin/hwprofile -a -d /etc/sysconfig/hwprofiles/data ]; then
                        mount -n / -o rw,remount

diff --git a/sysconfig/hwprof b/sysconfig/hwprof
index 80ebedb58c9a9daa12842b2e74e7cbbe6c1acbec..b16b8dd82a3f0ace4b91aa2c32cb568ae5b0217d 100644 (file)
--- a/sysconfig/hwprof
+++ b/sysconfig/hwprof
@@ -1,7 +1,4 @@
 # Hardware Profiles configuration
 
-# Enable HWPROFILES support?
-HWPROFILES=no
-
 # Ask for profile if not found
 ASKFORPROFILE=no

diff --git a/sysconfig/system b/sysconfig/system
index 8007140a39b0f870ef0a17e167f3f4839690e9ef..79ad2cd46a32e0a4e2c0cc44687d6a780330dd37 100644 (file)
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -129,6 +129,9 @@ VSERVER_ISOLATION_NET=detect
 # 'yes' behaves as 'detect'
 SELINUX=detect
 
+# Enable HWPROFILES support?
+HWPROFILES=no
+
 # Enable syslogging for rc-scripts
 RC_LOGGING=yes