[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[Christian Ruppert]

commit:     fb4aa20d053d055a83cf25f07f4185ea79cb7b30
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 18:32:05 2012 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 18:32:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=fb4aa20d

Use "checkpath -W" instead of dir_writable()

---
 init.d/bootmisc.in     |    8 ++++----
 init.d/consolefont.in  |    2 +-
 init.d/keymaps.in      |    2 +-
 init.d/termencoding.in |    2 +-
 sh/runscript.sh.in     |    5 -----
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index d75cb6e..a2afbf9 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -20,7 +20,7 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	dir_writable "$dir" || return 1
+	checkpath -W "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
 	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
@@ -117,7 +117,7 @@ start()
 		migrate_to_run	/var/run /run
 	fi
 
-	if dir_writable /var/run; then
+	if checkpath -W /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -159,7 +159,7 @@ start()
 		cleanup_tmp_dir "$tmp"
 	done
 
-	if dir_writable /tmp; then
+	if checkpath -W /tmp; then
 		# Make sure our X11 stuff have the correct permissions
 		# Omit the chown as bootmisc is run before network is up
 		# and users may be using lame LDAP auth #139411
@@ -172,7 +172,7 @@ start()
 	fi
 
 	if yesno $log_dmesg; then
-		if $logw || dir_writable /var/log; then
+		if $logw || checkpath -W /var/log; then
 			# Create an 'after-boot' dmesg log
 			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
 				dmesg > /var/log/dmesg

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 2f046d8..66b780d 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -54,7 +54,7 @@ start()
 	eend $retval
 
 	# Store the last font so we can use it ASAP on boot
-	if [ $retval -eq 0 ] && dir_writable "$RC_LIBEXECDIR"; then
+	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		for font in /usr/share/consolefonts/"$consolefont".*; do
 			:

diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index 851af5e..a55a0e0 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -63,7 +63,7 @@ start()
 	fi
 
 	# Save the keymapping for use immediately at boot
-	if dir_writable "$RC_LIBEXECDIR"; then
+	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
 	fi

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index b421898..af4ed15 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -35,7 +35,7 @@ start()
 	done
 
 	# Save the encoding for use immediately at boot
-	if dir_writable "$RC_LIBEXECDIR"; then
+	if checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		if yesno ${unicode:-${UNICODE}}; then
 			echo "" > "$RC_LIBEXECDIR"/console/unicode

diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index faa85cc..18bf4c3 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -4,11 +4,6 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-dir_writable()
-{
-	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
-}
-
 sourcex()
 {
 	if [ "$1" = "-e" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[William Hubbs]

commit:     686ee62a79e12ad73581ef4e151baad21b624935
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Wed Mar 26 16:13:20 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 15:36:41 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=686ee62a

tmpfiles: add support for --boot option

For compatibility with systemd-tmpfiles.

Fixes #17

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 init.d/tmpfiles.setup.in |  2 +-
 sh/tmpfiles.sh.in        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/init.d/tmpfiles.setup.in b/init.d/tmpfiles.setup.in
index 7edef5a..d5a6ecd 100644
--- a/init.d/tmpfiles.setup.in
+++ b/init.d/tmpfiles.setup.in
@@ -12,7 +12,7 @@ depend()
 start()
 {
 	ebegin "setting up tmpfiles.d entries"
-	@LIBEXECDIR@/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove \
+	@LIBEXECDIR@/sh/tmpfiles.sh --exclude-prefix=/dev --create --remove --boot \
 		${tmpfiles_opts}
 	eend $?
 	return 0

diff --git a/sh/tmpfiles.sh.in b/sh/tmpfiles.sh.in
index da588e2..a903163 100755
--- a/sh/tmpfiles.sh.in
+++ b/sh/tmpfiles.sh.in
@@ -214,7 +214,7 @@ _Z() {
 	CHOPTS=-R relabel "$@"
 }
 
-CREATE=0 REMOVE=0 CLEAN=0 VERBOSE=0 DRYRUN=0 error=0 LINENO=0
+BOOT=0 CREATE=0 REMOVE=0 CLEAN=0 VERBOSE=0 DRYRUN=0 error=0 LINENO=0
 EXCLUDE=
 PREFIX=
 FILE=
@@ -249,6 +249,7 @@ done
 
 while [ $# -gt 0 ]; do
 	case $1 in
+		--boot) BOOT=1 ;;
 		--create) CREATE=1 ;;
 		--remove) REMOVE=1 ;;
 		--clean) CLEAN=1 ;; # TODO: Not implemented
@@ -266,7 +267,7 @@ if [ $(( CLEAN )) -eq 1 ] ; then
 fi
 
 if [ "$CREATE$REMOVE" = '00' ]; then
-	printf 'usage: %s [--exclude-prefix=path] [--prefix=path] [--create] [--remove] [--clean] [--verbose] [--dry-run]\n' "${0##*/}"
+	printf 'usage: %s [--exclude-prefix=path] [--prefix=path] [--boot] [--create] [--remove] [--clean] [--verbose] [--dry-run]\n' "${0##*/}"
 	exit 1
 fi
 
@@ -283,6 +284,7 @@ for FILE in $tmpfiles_d ; do
 	# Cmd  Path           Mode UID  GID  Age Argument
 	# d    /run/user      0755 root root 10d -
 	# Mode, UID, GID, Age, Argument may be omitted!
+	# If Cmd ends with !, the line is only processed if --boot is passed
 
 	# XXX: Upstream says whitespace is NOT permitted in the Path argument.
 	# But IS allowed when globs are expanded for the x/r/R/z/Z types.
@@ -294,6 +296,10 @@ for FILE in $tmpfiles_d ; do
 			continue
 		fi
 
+		case $cmd in
+			*!) [ "$BOOT" -eq "1" ] || continue; cmd=${cmd%!} ;;
+		esac
+
 		# whine about invalid entries
 		case $cmd in
 			f|F|w|d|D|p|L|c|b|x|X|r|R|z|Z) ;;

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[William Hubbs]

