Added dosshd and nonfs (client) to autoconfig. I still need to create some way to set a password, but this will work currently for anyone who rolls their own CD, doesn't include pwgen, and sets a root password during CD mastering.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@138 7bf51bff-881f-0410-a643-fba68b97345e

1 files changed, 35 insertions, 13 deletions

diff --git a/autoconfig b/autoconfig
index 5c08bbf..feff673 100755
--- a/autoconfig
+++ b/autoconfig
@@ -1,14 +1,16 @@
 #!/sbin/runscript
 
-DHCP="yes"
+ACPI="no"
+ALSA="yes"
+APM="no"
 DETECT="yes"
+DHCP="yes"
 GPM="yes"
-PCMCIA="no"
 HOTPLUG="yes"
-APM="no"
-ACPI="no"
 IDEDMA="yes"
-ALSA="yes"
+NFS="yes"
+PCMCIA="yes"
+SSHD="no"
 X11="yes"
 
 get_config() {
@@ -17,12 +19,13 @@ get_config() {
 	for x in ${CMDLINE} ; do
 		case "${x}" in
 			nodetect)
+				ACPI="no"
+				ALSA="no"
+				APM="no"
 				DETECT="no"
 				GPM="no"
 				HOTPLUG="no"
-				APM="no"
-				ACPI="no"
-				ALSA="no"
+				NFS="no"
 				X11="no"
 			;;
 			nodhcp)
@@ -35,12 +38,12 @@ get_config() {
 				PCMCIA="yes"
 			;;
 			doapm)
-				APM="yes"
 				ACPI="no"
+				APM="yes"
 			;;
 			acpi\=on|acpi\=force)
-				APM="no"
 				ACPI="yes"
+				APM="no"
 			;;
 			ide\=nodma)
 				IDEDMA="no"
@@ -51,6 +54,12 @@ get_config() {
 			nosound)
 				ALSA="no"
 			;;
+			nonfs)
+				NFS="no"
+			;;
+			dosshd)
+				SSHD="yes"
+			;;
 			nox)
 				X11="no"
 			;;
@@ -90,6 +99,8 @@ list_services() {
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${HOTPLUG} coldplug hotplug)"
 	svcs="${svcs} $(check_svc ${ALSA} alsasound)"
+	svcs="${svcs} $(check_svc ${NFS} nfsmount)"
+	svcs="${svcs} $(check_svc ${SSH} sshd)"
 	svcs="${svcs} $(check_svc ${X11} mkxf86config x-setup)"
 
 	echo ${svcs}
@@ -231,7 +242,8 @@ start() {
 	# Now, we check if we're supposed to run a coldplug script.
 	if [ "${HOTPLUG}" = "yes" ]
 	then
-		# Check whether we should be using hotplug or coldplug
+		# Check whether we should be using hotplug/coldplug or whether we should
+		# just let udev do it all.
 		if [ -x /etc/init.d/coldplug ]
 		then
 			start_service coldplug
@@ -323,12 +335,15 @@ start() {
 	if [ "${IDEDMA}" = "yes" ]
 	then
 		[ -x /etc/init.d/hdparm ] && start_service hdparm
+	else
+		ewarn "Disabling IDE DMA support ..."
 	fi
 
 	if [ "${PCMCIA}" = "yes" ]
 	then
-		einfo "PCMCIA enabled via cmdline ..."
 		[ -x /etc/init.d/pcmcia ] && start_service pcmcia
+	else
+		ewarn "PCMCIA disabled via cmdline ..."
 	fi
 
 	if [ "${DHCP}" = "no" ]
@@ -341,7 +356,7 @@ start() {
 		do
 			echo "config_eth$i=( \"none\" )" >> /etc/conf.d/net
 		done
-		ewarn "Skipping DHCP broadcast detection as requested on boot commandline ..."
+		ewarn "Skipping DHCP broadcast ..."
 	fi
 
 	# Read in what hwsetup has found
@@ -397,6 +412,13 @@ start() {
 				fi
 			fi
 		done
+		[ "${NFS}" = "yes" ] \
+			&& [ -x /etc/init.d/nfsmount ] && start_service nfsmount
+		if [ "${SSHD}" = "yes" ]
+		then
+			# TODO: need to add a password check/warning here
+			[ -x /etc/init.d/sshd ] && start_service sshd
+		fi
 	else
 		ewarn "No Network device auto detected ..."
 	fi