public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-10 21:11 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2011-02-10 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     a25605a4c3670b5534ec5a4c9419d5a573acdb40
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 21:09:37 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 21:09:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=a25605a4

Hook up list_services to depend need call.

---
 autoconfig |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/autoconfig b/autoconfig
index 2d5ef86..5fd4fc5 100755
--- a/autoconfig
+++ b/autoconfig
@@ -203,7 +203,7 @@ get_config() {
 }
 
 depend() {
-	need modules
+	need modules $(list_services)
 	before net
 }
 
@@ -225,6 +225,37 @@ check_svc() {
 # Prints an ordered list of services that will be started by autoconfig.
 list_services() {
 	get_config
+	# Must not print anything here
+	if [ "${DETECT}" = "yes" ]
+	then
+		local arch="$(uname -m)"
+
+		case ${arch} in
+			mips*)
+				ACPI="no"
+				APM="no"
+				IDEDMA="no"
+			;;
+			i?86|x86_64)
+				:
+			;;
+			alpha)
+				ACPI="no"
+				APM="no"
+			;;
+			sparc*)
+				ACPI="no"
+				APM="no"
+			;;
+			powerpc*)
+				ACPI="no"
+				APM="no"
+			;;
+			ia64)
+				APM="no"
+			;;
+		esac
+	fi
 
 	local svcs="$(check_svc ${ACPI} acpid)"
 	svcs="${svcs} $(check_svc ${ALSA} alsasound)"



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-10 21:11 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2011-02-10 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     70eb9c7334a7dfd4c54b6faeee41e768b71c0b56
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 21:10:58 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 21:10:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=70eb9c73

Migrate BRLTTY to depend block, another good example for simple calls.

---
 autoconfig |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/autoconfig b/autoconfig