commit:     746bf5f78376e2e7b3e8bc843dfa1e4a3fa6a8e4
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 12 03:13:27 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 01:51:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=746bf5f7

consolefont: use setfont to save the current font

Using setfont directly to save the font prevents breakage
when a distro stores consolefonts in a location other than
/usr/share/consolefonts such as Arch which stores them in
/usr/share/kbd/consolefonts

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 init.d/consolefont.in     |    8 ++------
 sh/init-early.sh.Linux.in |    3 +--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 66b780d..0e91d13 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -53,14 +53,10 @@ start()
 	done
 	eend $retval
 
-	# Store the last font so we can use it ASAP on boot
+	# Store the font so we can use it ASAP on boot
 	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
-		for font in /usr/share/consolefonts/"$consolefont".*; do
-			:
-		done
-		cp "$font" "$RC_LIBEXECDIR"/console
-		echo "${font##*/}" >"$RC_LIBEXECDIR"/console/font
+		setfont -O "$RC_LIBEXECDIR"/console/font
 	fi
 
 	return $retval

diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in
index fb3860a..f9d2388 100644
--- a/sh/init-early.sh.Linux.in
+++ b/sh/init-early.sh.Linux.in
@@ -31,9 +31,8 @@ if service_present "$RC_DEFAULTLEVEL" consolefont ||
    service_present "$RC_BOOTLEVEL" consolefont; then
 	printf "\033%s" "$termencoding" >"$CONSOLE" 2>/dev/null
 	if [ -r "$RC_LIBEXECDIR"/console/font -a -x /usr/bin/setfont ]; then
-		font="$(cat "$RC_LIBEXECDIR"/console/font)"
 		[ -c "$CONSOLE" ] && cons="-C $CONSOLE"
-		setfont $cons "$RC_LIBEXECDIR"/console/"$font" 2>/dev/null
+		setfont $cons "$RC_LIBEXECDIR"/console/font 2>/dev/null
 	fi
 fi
 

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[William Hubbs]

commit:     9e3fc7f3f5127a27dac686a885929f5bd856717f
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 23:07:43 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 23:07:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9e3fc7f3

update ignore patterns

---
 init.d/.gitignore |    1 +
 sh/.gitignore     |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/init.d/.gitignore b/init.d/.gitignore
index a02adc1..f9df045 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -11,6 +11,7 @@ network
 root
 savecache
 swap
+swapfiles
 sysctl
 urandom
 devfs

diff --git a/sh/.gitignore b/sh/.gitignore
index bc5c074..f67b992 100644
--- a/sh/.gitignore
+++ b/sh/.gitignore
@@ -3,6 +3,7 @@ gendepends.sh
 init-common-post.sh
 rc-functions.sh
 runscript.sh
+cgroup-release-agent.sh
 init.sh
 init-early.sh
 ifwatchd-carrier.sh

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[William Hubbs]

commit:     6e2fbf6a0fd04f2ba4afca8b7a2ef9af34ebf330
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 22:48:24 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 17:56:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6e2fbf6a

Make checks for writable directory posix compliant

Reported-by: Maxim Kammerer <mk <AT> de.su>
X-Gentoo-Bug: 398931
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=398931

---
 init.d/bootmisc.in     |    5 -----
 init.d/consolefont.in  |    2 +-
 init.d/keymaps.in      |    2 +-
 init.d/termencoding.in |    2 +-
 sh/runscript.sh.in     |    5 +++++
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index ee3c20c..c3824e0 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -10,11 +10,6 @@ depend()
 	keyword -prefix -timeout
 }
 
-dir_writable()
-{
-	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
-}
-
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
 : ${log_dmesg:=${LOG_DMESG:-yes}}
 

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index f83b003..2f046d8 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -54,7 +54,7 @@ start()
 	eend $retval
 
 	# Store the last font so we can use it ASAP on boot
-	if [ $retval -eq 0 -a -w "$RC_LIBEXECDIR" ]; then
+	if [ $retval -eq 0 ] && dir_writable "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		for font in /usr/share/consolefonts/"$consolefont".*; do
 			:

diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index 1b96f49..851af5e 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -63,7 +63,7 @@ start()
 	fi
 
 	# Save the keymapping for use immediately at boot
-	if [ -w "$RC_LIBEXECDIR" ]; then
+	if dir_writable "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		dumpkeys >"$RC_LIBEXECDIR"/console/keymap
 	fi

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index edba715..b421898 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -35,7 +35,7 @@ start()
 	done
 
 	# Save the encoding for use immediately at boot
-	if [ -w "$RC_LIBEXECDIR" ]; then
+	if dir_writable "$RC_LIBEXECDIR"; then
 		mkdir -p "$RC_LIBEXECDIR"/console
 		if yesno ${unicode:-${UNICODE}}; then
 			echo "" > "$RC_LIBEXECDIR"/console/unicode

diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 8e7fa69..3b91001 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -4,6 +4,11 @@
 # Copyright (c) 2007-2009 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
+dir_writable()
+{
+	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
+}
+
 sourcex()
 {
 	if [ "$1" = "-e" ]; then

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[William Hubbs]

commit:     ed4605bf9ff63effe0d09811a3e708d5e3a75378
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 03:54:53 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 03:54:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ed4605bf

cgroups: remove references to the "openrc" cgroup

Openrc will set up cgroups the way the kernel documentation recommends.

---
 init.d/sysfs.in    |    5 -----
 sh/runscript.sh.in |   13 -------------
 2 files changed, 0 insertions(+), 18 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index cb44b30..8838213 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -85,11 +85,6 @@ mount_cgroups()
 				;;
 		esac
 	done < /proc/cgroups
-
-	# mkdir /sys/fs/cgroup/openrc
-	# mount -t cgroup \
-	# -o nodev,noexec,nosuid,name=openrc \
-	# openrc /sys/fs/cgroup/openrc
 }
 
 start()

diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 07f96d8..b738b89 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -131,19 +131,6 @@ start()
 		service_inactive && _inactive=true
 		mark_service_inactive
 	fi
-	if [ "$RC_UNAME" = Linux ]; then
-		local cgroup=/sys/fs/cgroup/openrc
-		local svc_cgroup=${cgroup}/${RC_SVCNAME}
-		if mountinfo -q ${cgroup}; then
-			mkdir ${svc_cgroup}
-			for f in cpuset.cpus cpuset.mems; do
-					if [ -f ${cgroup}/${f} ]; then
-							cp ${cgroup}/${f} ${svc_cgroup}
-						fi
-					done
-			echo $$ > ${svc_cgroup}/tasks
-		fi
-	fi
 	eval start-stop-daemon --start \
 		--exec $command \
 		${procname:+--name} $procname \

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[William Hubbs]

commit:     0510c473d4cd9097401e3a7bc236b0121977b81d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 21:54:18 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 23:58:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0510c473

CGroups: /sys/fs/cgroups should be a tmpfs

The kernel documentation states that a cgroup file system should not be
mounted here, but a tmpfs.

This also means that we should not create a group for each process, but
we should allow the user to specify which group a process should be
assigned to. The rc_cgroup variable will be used for this purpose.

For more information, see /usr/src/linux/Documentation/cgroups/cgroups.txt.

---
 init.d/sysfs.in    |    2 +-
 sh/runscript.sh.in |   29 +++++++----------------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 257f314..a536d5f 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -65,7 +65,7 @@ mount_misc()
 	if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then
 		if grep -qs cgroup /proc/filesystems; then
 			ebegin "Mounting cgroup filesystem"
-			mount -n -t cgroup -o  nodev,noexec,nosuid \
+			mount -n -t tmpfs -o  nodev,noexec,nosuid \
 				cgroup /sys/fs/cgroup
 			eend $?
 		fi

diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index c7d712b..706a1f7 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -190,18 +190,13 @@ fi
 sourcex -e "@SYSCONFDIR@/rc.conf"
 
 # Attach to CGroup - dir existing is enough for us
-if [ -d /sys/fs/cgroup/ ]; then
-	# use RC_SVCNAME unless overridden in conf.d
-	SVC_CGROUP=${rc_cgroup:-$RC_SVCNAME}
-	mkdir -p /sys/fs/cgroup/${SVC_CGROUP}
-	for f in cpuset.cpus cpuset.mems; do
-		if [ -f /sys/fs/cgroup/${f} ]; then
-			cp /sys/fs/cgroup/${f} /sys/fs/cgroup/${SVC_CGROUP}
-		fi
-	done
-	# now attach self to cgroup - any children of this process will inherit this
-	echo $$ > /sys/fs/cgroup/${SVC_CGROUP}/tasks
-	# TODO: set res limits from conf.d
+if [ -d /sys/fs/cgroup -a -n "${rc_cgroup}" ]; then
+	if [ -d /sys/fs/cgroup/${rc_cgroup} ]; then
+		# attach self to cgroup - any children of this process will inherit this
+		echo $$ > /sys/fs/cgroup/${rc_cgroup}/tasks
+	else
+		eerror "Control group /sys/fs/cgroup/${rc_cgroup} does not exist."
+	fi
 fi
 
 # Apply any ulimit defined
@@ -307,14 +302,4 @@ while [ -n "$1" ]; do
 	exit 1
 done
 
-# CGroup cleanup
-if [ -d /sys/fs/cgroup/ ]; then
-	# use RC_SVCNAME unless overridden in conf.d
-	SVC_CGROUP=${rc_cgroup:-$RC_SVCNAME}
-	# reattach to root cgroup
-	echo $$ > /sys/fs/cgroup/tasks
-	# remove cgroup if empty, will fail if any task attached
-	rmdir  /sys/fs/cgroup/${SVC_CGROUP} 2>/dev/null
-fi
-
 exit 0

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[Mike Frysinger]

commit:     9f95878bbd5461837b00b5ea2134768302776584
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 23:02:21 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 23:02:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9f95878b

fix random typos

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 init.d/bootmisc.in |   10 +++++-----
 init.d/devdb.in    |    2 +-
 init.d/dumpon.in   |    2 +-
 init.d/fsck.in     |    2 +-
 init.d/ipfw.in     |    4 ++--
 sh/runscript.sh.in |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 2ca7926..31fa0c8 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -10,7 +10,7 @@ depend()
 	keyword -prefix -timeout
 }
 
-dir_writeable()
+dir_writable()
 {
 	mkdir "$1"/.test.$$ 2>/dev/null && rmdir "$1"/.test.$$
 }
@@ -25,7 +25,7 @@ cleanup_tmp_dir()
 	if ! [ -d "$dir" ]; then
 		mkdir -p "$dir" || return $?
 	fi
-	dir_writeable "$dir" || return 1
+	dir_writable "$dir" || return 1
 	chmod a+rwt "$dir" 2> /dev/null
 	cd "$dir" || return 1
 	if yesno $wipe_tmp; then
@@ -89,7 +89,7 @@ start()
 		fi
 	done
 
-	if dir_writeable /var/run; then
+	if dir_writable /var/run; then
 		ebegin "Creating user login records"
 		local xtra=
 		[ "$RC_UNAME" = NetBSD ] && xtra=x
@@ -131,7 +131,7 @@ start()
 		cleanup_tmp_dir "$tmp"
 	done
 
-	if dir_writeable /tmp; then
+	if dir_writable /tmp; then
 		# Make sure our X11 stuff have the correct permissions
 		# Omit the chown as bootmisc is run before network is up
 		# and users may be using lame LDAP auth #139411
@@ -144,7 +144,7 @@ start()
 	fi
 
 	if yesno $log_dmesg; then
-		if $logw || dir_writeable /var/log; then
+		if $logw || dir_writable /var/log; then
 			# Create an 'after-boot' dmesg log
 			if [ "$RC_SYS" != VSERVER -a "$RC_SYS" != OPENVZ ]; then
 				dmesg > /var/log/dmesg

