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

5 files changed, 13 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index eeaa077..82a6b92 100644
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,10 @@ install: installdirs doc
 %.8: %.8.txt
 	a2x -d manpage -f manpage $<
 
-doc: $(MAN_PAGES)
+doc: rc.conf.5 rc.d.8
 
 clean:
-	rm -f $(MAN_PAGES)
+	rm -f rc.conf.5 rc.d.8
 
 tar:
 	git archive HEAD --prefix=initscripts-$(VER)/ | xz > initscripts-$(VER).tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 63613cf..49d6d07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ conflicts=('initscripts')
 provides=('initscripts=9999')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
 makedepends=('asciidoc')
-depends=('glibc' 'bash' 'grep' 'coreutils' 'systemd-tools' 'iproute2'
+depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2'
          'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('net-tools: legacy networking support'
             'bridge-utils: Network bridging support'
diff --git a/functions b/functions
index f03cccb..a168c7f 100644
--- a/functions
+++ b/functions
@@ -347,7 +347,7 @@ kill_all() {
 load_modules() {
 	local rc=0
 
-	/usr/lib/systemd/systemd-modules-load
+	/usr/lib/systemd/systemd-modules-load &>/dev/null
 	rc=$?
 
 	if (( ${#MODULES[*]} )); then
@@ -590,15 +590,6 @@ umount_all() {
 
 remove_leftover() {
 	status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove
-		# move from static /var/{run,lock} to /run
-		if [[ ! -L /var/lock ]]; then
-			rm -rf /var/lock
-			ln -s /run/lock /var/lock
-		fi
-		if [[ ! -L /var/run ]]; then
-			rm -rf /var/run
-			ln -s /run /var/run
-		fi
 }
 
 bootlogd_stop() {
diff --git a/rc.shutdown b/rc.shutdown
index d0d8405..c708b92 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -71,7 +71,7 @@ if [[ -f /etc/crypttab ]] && type -p cryptsetup >/dev/null; then
 	stat_done
 fi
 
-[[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]] &&
+[[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) ]] &&
 	status "Deactivating LVM2 groups" vgchange --sysinit -a n &>/dev/null
 
 run_hook shutdown_poweroff
@@ -82,7 +82,12 @@ if [[ -x /run/initramfs/shutdown ]]; then
 	if [[ $RUNLEVEL = 0 ]]; then
 		action="poweroff"
 	else
-		action="reboot"
+		{ read kexec_loaded </sys/kernel/kexec_loaded; } 2>/dev/null
+		if (( kexec_loaded )); then
+			action="kexec"
+		else
+			action="reboot"
+		fi
 	fi
 
 	# make /run/initrafs a mount
diff --git a/rc.sysinit b/rc.sysinit
index 53969d8..d1bf60a 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -39,14 +39,6 @@ run_hook sysinit_start
 # log all console messages
 bootlogd -p /run/bootlogd.pid
 
-if [[ ! -a /usr/lib ]] ; then
-	printf "${C_FAIL}/usr is not mounted. This is not supported.${C_OTHER}\n"
-fi
-
-if ! grep -q devtmpfs /proc/filesystems; then
-	printf "${C_FAIL}Your kernel does not have devtmpfs support. This is not supported.${C_OTHER}\n"
-fi
-
 HWCLOCK_PARAMS="--systz"
 case $HARDWARECLOCK in
 	"") ;;
@@ -120,8 +112,8 @@ run_hook sysinit_postfsck
 # Single-user login and/or automatic reboot if needed
 fsck_reboot $fsckret
 
-status "Remounting Root" \
-	mount -o remount /
+status "Remounting Root and API filesystems" \
+	/usr/lib/systemd/systemd-remount-fs
 
 # now mount all the local filesystems
 run_hook sysinit_premount