Merge branch 'master' of git://projects.archlinux.org/initscripts2012.06.28

8 files changed, 21 insertions, 39 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 49d6d07..210e9f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,6 @@ optdepends=('net-tools: legacy networking support'
             'bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
             'wireless_tools: Wireless networking')
-makedepends=(asciidoc)
 source=()
 sha256sums=()
 
diff --git a/functions b/functions
index a168c7f..55815d6 100644
--- a/functions
+++ b/functions
@@ -229,15 +229,6 @@ start_daemon() {
 	have_daemon "$1" && /etc/rc.d/"$1" start
 }
 
-# Never use this function, it causes daemons to be stoped in the wrong order.
-# The only way to start a daemon at boot is to add it to the DAEMONS array.
-ck_depends() {
-	local daemon
-	for daemon; do
-		ck_daemon "$daemon" && start_daemon "$daemon"
-	done
-}
-
 start_daemon_bkgd() {
 	stat_bkgd "Starting $1"
 	(start_daemon "$1") >/dev/null &
@@ -589,7 +580,7 @@ umount_all() {
 }
 
 remove_leftover() {
-	status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove
+	status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove --clean
 }
 
 bootlogd_stop() {
diff --git a/rc.conf.5.txt b/rc.conf.5.txt
index 89d6e5f..0e52f30 100644
--- a/rc.conf.5.txt
+++ b/rc.conf.5.txt
@@ -208,6 +208,7 @@ DAEMONS[[D]]
 *DAEMONS=*
 
 Daemons to start at boot-up (in this order)
+
 	- prefix a daemon with a ! to disable it
 	- prefix a daemon with a @ to start it up in the background
 
diff --git a/rc.d b/rc.d
index 0cfbdaf..77852d7 100755
--- a/rc.d
+++ b/rc.d
@@ -23,7 +23,6 @@ e.g: $name list
      $name list sshd gpm
      $name list --started gpm
      $name start sshd gpm
-     $name stop --noauto
      $name help
 EOF
 	exit ${1:-1}
diff --git a/rc.d.8.txt b/rc.d.8.txt
index d0bbcce..0f35884 100644
--- a/rc.d.8.txt
+++ b/rc.d.8.txt
@@ -72,15 +72,9 @@ Examples[[E]]
 *rc.d start sshd gpm*::
 	Starts *sshd* and *gpm* scripts.
 
-*rc.d start --auto --stopped*::
-	Starts all stopped scripts which are started at startup.
-
 *rc.d stop crond*::
 	Stops the *crond* script.
 
-*rc.d stop --noauto*::
-	Stop all script which are not runned at startup
-
 *rc.d restart crond*::
 	Restarts the *crond* script.
 
diff --git a/rc.multi b/rc.multi
index d558753..daf2372 100755
--- a/rc.multi
+++ b/rc.multi
@@ -12,6 +12,8 @@ run_hook multi_start
 /usr/lib/systemd/systemd-sysctl
 
 # Load additional binary formats
+mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null ||
+	mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc
 /usr/lib/systemd/systemd-binfmt
 
 # Start daemons
diff --git a/rc.shutdown b/rc.shutdown
index c708b92..d10b2da 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -55,7 +55,7 @@ run_hook shutdown_postumount
 
 # Kill non-root encrypted partition mappings
 if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then
-	stat_busy "Deactivating encrypted volumes:"
+	stat_busy "Deactivating encrypted volumes"
 		# Maybe someone has LVM on an encrypted block device
 		# executing an extra vgchange is errorless
 		[[ $USELVM = [Yy][Ee][Ss] ]] && vgchange --sysinit -a n &>/dev/null
diff --git a/rc.sysinit b/rc.sysinit
index d1bf60a..db4a677 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -6,6 +6,12 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+if [[ -s /etc/locale.conf ]]; then
+	parse_envfile /etc/locale.conf "LANG"
+elif [[ $LOCALE ]]; then
+	export LANG=$LOCALE
+fi
+
 echo " "
 printhl "Parabola GNU/Linux-Libre\n"
 printhl "${C_H2}http://parabolagnulinux.org"
@@ -18,16 +24,16 @@ mountpoint -q /proc    || mount -t proc proc /proc -o nosuid,noexec,nodev
 mountpoint -q /sys     || mount -t sysfs sys /sys -o nosuid,noexec,nodev
 mountpoint -q /run     || mount -t tmpfs run /run -o mode=0755,nosuid,nodev
 mountpoint -q /dev     || mount -t devtmpfs dev /dev -o mode=0755,nosuid
-mkdir -p -m 1777 /run/lock
 mkdir -p /dev/{pts,shm}
-mountpoint -q /dev/pts || mount /dev/pts &>/dev/null ||
-	mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
-mountpoint -q /dev/shm || mount /dev/shm &>/dev/null ||
-	mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev
-mountpoint -q /proc/sys/fs/binfmt_misc || mount /proc/sys/fs/binfmt_misc &>/dev/null ||
-	mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc
-
-if [[ ! -e /run/initramfs/fsck-root ]]; then
+mountpoint -q /dev/pts || mount -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
+mountpoint -q /dev/shm || mount -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev
+
+# log all console messages
+bootlogd -p /run/bootlogd.pid
+
+status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
+
+if [[ ! -e /run/initramfs/root-fsck ]]; then
 	# remount root ro to allow for fsck later on, we remount now to
 	# make sure nothing can open files rw on root which would block a remount
 	findmnt / --options ro &>/dev/null ||
@@ -36,9 +42,6 @@ fi
 
 run_hook sysinit_start
 
-# log all console messages
-bootlogd -p /run/bootlogd.pid
-
 HWCLOCK_PARAMS="--systz"
 case $HARDWARECLOCK in
 	"") ;;
@@ -66,13 +69,6 @@ fi
 # Start/trigger UDev, load MODULES and settle UDev
 udevd_modprobe sysinit
 
-if [[ -s /etc/locale.conf ]]; then
-	parse_envfile /etc/locale.conf "LANG"
-	[[ $LANG ]] && LOCALE=$LANG
-fi
-
-status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
-
 # bring up the loopback interface
 [[ -d /sys/class/net/lo ]] &&
 	status "Bringing up loopback interface" ip link set up dev lo
@@ -90,7 +86,7 @@ activate_vgs
 
 # Set up non-root encrypted partition mappings
 if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then
-	stat_busy "Unlocking encrypted volumes:"
+	stat_busy "Unlocking encrypted volumes"
 	crypto_unlocked=0
 	read_crypttab do_unlock && stat_done || stat_fail
 	# Maybe someone has LVM on an encrypted block device