create defaults file for autoconfig

This moves the initial default settings for the flags used by autoconfig
to a separate file and re-arranges some of the functions in the
autoconfig script itself.

2 files changed, 43 insertions, 40 deletions

diff --git a/conf.d/autoconfig b/conf.d/autoconfig
new file mode 100644
index 0000000..793c563
--- /dev/null
+++ b/conf.d/autoconfig
@@ -0,0 +1,31 @@
+#
+# These are the default settings for autoconfig.
+# They determine which functions will be automatically started on our
+# live cds.
+# These settings can all be overridden from the boot command line.
+#
+ACPI="yes"
+ALSA="yes"
+APM="no"
+BRLTTY="no"
+COLDPLUG="yes"
+DETECT="yes"
+DHCP="yes"
+DMRAID="yes"
+EVMS="no"
+FIREWIRE="yes"
+GPM="yes"
+IDEDMA="yes"
+LVM="no"
+MDADM="yes"
+NET="yes"
+NFS="yes"
+PASSWD="yes"
+PATA="yes"
+PCMCIA="yes"
+SATA="yes"
+SCSI="no"
+SPEAKUP="no"
+SSHD="no"
+USB="yes"
+X11="yes"
diff --git a/init.d/autoconfig b/init.d/autoconfig
index 51657c8..6ab1a6f 100755
--- a/init.d/autoconfig
+++ b/init.d/autoconfig
@@ -3,34 +3,6 @@
 # This script is used by Gentoo release media to start certain services and to
 # ensure a sane setup for a CD-based boot.
 
-ACPI="yes"
-ALSA="yes"
-APM="no"
-BRLTTY="no"
-COLDPLUG="yes"
-DETECT="yes"
-DHCP="yes"
-DMRAID="yes"
-EVMS="no"
-FIREWIRE="yes"
-GPM="yes"
-IDEDMA="yes"
-LVM="no"
-MDADM="yes"
-NET="yes"
-NFS="yes"
-PASSWD="yes"
-PATA="yes"
-PCMCIA="yes"
-SATA="yes"
-SCSI="no"
-SPEAKUP="no"
-SPEAKUP_MODULE=""
-SPEAKUP_OPTIONS=""
-SSHD="no"
-USB="yes"
-X11="yes"
-
 get_config() {
 	CMDLINE="$(cat /proc/cmdline)"
 
@@ -200,18 +172,6 @@ get_config() {
 	done
 }
 
-depend() {
-	get_config
-
-	if yesno "${SPEAKUP}"
-	then
-		modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS} > /dev/null 2>&1
-	fi
-
-	need modules $(list_services)
-	before net
-}
-
 # Checks whether a service will be started by autoconfig.
 # Usage: check_svc var service [service_alternative]
 check_svc() {
@@ -291,6 +251,18 @@ list_services() {
 	echo ${svcs}
 }
 
+depend() {
+	before net
+
+	get_config
+	if yesno "${SPEAKUP}"
+	then
+		modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS} > /dev/null 2>&1
+	fi
+
+	need modules $(list_services)
+}
+
 get_info() {
 	local tmp