update ChangeLog

We do not need to care about the path on the shebang line of a service
script as long as the shebang line ends with "openrc-run".
This fixes #119 and #120.

ChangeLog

@@ -1,3 +1,67 @@
+commit 477e3dd8c13705affe87cc2c0e9286b2653a5688
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    sh/gendepends.sh.in: fix detection of service scripts
+    
+    We do not need to care about the path on the shebang line of a service
+    script as long as the shebang line ends with "openrc-run".
+    This fixes #119 and #120.
+
+commit 678e7adeb237edd080a13e463e5d8c40d2acdea7
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.24.2
+
+commit b087a751deb06986e0d77873046e08ca4864175c
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
+commit bc05fb75515b3f65f3c63ae5972c749fac00924f
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update news file
+
+commit e5c2a378f3000cd20826ec6b59ecca15d31190ae
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    Remove all occurances of 'before *' from dependencies
+    
+    Using wildcards in dependencies causes issues when rc_parallel is set to
+    yes because it can lead to deadlocks.
+    All dependencies need to be explicit rather than implicit.
+    
+    This is the first stage of moving this direction.
+
+commit 3c1a71bd9db50fd410eb64e715a99911c8fad978
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    init.d/sysfs.in: efivarfs tweaks
+    
+    Since we check for /sys/firmware/efi/efivars, we do not need to check
+    for /sys/firmware/efi
+    
+    Since Failing to mount efivarfs is not critical, we silence the error
+    message from mount.
+
+commit fcb826a45137fec589bf945fe23deeba55879a34
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.24.1
+
+commit fde3902d069dfdce9c59555186a5541d6d99c8aa
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
 commit d7bbb0f5830e1ec4df1ec52714d70ac6b0a81878
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.24
+VERSION=	0.24.2
 PKG=		${NAME}-${VERSION}

NEWS.md

@@ -3,6 +3,18 @@
 This file will contain a list of notable changes for each release. Note
 the information in this file is in reverse order.
 
+## OpenRC-0.24.1
+
+This version starts cleaning up the dependencies so that rc_parallel
+will work correctly.
+
+The first step in this process is to remove the 'before *' from the
+depend functions in the clock services. This means some  services not
+controlled by OpenRC may now start before instead of after the clock
+service. If it is important for these services to start after the clock
+service, they need to have 'after clock' added to their depend
+functions.
+
 ## OpenRC-0.24
 
 Since the deptree2dot tool and the perl requirement are completely

init.d/hwclock.in

@@ -34,7 +34,8 @@ depend()
 	if yesno $clock_adjfile; then
 		use root
 	else
-		before *
+		before binfmt bootmisc fsck hostname keymaps localmount loopback mtab
+		before procfs root swap sysctl termencoding urandom
 	fi
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

init.d/swclock.in

@@ -13,7 +13,10 @@ description="Sets the local clock to the mtime of a given file."
 
 depend()
 {
-	before *
+	before adjkerntz binfmt bootmisc devdb dumpon fsck hostid hostname keymaps
+	before localmount loopback modules mtab network newsyslog procfs root
+	before savecore staticroute swap swap-blk syscons sysctl syslogd
+	before termencoding ttys urandom wscons
 	provide clock
 	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }

init.d/sysfs.in

@@ -98,16 +98,12 @@ mount_misc()
 	fi
 
 	# set up kernel support for efivarfs
-	# The presence of /sys/firmware/efi indicates that the system was
-	# booted in efi mode.
-	if [ -d /sys/firmware/efi ]; then
-		if [ -d /sys/firmware/efi/efivars ] &&
-			! mountinfo -q /sys/firmware/efi/efivars; then
-			ebegin "Mounting efivarfs filesystem"
-			mount -n -t efivarfs -o ${sysfs_opts} \
-				efivarfs /sys/firmware/efi/efivars
-			eend $?
-		fi
+	if [ -d /sys/firmware/efi/efivars ] &&
+		! mountinfo -q /sys/firmware/efi/efivars; then
+		ebegin "Mounting efivarfs filesystem"
+		mount -n -t efivarfs -o ${sysfs_opts} \
+			efivarfs /sys/firmware/efi/efivars 2> /dev/null
+		eend 0
 	fi
 }
 

sh/gendepends.sh.in

@@ -74,11 +74,22 @@ do
 
 		# Only generate dependencies for OpenRC scripts
 		read one two three <"$RC_SERVICE"
-		[ "$one" = "#!@SBINDIR@/runscript" ] || \
-		[ "$one" = "#!@SBINDIR@/openrc-run" ] || \
-		[ "$one" = "#!" -a "$two" = "@SBINDIR@/runscript" ] || \
-		[ "$one" = "#!" -a "$two" = "@SBINDIR@/openrc-run" ] || \
-			continue
+		case "$one" in
+			\#*/openrc-run) ;;
+			\#*/runscript) ;;
+			\#!)
+				case "$two" in
+					*/openrc-run) ;;
+					*/runscript) ;;
+					*)
+						continue
+						;;
+				esac
+				;;
+			*)
+				continue
+				;;
+		esac
 		unset one two three
 
 		RC_SVCNAME=${RC_SERVICE##*/} ; export RC_SVCNAME