diff --git a/init.d/devdb.in b/init.d/devdb.in
index 951c750..fcf2597 100644
--- a/init.d/devdb.in
+++ b/init.d/devdb.in
@@ -11,7 +11,7 @@ depend()
 
 start()
 {
-	ebegin "Bulding the dev database"
+	ebegin "Building the dev database"
 	if [ /var/run/dev.db -nt /dev ]; then
 		:
 	else

diff --git a/init.d/dumpon.in b/init.d/dumpon.in
index ec33174..4450bf9 100644
--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -19,7 +19,7 @@ start() {
 }
 
 stop() {
-	ebegin "Deactiving kernel core dump device"
+	ebegin "Deactivating kernel core dump device"
 	dumpon off
 	eend $?
 }

diff --git a/init.d/fsck.in b/init.d/fsck.in
index e8bf1cf..54537f6 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -91,7 +91,7 @@ start()
 			_reboot
 		fi;;
 	8)	ewend 1 "Operational error"; return 0;;
-	12)	ewend 1 "fsck interupted";;
+	12)	ewend 1 "fsck interrupted";;
 	*)	eend 2 "Filesystems couldn't be fixed";;
 	esac
 	_abort || return 1

diff --git a/init.d/ipfw.in b/init.d/ipfw.in
index ebfe421..434920d 100644
--- a/init.d/ipfw.in
+++ b/init.d/ipfw.in
@@ -59,7 +59,7 @@ start() {
 		return 1
 	fi
 
-	# Use a statefull firewall
+	# Use a stateful firewall
 	ipfw add check-state
 	ipfw add pass tcp from me to any established
 
@@ -123,7 +123,7 @@ start() {
 	ipfw add deny udp from any to any 520 in
 
 	# Noise from webbrowsing.
-	# The statefull filter is a bit agressive, and will cause some
+	# The stateful filter is a bit aggressive, and will cause some
 	# connection teardowns to be logged.
 	ipfw add deny tcp from any 80,443 to any 1024-65535 in
 

diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 5853212..26dcfb3 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -88,7 +88,7 @@ keyword() {
 	[ -n "$*" ] && echo "keyword $*"
 }
 
-# Descript the init script to the user
+# Describe the init script to the user
 describe()
 {
 	if [ -n "$description" ]; then
@@ -217,7 +217,7 @@ if [ -n "$opts" ]; then
 fi
 
 while [ -n "$1" ]; do
-	# Sepcial case depend
+	# Special case depend
 	if [ "$1" = depend ]; then
 		shift
 		_depend

[gentoo-commits] proj/openrc:master commit in: init.d/, sh/

[William Hubbs]

commit:     e8e86b96dc8abbdfb7069a267873ef2950eb84cb
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 19:33:21 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 23:41:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e8e86b96

fix issue with extra_net_fs_list

The extra_net_fs_list variable was not being included as it should have
been for the net file systems because it was being expanded before it
was set by the user.

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

---
 init.d/localmount.in  |    4 ++--
 init.d/mount-ro.in    |    2 +-
 init.d/netmount.in    |    6 +++---
 sh/rc-functions.sh.in |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/init.d/localmount.in b/init.d/localmount.in
index 734a7f8..efbddc7 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -16,7 +16,7 @@ start()
 {
 	# Mount local filesystems in /etc/fstab.
 	local types="noproc" x= no_netdev=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		types="${types},${x}"
 	done
 
@@ -70,7 +70,7 @@ stop()
 	einfo "Unmounting filesystems"
 	eindent
 	local fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 4b89b04..dc2a098 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -34,7 +34,7 @@ start()
 	fi
 	m="^($m)$"
 	fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"

diff --git a/init.d/netmount.in b/init.d/netmount.in
index 4cc8842..963ad26 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -44,7 +44,7 @@ start()
 	[ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap="rpcbind"
 
 	local x= fs= rc=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		case "$x" in
 			nfs|nfs4)
 			# If the nfsmount script took care of the nfs
@@ -81,7 +81,7 @@ stop()
 	ebegin "Unmounting network filesystems"
 	. "$RC_LIBEXECDIR"/sh/rc-mount.sh
 
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+,}$x"
 	done
 	if [ -n "$fs" ]; then
@@ -90,7 +90,7 @@ stop()
 
 	eindent
 	fs=
-	for x in $net_fs_list; do
+	for x in $net_fs_list $extra_net_fs_list; do
 		fs="$fs${fs:+|}$x"
 	done
 	[ -n "$fs" ] && fs="^($fs)$"

diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
index 02f84b4..50ba20b 100644
--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh.in
@@ -39,7 +39,7 @@ stop_addon()
 }
 
 net_fs_list="afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre
-ncpfs nfs nfs4 ocfs2 shfs smbfs $extra_net_fs_list"
+ncpfs nfs nfs4 ocfs2 shfs smbfs"
 is_net_fs()
 {
 	[ -z "$1" ] && return 1