index 5fd4fc5..68b2201 100755
--- a/autoconfig
+++ b/autoconfig
@@ -260,6 +260,7 @@ list_services() {
 	local svcs="$(check_svc ${ACPI} acpid)"
 	svcs="${svcs} $(check_svc ${ALSA} alsasound)"
 	svcs="${svcs} $(check_svc ${APM} apmd)"
+	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
 	svcs="${svcs} $(check_svc ${HALD} hald)"
@@ -401,10 +402,7 @@ start() {
 	echo "0" > /proc/sys/kernel/printk
 	get_config
 
-	if [ "${BRLTTY}" = "yes" ]
-	then
-		[ -x /etc/init.d/brltty ] && /etc/init.d/brltty start
-	fi
+	# DONE: BRLTTY migrated to depend
 
 	if [ "${SPEAKUP}" = "yes" ]
 	then



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-10 23:26 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-10 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     0789dc47c7dc3d5b971abd2eb8644e0a5772cfb8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 23:21:48 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 23:21:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=0789dc47

check_svc should use yesno and rc-service

---
 autoconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/autoconfig b/autoconfig
index 68b2201..0f5ea58 100755
--- a/autoconfig
+++ b/autoconfig
@@ -210,12 +210,12 @@ depend() {
 # Checks whether a service will be started by autoconfig.
 # Usage: check_svc var service [service_alternative]
 check_svc() {
-	if [ "${1}" = "yes" ]
+	if yesno "${1}"
 	then
-		if [ -x "/etc/init.d/${2}" ]
+		if rc-service -e "${2}"
 		then
 			echo "${2}"
-		elif [ -n "${3}" -a -x "/etc/init.d/${3}" ]
+		elif [ -n "${3}" ] && rc-service -e ${3}"
 		then
 			echo "${3}"
 		fi	



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-10 23:57 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-10 23:57 UTC (permalink / raw
  To: gentoo-commits

commit:     8d8fbc97a3d1485f0aa7e407e0d59eacd42ceef1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 23:57:38 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 23:57:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=8d8fbc97

migrate yes/no tests to use if yesno

---
 autoconfig |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/autoconfig b/autoconfig
index 0f5ea58..c05a3d1 100755
--- a/autoconfig
+++ b/autoconfig
@@ -226,7 +226,7 @@ check_svc() {
 list_services() {
 	get_config
 	# Must not print anything here
-	if [ "${DETECT}" = "yes" ]
+	if yesno "${DETECT}"
 	then
 		local arch="$(uname -m)"
 
@@ -402,14 +402,12 @@ start() {
 	echo "0" > /proc/sys/kernel/printk
 	get_config
 
-	# DONE: BRLTTY migrated to depend
-
-	if [ "${SPEAKUP}" = "yes" ]
+	if yesno "${SPEAKUP}"
 	then
 		modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS}
 	fi
 
-	if [ "${DETECT}" = "yes" ]
+	if yesno "${DETECT}"
 	then
 		ebegin "Hardware detection started"
 			local numcpu="$(grep -c '^processor[[:space:]]\+:' /proc/cpuinfo)"
@@ -455,7 +453,7 @@ start() {
 	fi
 
 	# Now, we check if we are supposed to run a coldplug script.
-	if [ "${COLDPLUG}" = "yes" ]
+	if yesno "${COLDPLUG}"
 	then
 		# Check whether we should be using hotplug/coldplug or whether we should
 		# just let udev do it all.
@@ -475,7 +473,7 @@ start() {
 		ewarn "Hotplug/Coldplug disabled via cmdline ..."
 	fi
 
-	if [ "${APM}" = "yes" ]
+	if yesno "${APM}"
 	then
 		modprobe apm power_off=1 >/dev/null 2>&1 && \
 			einfo "APM BIOS found, power management functions enabled ..."
@@ -484,7 +482,7 @@ start() {
 		einfo "Not Loading APM Bios support ..."
 	fi
 
-	if [ "${ACPI}" = "yes" ]
+	if yesno "${ACPI}"
 	then
 		modprobe processor >/dev/null 2>&1 && \
 			ebegin "ACPI power management functions enabled" && \
@@ -502,21 +500,21 @@ start() {
 		einfo "Not Loading ACPI support ..."
 	fi
 
-	if [ "${IDEDMA}" = "yes" ]
+	if yesno "${IDEDMA}"
 	then
 		[ -x /etc/init.d/hdparm ] && /etc/init.d/hdparm start
 	else
 		ewarn "Disabling IDE DMA support ..."
 	fi
 
-	if [ "${PCMCIA}" = "yes" ]
+	if yesno "${PCMCIA}"
 	then
 		[ -x /etc/init.d/pcmcia ] && /etc/init.d/pcmcia start
 	else
 		ewarn "PCMCIA disabled via cmdline ..."
 	fi
 
-	if [ "${DHCP}" = "no" ]
+	if ! yesno "${DHCP}"
 	then
 		sed -i -e '/^ifconfig_eth.*dhcp.*/ s/^/#/' \
 			-e '/^iface_eth.*dhcp.*/ s/^/#/' \
@@ -548,7 +546,7 @@ start() {
 	then
 		for nics in ${NETDEVICES}
 		do
-			if [ "${DHCP}" = "yes" ]
+			if yesno "${DHCP}"
 			then
 				einfo "Network device ${HILITE}${nics}${NORMAL} detected, DHCP broadcasting for IP ..."
 				if [ -f /var/run/dhcpcd-${nics}.pid ]
@@ -562,22 +560,22 @@ start() {
 				fi
 			fi
 		done
-		if [ "${NFS}" = "yes" ]
+		if yesno "${NFS}"
 		then
 			[ -x /etc/init.d/portmap ] && /etc/init.d/portmap start
 			[ -x /etc/init.d/nfsmount ] && /etc/init.d/nfsmount start
 		fi
-		if [ "${PASSWD}" = "no" ]
+		if ! yesno "${PASSWD}"
 		then
 			echo "root:${PASSWORD}" | chpasswd  > /dev/null 2>&1
 		else
 			/etc/init.d/pwgen start
 		fi
-		if [ "${SSHD}" = "yes" ]
+		if yesno "${SSHD}"
 		then
 			# If we have passwd= on the command line, we do not run pwgen and we
 			# set the root password to PASSWORD.
-			if [ "${PASSWD}" = "yes" ]
+			if yesno "${PASSWD}"
 			then
 				ewarn "WARNING: You are starting sshd with a scrambled root password!!!"
 				ewarn "WARNING: You need to set a root password to be able to login remotely."
@@ -588,7 +586,7 @@ start() {
 		ewarn "No Network device auto detected ..."
 	fi
 
-	if [ "${ALSA}" = "yes" ]
+	if yesno "${ALSA}"
 	then
 		if [ -n "${SOUND_FULLNAME}" -o -n "${SOUND_DRIVER}" ]
 		then
@@ -655,7 +653,8 @@ start() {
 
 	[ -n "${XDESC}" ] && einfo "VideoCard:   ${HILITE}${XDESC}${NORMAL}"
 
-	if [ "${X11}" = "no" ]
+	if ! yesno "${X11}"
+	then
 		touch /etc/.noxdm
 	fi
 



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11  0:06 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2011-02-11  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     f22d5015e9d6a89c0e5d786a4ac58ce65e83c530
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 00:06:00 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 00:06:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=f22d5015

Coldplug and hotplug are in list_services.

---
 autoconfig |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/autoconfig b/autoconfig
index c05a3d1..a65968b 100755
--- a/autoconfig
+++ b/autoconfig
@@ -457,13 +457,10 @@ start() {
 	then
 		# Check whether we should be using hotplug/coldplug or whether we should
 		# just let udev do it all.
-		if [ -x /etc/init.d/coldplug ]
+		# coldplug+hotplug would already be up due to list_services
+		if [ ! -x /etc/init.d/coldplug -a ! -x /etc/init.d/hotplug ]
 		then
-			/etc/init.d/coldplug start
-		elif [ -x /etc/init.d/hotplug ]
-		then
-			/etc/init.d/hotplug start
-		else
+			# TODO: This needs to go to a seperate script, so that hwsetup can depend on it.
 			unpack_firmware
 			[ -x /sbin/udevtrigger ] && /sbin/udevtrigger
 		fi



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11  0:26 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11  0:26 UTC (permalink / raw
  To: gentoo-commits

commit:     542d90e3f52464cbf0f28eadb96e4f29fbbb3d91
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 00:21:22 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 00:21:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=542d90e3

use rc-service to check for existance

---
 autoconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autoconfig b/autoconfig
index a65968b..cdcb89c 100755
--- a/autoconfig
+++ b/autoconfig
@@ -458,7 +458,7 @@ start() {
 		# Check whether we should be using hotplug/coldplug or whether we should
 		# just let udev do it all.
 		# coldplug+hotplug would already be up due to list_services
-		if [ ! -x /etc/init.d/coldplug -a ! -x /etc/init.d/hotplug ]
+		if ! rc-service -e coldplug && ! rc-service -e hotplug
 		then
 			# TODO: This needs to go to a seperate script, so that hwsetup can depend on it.
 			unpack_firmware



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11  4:22 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11  4:22 UTC (permalink / raw
  To: gentoo-commits

commit:     7c30187d5795b90e9af37a88c8b5d787cdfa0389
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 04:20:51 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 04:20:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=7c30187d

use "rc-service -i" to test for and start services

With openrc, we can use "rc-service -i foo start" to test for the existance of
service foo and start it if it does exist.

---
 autoconfig |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/autoconfig b/autoconfig
index cdcb89c..d8df734 100755
--- a/autoconfig
+++ b/autoconfig
@@ -474,7 +474,7 @@ start() {
 	then
 		modprobe apm power_off=1 >/dev/null 2>&1 && \
 			einfo "APM BIOS found, power management functions enabled ..."
-		[ -x /etc/init.d/apmd ] && /etc/init.d/apmd start
+		rc-service -i apmd start
 	else
 		einfo "Not Loading APM Bios support ..."
 	fi
@@ -491,7 +491,7 @@ start() {
 		modprobe thermal >/dev/null 2>&1
 		modprobe video >/dev/null 2>&1
 		modprobe dock >/dev/null 2>&1
-		[ -x /etc/init.d/acpid ] && /etc/init.d/acpid start
+		rc-service -i acpid start
 		eend
 	else
 		einfo "Not Loading ACPI support ..."
@@ -499,14 +499,14 @@ start() {
 
 	if yesno "${IDEDMA}"
 	then
-		[ -x /etc/init.d/hdparm ] && /etc/init.d/hdparm start
+		rc-service -i hdparm start
 	else
 		ewarn "Disabling IDE DMA support ..."
 	fi
 
 	if yesno "${PCMCIA}"
 	then
-		[ -x /etc/init.d/pcmcia ] && /etc/init.d/pcmcia start
+		rc-service -i pcmcia start
 	else
 		ewarn "PCMCIA disabled via cmdline ..."
 	fi
@@ -559,14 +559,14 @@ start() {
 		done
 		if yesno "${NFS}"
 		then
-			[ -x /etc/init.d/portmap ] && /etc/init.d/portmap start
-			[ -x /etc/init.d/nfsmount ] && /etc/init.d/nfsmount start
+			rc-service -i portmap start
+			rc-service -i nfsmount start
 		fi
 		if ! yesno "${PASSWD}"
 		then
 			echo "root:${PASSWORD}" | chpasswd  > /dev/null 2>&1
 		else
-			/etc/init.d/pwgen start
+			rc-service pwgen start
 		fi
 		if yesno "${SSHD}"
 		then
@@ -577,7 +577,7 @@ start() {
 				ewarn "WARNING: You are starting sshd with a scrambled root password!!!"
 				ewarn "WARNING: You need to set a root password to be able to login remotely."
 			fi
-			[ -x /etc/init.d/sshd ] && /etc/init.d/sshd start
+			rc-service -i sshd start
 		fi
 	else
 		ewarn "No Network device auto detected ..."
@@ -596,10 +596,7 @@ start() {
 
 			einfo "${sndmsg}"
 
-			if [ -x /etc/init.d/alsasound ]
-			then
-				/etc/init.d/alsasound start
-			fi
+			rc-service -i alsasound start
 
 			if [ -e /proc/asound/cards ]
 			then
@@ -640,7 +637,7 @@ start() {
 
 				if [ "${SPEAKUP_MODULE}" = "speakup_soft" ]
 				then
-					[ -x /etc/init.d/espeakup ] && /etc/init.d/espeakup start
+					rc-service -i espeakup start
 				fi
 			fi
 		fi



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 17:43 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11 17:43 UTC (permalink / raw
  To: gentoo-commits

commit:     4424cc4e5cad2d6d85b48c3f2a44c043d99b46a0
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 17:42:33 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 17:42:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=4424cc4e

fix typo

---
 autoconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autoconfig b/autoconfig
index d8df734..f7d3284 100755
--- a/autoconfig
+++ b/autoconfig
@@ -215,7 +215,7 @@ check_svc() {
 		if rc-service -e "${2}"
 		then
 			echo "${2}"
-		elif [ -n "${3}" ] && rc-service -e ${3}"
+		elif [ -n "${3}" ] && rc-service -e "${3}"
 		then
 			echo "${3}"
 		fi	



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 20:21 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     b0efbf5d14e6f5d89a0988f15c15c737afdd4d6d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 20:16:54 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 20:16:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=b0efbf5d

more openrc related fixes

- make sure hardware services are not running before we start them.
- convert some tests to use yesno instead of comparisons to "yes" or
  "no".

---
 autoconfig |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/autoconfig b/autoconfig
index f7d3284..e8f7123 100755
--- a/autoconfig
+++ b/autoconfig
@@ -474,7 +474,10 @@ start() {
 	then
 		modprobe apm power_off=1 >/dev/null 2>&1 && \
 			einfo "APM BIOS found, power management functions enabled ..."
-		rc-service -i apmd start
+		if ! service_started apmd
+		then
+			rc-service -i apmd start
+		fi
 	else
 		einfo "Not Loading APM Bios support ..."
 	fi
@@ -491,20 +494,23 @@ start() {
 		modprobe thermal >/dev/null 2>&1
 		modprobe video >/dev/null 2>&1
 		modprobe dock >/dev/null 2>&1
-		rc-service -i acpid start
+		if ! service_started acpid
+		then
+			rc-service -i acpid start
+		fi
 		eend
 	else
 		einfo "Not Loading ACPI support ..."
 	fi
 
-	if yesno "${IDEDMA}"
+	if yesno "${IDEDMA}" && ! service_started hdparm
 	then
 		rc-service -i hdparm start
 	else
 		ewarn "Disabling IDE DMA support ..."
 	fi
 
-	if yesno "${PCMCIA}"
+	if yesno "${PCMCIA}" && ! service_started pcmcia
 	then
 		rc-service -i pcmcia start
 	else
@@ -535,9 +541,12 @@ start() {
 		# Migrated to autoconfig-gpm-pre
 	fi
 
-	[ "${DETECT}" = "no" ] && DHCP="no"
-	[ "${DETECT}" = "yes" ] \
-		&& NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"
+	if yesno "${DETECT}"
+	then
+		NETDEVICES="$(awk -F: '/eth.:|tr.:|ath.:|wlan.:/{print $1}' /proc/net/dev 2>/dev/null)"
+	else
+		DHCP="no"
+	fi
 
 	if [ -n "${NETDEVICES}" ]
 	then
@@ -557,16 +566,15 @@ start() {
 				fi
 			fi
 		done
-		if yesno "${NFS}"
+		if yesno "${NFS}" && ! service_started nfsmount
 		then
-			rc-service -i portmap start
 			rc-service -i nfsmount start
 		fi
 		if ! yesno "${PASSWD}"
 		then
 			echo "root:${PASSWORD}" | chpasswd  > /dev/null 2>&1
-		else
-			rc-service pwgen start
+		elif ! service_started pwgen
+			rc-service -i pwgen start
 		fi
 		if yesno "${SSHD}"
 		then
@@ -596,7 +604,10 @@ start() {
 
 			einfo "${sndmsg}"
 
-			rc-service -i alsasound start
+			if ! service_started alsasound
+			then
+				rc-service -i alsasound start
+			fi
 
 			if [ -e /proc/asound/cards ]
 			then



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 20:35 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2011-02-11 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     ca9c96b740980f213418d6ed19bb34666d357001
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 20:35:47 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 20:35:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=ca9c96b7

Document authorship.

---
 AUTHORS |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a3b0ae0..fe9c49b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,13 @@
-This list is split into two alphabetical lists.  The first is a listing of the
-authors of the original Gentoo package.  The copyrights for all of those code
-contributions belong to the Gentoo Foundation.  The second list is the authors
-whom have contributed significant code to the new project.  All code added to
+This list is split into two alphabetical lists. The first is a listing of the
+authors of the original Gentoo package. The copyrights for all of those code
+contributions belong to the Gentoo Foundation. The second list is the authors
+whom have contributed significant code to the new project. All code added to
 the new project is copyrighted by the respective authors.
 
-Gentoo Foundation authors:
+The above paragraph was true until Dec 26, 2009. Then there was a period of
+hiatus and on Feb 10, 2011 development was resumed inside Gentoo.
+
+Original Gentoo Foundation authors:
 ------
 Andrew Gaffney <agaffney@gentoo.org>
 Chris Gianelloni <wolf31o2@gentoo.org>
@@ -19,9 +22,12 @@ Daniel Ostrow <dostrow@gentoo.org>
 Lars Weiler <pylon@gentoo.org>
 Gustavo Zacarias <gustavoz@gentoo.org>
 
-
 Copyright authors:
 ------
 Andrew Gaffney <agaffney@gentoo.org>
 Chris Gianelloni <wolf31o2@wolf31o2.org>
 
+2011-onwards Gentoo authors:
+------
+William Hubbs <williamh@gentoo.org>
+Robin H. Johnson <robbat2@gentoo.org>



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 21:07 Robin H. Johnson
  0 siblings, 0 replies; 26+ messages in thread
From: Robin H. Johnson @ 2011-02-11 21:07 UTC (permalink / raw
  To: gentoo-commits

commit:     68d49fbf554649c00a2f9b1a47445ee6fcf3b275
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 21:07:14 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 21:07:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=68d49fbf

Ensure /lib/firmware exists before we try to extract into it.

---
 autoconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/autoconfig b/autoconfig
index e8f7123..4e45702 100755
--- a/autoconfig
+++ b/autoconfig
@@ -281,6 +281,7 @@ unpack_firmware() {
 	if [ -e /lib/firmware.tar.bz2 ]
 	then
 		ebegin "Unpacking firmware"
+		mkdir -p /lib/firmware
 		tar xjf /lib/firmware.tar.bz2 -C /lib/firmware
 		eend 0
 	fi



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 21:14 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11 21:14 UTC (permalink / raw
  To: gentoo-commits

commit:     57d22825601003cf35d658a10c8d46787dbbe755
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 21:13:09 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 21:13:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=57d22825

migrate most services to the list_services function

---
 autoconfig |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/autoconfig b/autoconfig
index 4e45702..4fb083b 100755
--- a/autoconfig
+++ b/autoconfig
@@ -268,7 +268,7 @@ list_services() {
 	svcs="${svcs} $(check_svc ${NFS} nfsmount)"
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"
 	svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)"
-	svcs="${svcs} $(check_svc ${SSH} sshd)"
+	svcs="${svcs} $(check_svc ${SSHD} sshd)"
 
 	### TODO: make this baselayout-2 compatible
 	### TODO: make these checks accurate using service dependencies
@@ -504,17 +504,13 @@ start() {
 		einfo "Not Loading ACPI support ..."
 	fi
 
-	if yesno "${IDEDMA}" && ! service_started hdparm
+	if ! yesno "${IDEDMA}"
 	then
-		rc-service -i hdparm start
-	else
 		ewarn "Disabling IDE DMA support ..."
 	fi
 
-	if yesno "${PCMCIA}" && ! service_started pcmcia
+	if ! yesno "${PCMCIA}"
 	then
-		rc-service -i pcmcia start
-	else
 		ewarn "PCMCIA disabled via cmdline ..."
 	fi
 
@@ -567,15 +563,9 @@ start() {
 				fi
 			fi
 		done
-		if yesno "${NFS}" && ! service_started nfsmount
-		then
-			rc-service -i nfsmount start
-		fi
 		if ! yesno "${PASSWD}"
 		then
 			echo "root:${PASSWORD}" | chpasswd  > /dev/null 2>&1
-		elif ! service_started pwgen
-			rc-service -i pwgen start
 		fi
 		if yesno "${SSHD}"
 		then
@@ -586,7 +576,6 @@ start() {
 				ewarn "WARNING: You are starting sshd with a scrambled root password!!!"
 				ewarn "WARNING: You need to set a root password to be able to login remotely."
 			fi
-			rc-service -i sshd start
 		fi
 	else
 		ewarn "No Network device auto detected ..."
@@ -605,11 +594,6 @@ start() {
 
 			einfo "${sndmsg}"
 
-			if ! service_started alsasound
-			then
-				rc-service -i alsasound start
-			fi
-
 			if [ -e /proc/asound/cards ]
 			then
 				for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 22:18 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11 22:18 UTC (permalink / raw
  To: gentoo-commits

commit:     5ae07639698fef9d32049919935d478e0c400e2a
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 22:13:36 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 22:13:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=5ae07639

add fixinittab service

This is a port of the fix_inittab function from baselayout-1's version
of the livecd-tools. In openrc it is set up as a service which should
be added to the sysinit runlevel.

---
 fixinittab          |  100 +++++++++++++++++++++++++++++++++++++++++++++++++++
 livecd-functions.sh |   93 -----------------------------------------------
 2 files changed, 100 insertions(+), 93 deletions(-)

diff --git a/fixinittab b/fixinittab
new file mode 100755
index 0000000..b68be31
--- /dev/null
+++ b/fixinittab
@@ -0,0 +1,100 @@
+#!/bin/runscript
+
+depend()
+{
+	before dev
+}
+
+start()
+{
+	if [ "${CDBOOT}" = "" ]
+	then
+		return 1
+	fi
+
+	# Create a backup
+	cp -f /etc/inittab /etc/inittab.old
+
+	# Comment out current getty settings
+	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
+	sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
+
+	# SPARC & HPPA console magic
+	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]
+	then
+		# Mount openprom tree for user debugging purposes
+		if [ "${HOSTTYPE}" = "sparc" ]
+		then
+			mount -t openpromfs none /proc/openprom
+		fi
+
+		# SPARC serial port A, HPPA mux / serial
+		if [ -c "/dev/ttyS0" ]
+		then
+			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
+		fi
+		# HPPA software PDC console (K-models)
+		if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
+		then
+			mknod /dev/ttyB0 c 11 0
+			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
+			echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
+		fi
+		# FB / STI console
+		if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
+		then
+			MODEL_NAME=$(cat /proc/cpuinfo |grep "model name"|sed 's/.*: //')
+			if [ "${MODEL_NAME}" = "UML" ]
+			then
+			    for x in 0 1 2 3 4 5 6
+			    do
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+			    done
+			else
+			    for x in 1 2 3 4 5 6
+			    do
+				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
+			    done
+			fi
+		fi
+		if [ -c "/dev/hvc0" ]
+		then
+			einfo "Adding hvc console to inittab"
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
+		fi
+
+
+	# The rest...
+	else
+		if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
+		then
+			for x in 1 2 3 4 5 6
+			do
+				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
+			done
+		else
+			einfo "Adding ${LIVECD_CONSOLE} console to inittab"
+			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
+		fi
+	fi
+
+	# EFI-based machines should automatically hook up their console lines
+	if dmesg | grep -q '^Adding console on'
+	then
+		dmesg | grep '^Adding console on' | while read x; do
+			line=`echo "$x" | cut -d' ' -f4`
+			id=e`echo "$line" | grep -o '.\{1,3\}$'`
+			[ "${line}" = "${LIVECD_CONSOLE}" ] && continue  # already setup above
+			case "$x" in
+				*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
+				*) speed=9600 ;;  # choose a default, only matters if it is serial
+			esac
+			echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
+		done
+	fi
+
+	# force reread of inittab
+	telinit q
+	return 0
+}

diff --git a/livecd-functions.sh b/livecd-functions.sh
index d51dd9e..96a6dd7 100755
--- a/livecd-functions.sh
+++ b/livecd-functions.sh
@@ -538,96 +538,3 @@ livecd_read_commandline() {
 	done
 	return 0
 }
-
-livecd_fix_inittab() {
-	if [ "${CDBOOT}" = "" ]
-	then
-		return 1
-	fi
-
-	# Create a backup
-	cp -f /etc/inittab /etc/inittab.old
-
-	# Comment out current getty settings
-	sed -i -e '/^c[0-9]/ s/^/#/' /etc/inittab
-	sed -i -e '/^s[01]/ s/^/#/' /etc/inittab
-
-	# SPARC & HPPA console magic
-	if [ "${HOSTTYPE}" = "sparc" -o "${HOSTTYPE}" = "hppa" -o "${HOSTTYPE}" = "ppc64" ]
-	then
-		# Mount openprom tree for user debugging purposes
-		if [ "${HOSTTYPE}" = "sparc" ]
-		then
-			mount -t openpromfs none /proc/openprom
-		fi
-
-		# SPARC serial port A, HPPA mux / serial
-		if [ -c "/dev/ttyS0" ]
-		then
-			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyS0 speed)
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyS0 vt100" >> /etc/inittab
-		fi
-		# HPPA software PDC console (K-models)
-		if [ "${LIVECD_CONSOLE}" = "ttyB0" ]
-		then
-			mknod /dev/ttyB0 c 11 0
-			LIVECD_CONSOLE_BAUD=$(stty -F /dev/ttyB0 speed)
-			echo "b0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ttyB0 vt100" >> /etc/inittab
-		fi
-		# FB / STI console
-		if [ -c "/dev/vc/1" -o -c "/dev/tts/1" -o -c "/dev/tty2" ]
-		then
-			MODEL_NAME=$(cat /proc/cpuinfo |grep "model name"|sed 's/.*: //')
-			if [ "${MODEL_NAME}" = "UML" ]
-			then
-			    for x in 0 1 2 3 4 5 6
-			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
-			    done
-			else
-			    for x in 1 2 3 4 5 6
-			    do
-				    echo "c${x}:12345:respawn:/sbin/mingetty --noclear --autologin root tty${x}" >> /etc/inittab
-			    done
-			fi
-		fi
-		if [ -c "/dev/hvc0" ]
-		then
-			einfo "Adding hvc console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
-		fi
-
-
-	# The rest...
-	else
-		if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
-		then
-			for x in 1 2 3 4 5 6
-			do
-				echo "c${x}:12345:respawn:/sbin/agetty -nl /bin/bashlogin 38400 tty${x} linux" >> /etc/inittab
-			done
-		else
-			einfo "Adding ${LIVECD_CONSOLE} console to inittab"
-			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${LIVECD_CONSOLE_BAUD} ${LIVECD_CONSOLE} vt100" >> /etc/inittab
-		fi
-	fi
-
-	# EFI-based machines should automatically hook up their console lines
-	if dmesg | grep -q '^Adding console on'
-	then
-		dmesg | grep '^Adding console on' | while read x; do
-			line=`echo "$x" | cut -d' ' -f4`
-			id=e`echo "$line" | grep -o '.\{1,3\}$'`
-			[ "${line}" = "${LIVECD_CONSOLE}" ] && continue  # already setup above
-			case "$x" in
-				*options\ \'[0-9]*) speed=`echo "$x" | sed "s/.*options '//; s/[^0-9].*//"` ;;
-				*) speed=9600 ;;  # choose a default, only matters if it is serial
-			esac
-			echo "$id:12345:respawn:/sbin/agetty -nl /bin/bashlogin ${speed} ${line} vt100" >> /etc/inittab
-		done
-	fi
-
-	# force reread of inittab
-	kill -HUP 1
-	return 0
-}



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 22:27 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11 22:27 UTC (permalink / raw
  To: gentoo-commits

commit:     e138bb5166f3cf0076669e9b1e2a6049d8c6e593
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 22:26:06 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 22:26:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=e138bb51

fix dependency in fixinittab

fixinittab should go in the boot runlevel, not sysinit, and it should
run after procfs.

---
 fixinittab |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fixinittab b/fixinittab
index b68be31..d5dddc6 100755
--- a/fixinittab
+++ b/fixinittab
@@ -2,7 +2,7 @@
 
 depend()
 {
-	before dev
+	after procfs
 }
 
 start()



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 22:34 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11 22:34 UTC (permalink / raw
  To: gentoo-commits

commit:     4fbc79a5d0d972dd61584c63172135bb616a6f6e
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 22:32:55 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 22:32:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=4fbc79a5

Revert "fix dependency in fixinittab"

This reverts commit e138bb5166f3cf0076669e9b1e2a6049d8c6e593.

Fixinittab can be started in sysinit, with "before dev" as part of the
dependencies, the way I had it set up before. procfs does not mount
/proc.

---
 fixinittab |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fixinittab b/fixinittab
index d5dddc6..b68be31 100755
--- a/fixinittab
+++ b/fixinittab
@@ -2,7 +2,7 @@
 
 depend()
 {
-	after procfs
+	before dev
 }
 
 start()



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-11 23:45 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-11 23:45 UTC (permalink / raw
  To: gentoo-commits

commit:     1ec3277ab0c3f8438997d5e559da3f8d098efc98
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 23:45:14 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 23:45:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=1ec3277a

remove hal support

---
 autoconfig |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/autoconfig b/autoconfig
index 4fb083b..565400a 100755
--- a/autoconfig
+++ b/autoconfig
@@ -14,7 +14,6 @@ DMRAID="yes"
 EVMS="no"
 FIREWIRE="yes"
 GPM="yes"
-HALD="yes"
 IDEDMA="yes"
 LVM="no"
 MDADM="yes"
@@ -48,7 +47,6 @@ get_config() {
 				EVMS="no"
 				FIREWIRE="no"
 				GPM="no"
-				HALD="no"
 				LVM="no"
 				MDADM="no"
 				NET="no"
@@ -263,7 +261,6 @@ list_services() {
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
 	svcs="${svcs} $(check_svc ${GPM} gpm)"
-	svcs="${svcs} $(check_svc ${HALD} hald)"
 	svcs="${svcs} $(check_svc ${IDEDMA} hdparm)"
 	svcs="${svcs} $(check_svc ${NFS} nfsmount)"
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12  0:45 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12  0:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b74e8459cbc478f53ce36f47a872f178e30eaa9f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 00:40:47 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 00:40:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=b74e8459

fix message for sound card

The original message used \n for new lines, but einfo doesn't honor
these in openrc.

---
 autoconfig |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/autoconfig b/autoconfig
index 565400a..06be5f1 100755
--- a/autoconfig
+++ b/autoconfig
@@ -582,14 +582,12 @@ start() {
 	then
 		if [ -n "${SOUND_FULLNAME}" -o -n "${SOUND_DRIVER}" ]
 		then
-			local sndmsg="Soundcard:\n"
+			einfo "Soundcard:  "
 
 			[ -n "${SOUND_FULLNAME}" ] \
-				&& sndmsg="${sndmsg}              ${WARN}${SOUND_FULLNAME}\n"
+				&& einfo "              ${WARN}${SOUND_FULLNAME}  "
 			[ -n "${SOUND_DRIVER}" ] \
-				&& sndmsg="${sndmsg}              driver = ${SOUND_DRIVER}\n"
-
-			einfo "${sndmsg}"
+				&& einfo "              driver = ${SOUND_DRIVER}"
 
 			if [ -e /proc/asound/cards ]
 			then



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12  2:17 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12  2:17 UTC (permalink / raw
  To: gentoo-commits

commit:     e9ab68604c8b21a8c942b10ca9ce3cd683713eb5
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 02:12:53 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 02:15:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=e9ab6860

update sound and software speech handling

migrate unmute code to a separate script. Also migrate the espeakup
service to the list_services function.

---
 autoconfig |   47 +++++------------------------------------------
 unmute     |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/autoconfig b/autoconfig
index 06be5f1..32fff56 100755
--- a/autoconfig
+++ b/autoconfig
@@ -257,6 +257,11 @@ list_services() {
 
 	local svcs="$(check_svc ${ACPI} acpid)"
 	svcs="${svcs} $(check_svc ${ALSA} alsasound)"
+	svcs="${svcs} $(check_svc ${ALSA} unmute)"
+	if [ "${SPEAKUP_MODULE}" = "speakup_soft" ]  && rc-service -e espeakup
+	then
+		svcs="${svcs} espeakup"
+	fi
 	svcs="${svcs} $(check_svc ${APM} apmd)"
 	svcs="${svcs} $(check_svc ${BRLTTY} brltty)"
 	svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)"
@@ -588,48 +593,6 @@ start() {
 				&& einfo "              ${WARN}${SOUND_FULLNAME}  "
 			[ -n "${SOUND_DRIVER}" ] \
 				&& einfo "              driver = ${SOUND_DRIVER}"
-
-			if [ -e /proc/asound/cards ]
-			then
-				for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])
-				do
-					if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ]
-					then
-						amixer -c $i scontrols > /etc/amixer
-						[ -n "$(grep Master /etc/amixer)" ] \
-							&& amixer -c $i -q set Master 95% unmute \
-							>/dev/null 2>&1
-						[ -n "$(grep Front /etc/amixer)" ] \
-							&& amixer -c $i -q set Front 95% unmute \
-							>/dev/null 2>&1
-						[ -n "$(grep HDMI /etc/amixer)" ] \
-							&& amixer -c $i -q set HDMI 95% unmute \
-							>/dev/null 2>&1
-						[ -n "$(grep IEC958 /etc/amixer)" ] \
-							&& amixer -c $i -q set IEC958 95% unmute \
-							>/dev/null 2>&1
-						[ -n "$(grep PCM /etc/amixer)" ] \
-							&& amixer -c $i -q set PCM 95% unmute \
-							>/dev/null 2>&1
-						[ -n "$(grep Speaker /etc/amixer)" ] \
-							&& amixer -c $i -q set Speaker 95% unmute \
-							>/dev/null 2>&1
-						[ -n "$(grep Mic /etc/amixer)" ] \
-							&& amixer -c $i -q set Mic 95% mute cap \
-							>/dev/null 2>&1
-						[ -n "$(grep Wave /etc/amixer)" ] \
-							&& amixer -c $i -q set Wave 95% unmute \
-							>/dev/null 2>&1
-						[ -n "$(grep Capture /etc/amixer)" ] \
-							&& amixer -c $i -q set Capture 95% unmute cap \
-							>/dev/null 2>&1
-					fi
-				done
-
-				if [ "${SPEAKUP_MODULE}" = "speakup_soft" ]
-				then
-					rc-service -i espeakup start
-				fi
 			fi
 		fi
 	else

diff --git a/unmute b/unmute
new file mode 100755
index 0000000..7e73c83
--- /dev/null
+++ b/unmute
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+
+depend()
+{
+	need alsasound
+}
+
+start()
+{
+	if [ -e /proc/asound/cards ]
+	then
+		for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]])
+		do
+			einfo "unmuting sound card $i"
+			if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ]
+			then
+				amixer -c $i scontrols > /etc/amixer
+				[ -n "$(grep Master /etc/amixer)" ] \
+					&& amixer -c $i -q set Master 95% unmute \
+					>/dev/null 2>&1
+				[ -n "$(grep Front /etc/amixer)" ] \
+					&& amixer -c $i -q set Front 95% unmute \
+					>/dev/null 2>&1
+				[ -n "$(grep HDMI /etc/amixer)" ] \
+					&& amixer -c $i -q set HDMI 95% unmute \
+					>/dev/null 2>&1
+				[ -n "$(grep IEC958 /etc/amixer)" ] \
+					&& amixer -c $i -q set IEC958 95% unmute \
+					>/dev/null 2>&1
+				[ -n "$(grep PCM /etc/amixer)" ] \
+					&& amixer -c $i -q set PCM 95% unmute \
+					>/dev/null 2>&1
+				[ -n "$(grep Speaker /etc/amixer)" ] \
+					&& amixer -c $i -q set Speaker 95% unmute \
+					>/dev/null 2>&1
+				[ -n "$(grep Mic /etc/amixer)" ] \
+					&& amixer -c $i -q set Mic 95% mute cap \
+					>/dev/null 2>&1
+				[ -n "$(grep Wave /etc/amixer)" ] \
+					&& amixer -c $i -q set Wave 95% unmute \
+					>/dev/null 2>&1
+				[ -n "$(grep Capture /etc/amixer)" ] \
+					&& amixer -c $i -q set Capture 95% unmute cap \
+					>/dev/null 2>&1
+			fi
+		done
+	fi
+	return 0
+}



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12  4:33 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12  4:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ad1dceb37270a52fc639e554e04148fda20c4e06
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 04:33:09 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 04:33:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=ad1dceb3

fix typo

---
 autoconfig |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/autoconfig b/autoconfig
index 32fff56..5a9c679 100755
--- a/autoconfig
+++ b/autoconfig
@@ -593,7 +593,6 @@ start() {
 				&& einfo "              ${WARN}${SOUND_FULLNAME}  "
 			[ -n "${SOUND_DRIVER}" ] \
 				&& einfo "              driver = ${SOUND_DRIVER}"
-			fi
 		fi
 	else
 		ewarn "Skipping ALSA detection as requested on command line ..."



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12  5:33 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12  5:33 UTC (permalink / raw
  To: gentoo-commits

commit:     0fcc8a96944d868a9d10d5df72181bdcdc4d0ff1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 05:31:11 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 05:31:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=0fcc8a96

load speakup module before espeakup is run

This change will make sure that the speakup module is loaded into memory
before espeakup is run in case the user wants to use software speech.

---
 autoconfig |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/autoconfig b/autoconfig
index 5a9c679..ed588d6 100755
--- a/autoconfig
+++ b/autoconfig
@@ -255,6 +255,11 @@ list_services() {
 		esac
 	fi
 
+	if yesno "${SPEAKUP}"
+	then
+		modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS} 2> /dev/null
+	fi
+
 	local svcs="$(check_svc ${ACPI} acpid)"
 	svcs="${svcs} $(check_svc ${ALSA} alsasound)"
 	svcs="${svcs} $(check_svc ${ALSA} unmute)"
@@ -405,11 +410,6 @@ start() {
 	echo "0" > /proc/sys/kernel/printk
 	get_config
 
-	if yesno "${SPEAKUP}"
-	then
-		modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS}
-	fi
-
 	if yesno "${DETECT}"
 	then
 		ebegin "Hardware detection started"



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12  6:32 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12  6:32 UTC (permalink / raw
  To: gentoo-commits

commit:     bfccbe66846677d27bcf3abf12e75af58678843d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 06:31:46 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 06:31:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=bfccbe66

fix typo

---
 fixinittab |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fixinittab b/fixinittab
index b68be31..cadaeb0 100755
--- a/fixinittab
+++ b/fixinittab
@@ -1,4 +1,4 @@
-#!/bin/runscript
+#!/sbin/runscript
 
 depend()
 {



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12  7:19 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12  7:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c4f996d0db913a440ac4e86bb871c83ed568de84
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 07:19:37 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 07:19:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=c4f996d0

fixinittab should start after dev

---
 fixinittab |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fixinittab b/fixinittab
index cadaeb0..b7af2dd 100755
--- a/fixinittab
+++ b/fixinittab
@@ -2,7 +2,7 @@
 
 depend()
 {
-	before dev
+	after dev
 }
 
 start()



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12 20:04 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12 20:04 UTC (permalink / raw
  To: gentoo-commits

commit:     972d8b142aeeccd5806d850c1549413dba27679b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 20:00:01 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 20:03:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=972d8b14

adjust fixinittab

Fixinittab belongs in the boot runlevel and should start after the root
file system is mounted.
Also this commit makes fixinittab slightly more verbose.

---
 fixinittab |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fixinittab b/fixinittab
index b7af2dd..c65fcdc 100755
--- a/fixinittab
+++ b/fixinittab
@@ -2,7 +2,7 @@
 
 depend()
 {
-	after dev
+	after root
 }
 
 start()
@@ -12,6 +12,7 @@ start()
 		return 1
 	fi
 
+	einfo "adjusting inittab"
 	# Create a backup
 	cp -f /etc/inittab /etc/inittab.old
 
@@ -64,7 +65,6 @@ start()
 			echo "s0:12345:respawn:/sbin/agetty -nl /bin/bashlogin 9600 hvc0 vt320" >> /etc/inittab
 		fi
 
-
 	# The rest...
 	else
 		if [ "${LIVECD_CONSOLE}" = "tty0" -o "${LIVECD_CONSOLE}" = "" ]
@@ -96,5 +96,7 @@ start()
 
 	# force reread of inittab
 	telinit q
+
+	eend 0
 	return 0
 }



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-12 22:15 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-12 22:15 UTC (permalink / raw
  To: gentoo-commits

commit:     5691822e71310ea3fc127e0ee3ae0f8f6b0a2bee
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 22:14:32 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 22:14:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=5691822e

load speakup modules in depend function

---
 autoconfig |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/autoconfig b/autoconfig
index ed588d6..3d3c71f 100755
--- a/autoconfig
+++ b/autoconfig
@@ -201,6 +201,13 @@ get_config() {
 }
 
 depend() {
+	get_config
+
+	if yesno "${SPEAKUP}"
+	then
+		modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS} > /dev/null 2>&1
+	fi
+
 	need modules $(list_services)
 	before net
 }
@@ -255,11 +262,6 @@ list_services() {
 		esac
 	fi
 
-	if yesno "${SPEAKUP}"
-	then
-		modprobe ${SPEAKUP_MODULE} ${SPEAKUP_OPTIONS} 2> /dev/null
-	fi
-
 	local svcs="$(check_svc ${ACPI} acpid)"
 	svcs="${svcs} $(check_svc ${ALSA} alsasound)"
 	svcs="${svcs} $(check_svc ${ALSA} unmute)"



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-13 19:27 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-13 19:27 UTC (permalink / raw
  To: gentoo-commits

commit:     def73ce8ab55684c923b065e82208d7e70596f11
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 19:22:31 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 19:22:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=def73ce8

start xdm from autoconfig

We need to start xdm ourselves instead of allowing it to start in the
default order. This allows us to not start it when X is not requested by
the user or when speakup or brltty is requested.

---
 autoconfig |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/autoconfig b/autoconfig
index 3d3c71f..9eec5ce 100755
--- a/autoconfig
+++ b/autoconfig
@@ -278,6 +278,7 @@ list_services() {
 	svcs="${svcs} $(check_svc ${PASSWD} pwgen)"
 	svcs="${svcs} $(check_svc ${PCMCIA} pcmcia)"
 	svcs="${svcs} $(check_svc ${SSHD} sshd)"
+	svcs="${svcs} $(check_svc ${X11} xdm)"
 
 	### TODO: make this baselayout-2 compatible
 	### TODO: make these checks accurate using service dependencies
@@ -602,11 +603,6 @@ start() {
 
 	[ -n "${XDESC}" ] && einfo "VideoCard:   ${HILITE}${XDESC}${NORMAL}"
 
-	if ! yesno "${X11}"
-	then
-		touch /etc/.noxdm
-	fi
-
 	killall hwsetup 2>/dev/null
 	echo "6" > /proc/sys/kernel/printk
 }



^ permalink raw reply related	[flat|nested] 26+ messages in thread
* [gentoo-commits] proj/livecd-tools:bl2-only commit in: /
@ 2011-02-17  5:43 William Hubbs
  0 siblings, 0 replies; 26+ messages in thread
From: William Hubbs @ 2011-02-17  5:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5fcb9f4b9567af40f40443d2631b3632dc1509e1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 17 05:33:50 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Feb 17 05:42:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=5fcb9f4b

add --visit-items to dialog commands

this makes the net-setup script much more accessible with speakup.

X-Gentoo-Bug: 302381
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=302381

---
 livecd-functions.sh |   28 ++++++++++++++--------------
 net-setup           |    2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/livecd-functions.sh b/livecd-functions.sh
index 96a6dd7..81e2f1a 100755
--- a/livecd-functions.sh
+++ b/livecd-functions.sh
@@ -146,19 +146,19 @@ livecd_config_wireless() {
 	cd /tmp/setup.opts
 	[ -x /usr/sbin/iwconfig ] && iwconfig=/usr/sbin/iwconfig
 	[ -x /sbin/iwconfig ] && iwconfig=/sbin/iwconfig
-	dialog --title "SSID" --inputbox "Please enter your SSID, or leave blank for selecting the nearest open network" 20 50 2> ${iface}.SSID
+	dialog --visit-items --title "SSID" --inputbox "Please enter your SSID, or leave blank for selecting the nearest open network" 20 50 2> ${iface}.SSID
 	SSID=$(tail -n 1 ${iface}.SSID)
 	if [ -n "${SSID}" ]
 	then
-		dialog --title "WEP (Part 1)" --menu "Does your network use encryption?" 20 60 7 1 "Yes" 2 "No" 2> ${iface}.WEP
+		dialog --visit-items --title "WEP (Part 1)" --menu "Does your network use encryption?" 20 60 7 1 "Yes" 2 "No" 2> ${iface}.WEP
 		WEP=$(tail -n 1 ${iface}.WEP)
 		case ${WEP} in
 			1)
-				dialog --title "WEP (Part 2)" --menu "Are you entering your WEP key in HEX or ASCII?" 20 60 7 1 "HEX" 2 "ASCII" 2> ${iface}.WEPTYPE
+				dialog --visit-items --title "WEP (Part 2)" --menu "Are you entering your WEP key in HEX or ASCII?" 20 60 7 1 "HEX" 2 "ASCII" 2> ${iface}.WEPTYPE
 				WEP_TYPE=$(tail -n 1 ${iface}.WEPTYPE)
 				case ${WEP_TYPE} in
 					1)
-						dialog --title "WEP (Part 3)" --inputbox "Please enter your WEP key in the form of XXXX-XXXX-XX for 64-bit or XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XX for 128-bit" 20 50 2> ${iface}.WEPKEY
+						dialog --visit-items --title "WEP (Part 3)" --inputbox "Please enter your WEP key in the form of XXXX-XXXX-XX for 64-bit or XXXX-XXXX-XXXX-XXXX-XXXX-XXXX-XX for 128-bit" 20 50 2> ${iface}.WEPKEY
 						WEP_KEY=$(tail -n 1 ${iface}.WEPKEY)
 						if [ -n "${WEP_KEY}" ]
 						then
@@ -167,7 +167,7 @@ livecd_config_wireless() {
 						fi
 					;;
 					2)
-						dialog --title "WEP (Part 3)" --inputbox "Please enter your WEP key in ASCII form.  This should be 5 or 13 characters for either 64-bit or 128-bit encryption, repectively" 20 50 2> ${iface}.WEPKEY
+						dialog --visit-items --title "WEP (Part 3)" --inputbox "Please enter your WEP key in ASCII form.  This should be 5 or 13 characters for either 64-bit or 128-bit encryption, repectively" 20 50 2> ${iface}.WEPKEY
 						WEP_KEY=$(tail -n 1 ${iface}.WEPKEY)
 						if [ -n "${WEP_KEY}" ]
 						then
@@ -224,23 +224,23 @@ livecd_write_wireless_conf() {
 
 livecd_config_ip() {
 	cd /tmp/setup.opts
-	dialog --title "TCP/IP setup" --menu "You can use DHCP to automatically configure a network interface or you can specify an IP and related settings manually. Choose one option:" 20 60 7 1 "Use DHCP to auto-detect my network settings" 2 "Specify an IP address manually" 2> ${iface}.DHCP
+	dialog --visit-items --title "TCP/IP setup" --menu "You can use DHCP to automatically configure a network interface or you can specify an IP and related settings manually. Choose one option:" 20 60 7 1 "Use DHCP to auto-detect my network settings" 2 "Specify an IP address manually" 2> ${iface}.DHCP
 	DHCP=$(tail -n 1 ${iface}.DHCP)
 	case ${DHCP} in
 		1)
 			/sbin/dhcpcd -n -t 10 -h $(hostname) ${iface} &
 		;;
 		2)
-			dialog --title "IP address" --inputbox "Please enter an IP address for ${iface}:" 20 50 "192.168.1.1" 2> ${iface}.IP
+			dialog --visit-items --title "IP address" --inputbox "Please enter an IP address for ${iface}:" 20 50 "192.168.1.1" 2> ${iface}.IP
 			IP=$(tail -n 1 ${iface}.IP)
 			BC_TEMP=$(echo $IP|cut -d . -f 1).$(echo $IP|cut -d . -f 2).$(echo $IP|cut -d . -f 3).255
-			dialog --title "Broadcast address" --inputbox "Please enter a Broadcast address for ${iface}:" 20 50 "${BC_TEMP}" 2> ${iface}.BC
+			dialog --visit-items --title "Broadcast address" --inputbox "Please enter a Broadcast address for ${iface}:" 20 50 "${BC_TEMP}" 2> ${iface}.BC
 			BROADCAST=$(tail -n 1 ${iface}.BC)
-			dialog --title "Network mask" --inputbox "Please enter a Network Mask for ${iface}:" 20 50 "255.255.255.0" 2> ${iface}.NM
+			dialog --visit-items --title "Network mask" --inputbox "Please enter a Network Mask for ${iface}:" 20 50 "255.255.255.0" 2> ${iface}.NM
 			NETMASK=$(tail -n 1 ${iface}.NM)
-			dialog --title "Gateway" --inputbox "Please enter a Gateway for ${iface} (hit enter for none:)" 20 50 2> ${iface}.GW
+			dialog --visit-items --title "Gateway" --inputbox "Please enter a Gateway for ${iface} (hit enter for none:)" 20 50 2> ${iface}.GW
 			GATEWAY=$(tail -n 1 ${iface}.GW)
-			dialog --title "DNS server" --inputbox "Please enter a name server to use (hit enter for none:)" 20 50 2> ${iface}.DNS
+			dialog --visit-items --title "DNS server" --inputbox "Please enter a name server to use (hit enter for none:)" 20 50 2> ${iface}.DNS
 			DNS=$(tail -n 1 ${iface}.DNS)
 			/sbin/ifconfig ${iface} ${IP} broadcast ${BROADCAST} netmask ${NETMASK}
 			if [ -n "${GATEWAY}" ]
@@ -249,7 +249,7 @@ livecd_config_ip() {
 			fi
 			if [ -n "${DNS}" ]
 			then
-				dialog --title "DNS Search Suffix" --inputbox "Please enter any domains which you would like to search on DNS queries (hit enter for none:)" 20 50 2> ${iface}.SUFFIX
+				dialog --visit-items --title "DNS Search Suffix" --inputbox "Please enter any domains which you would like to search on DNS queries (hit enter for none:)" 20 50 2> ${iface}.SUFFIX
 				SUFFIX=$(tail -n 1 ${iface}.SUFFIX)
 				echo "nameserver ${DNS}" > /etc/resolv.conf
 				if [ -n "${SUFFIX}" ]
@@ -393,7 +393,7 @@ show_ifmenu() {
 	done
 	IFS="${old_ifs}"
 
-	if ! eval dialog --menu "Please select the interface that you wish to configure from the list below:" 0 0 0 $opts 2>iface
+	if ! eval dialog --visit-items --menu "Please select the interface that you wish to configure from the list below:" 0 0 0 $opts 2>iface
 	then
 		exit
 	fi
@@ -415,7 +415,7 @@ show_ifconfirm() {
 	[[ -n ${if_bus} ]] && text="${text}Bus type: ${if_bus}\n"
 	text="${text}\nIs this the interface that you wish to configure?"
 
-	if ! dialog --title "Interface details" --yesno "${text}" 15 70
+	if ! dialog --visit-items --title "Interface details" --yesno "${text}" 15 70
 	then
 		result="no"
 	else

diff --git a/net-setup b/net-setup
index f20d4c7..e81db2e 100755
--- a/net-setup
+++ b/net-setup
@@ -39,7 +39,7 @@ done
 # Show stderr again
 exec 2>/dev/stderr
 
-dialog --title "Network setup" --menu "This script is designed to setup both wired and wireless network settings.  All questions below apply to the ${iface} interface only.  Choose one option:" 20 60 7 1 "My network is wireless" 2 "My network is wired" 2> ${iface}.WIRED_WIRELESS
+dialog --visit-items --title "Network setup" --menu "This script is designed to setup both wired and wireless network settings.  All questions below apply to the ${iface} interface only.  Choose one option:" 20 60 7 1 "My network is wireless" 2 "My network is wired" 2> ${iface}.WIRED_WIRELESS
 WIRED_WIRELESS=$(tail -n 1 ${iface}.WIRED_WIRELESS)
 case ${WIRED_WIRELESS} in
 	1)



^ permalink raw reply related	[flat|nested] 26+ messages in thread
end of thread, other threads:[~2011-02-17  5:43 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17  5:43 [gentoo-commits] proj/livecd-tools:bl2-only commit in: / William Hubbs
  -- strict thread matches above, loose matches on Subject: below --
2011-02-13 19:27 William Hubbs
2011-02-12 22:15 William Hubbs
2011-02-12 20:04 William Hubbs
2011-02-12  7:19 William Hubbs
2011-02-12  6:32 William Hubbs
2011-02-12  5:33 William Hubbs
2011-02-12  4:33 William Hubbs
2011-02-12  2:17 William Hubbs
2011-02-12  0:45 William Hubbs
2011-02-11 23:45 William Hubbs
2011-02-11 22:34 William Hubbs
2011-02-11 22:27 William Hubbs
2011-02-11 22:18 William Hubbs
2011-02-11 21:14 William Hubbs
2011-02-11 21:07 Robin H. Johnson
2011-02-11 20:35 Robin H. Johnson
2011-02-11 20:21 William Hubbs
2011-02-11 17:43 William Hubbs
2011-02-11  4:22 William Hubbs
2011-02-11  0:26 William Hubbs
2011-02-11  0:06 Robin H. Johnson
2011-02-10 23:57 William Hubbs
2011-02-10 23:26 William Hubbs
2011-02-10 21:11 Robin H. Johnson
2011-02-10 21:11 Robin H. Johnson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox