SVN: rc-scripts/trunk: rc.d/rc.sysinit sysconfig/hwprof sysconfig/system

glen glen at pld-linux.org
Fri May 31 01:01:10 CEST 2013


Author: glen
Date: Fri May 31 01:01:09 2013
New Revision: 12684

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
   rc-scripts/trunk/sysconfig/hwprof
   rc-scripts/trunk/sysconfig/system
Log:
move hwprofiles enable/disable option to sysconfig/system

old config location still supported (overrides if present)


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Fri May 31 01:01:09 2013
@@ -382,7 +382,7 @@
 	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

Modified: rc-scripts/trunk/sysconfig/hwprof
==============================================================================
--- rc-scripts/trunk/sysconfig/hwprof	(original)
+++ rc-scripts/trunk/sysconfig/hwprof	Fri May 31 01:01:09 2013
@@ -1,7 +1,4 @@
 # Hardware Profiles configuration
 
-# Enable HWPROFILES support?
-HWPROFILES=no
-
 # Ask for profile if not found
 ASKFORPROFILE=no

Modified: rc-scripts/trunk/sysconfig/system
==============================================================================
--- rc-scripts/trunk/sysconfig/system	(original)
+++ rc-scripts/trunk/sysconfig/system	Fri May 31 01:01:09 2013
@@ -129,6 +129,9 @@
 # 'yes' behaves as 'detect'
 SELINUX=detect
 
+# Enable HWPROFILES support?
+HWPROFILES=no
+
 # Enable syslogging for rc-scripts
 RC_LOGGING=yes
 


More information about the pld-cvs-commit mailing list