Merge branch 'master' of https://projects.archlinux.org/git/initscripts into parabola2011.05.2parabola

6 files changed, 53 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index d3a1824..6923840 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ install: minilogd installdirs
 	install -m755 -t $(DESTDIR)/etc rc.local rc.local.shutdown rc.multi rc.shutdown rc.single rc.sysinit
 	install -m755 -t $(DESTDIR)/etc/cron.hourly adjtime
 	install -m755 -t $(DESTDIR)/etc/rc.d functions hwclock network netfs
-	install -m755 -t $(DESTDIR)/sbin minilogd rc
+	install -m755 -t $(DESTDIR)/sbin minilogd rc.d
 
 clean:
 	rm -f minilogd minilogd.o
diff --git a/RELEASE b/RELEASE
index 786b286..63c228a 100644
--- a/RELEASE
+++ b/RELEASE
@@ -15,4 +15,29 @@ Releasing
 
 4) check that the PKGBUILD in git is in sync with the PKGBUILD to be released
 
-5) create packages for both arches and push to testing
+5) create package and push to testing:
+
+  5.1) [first time only] set up ssh forwarding so you can connect to gerolde from alderaan
+
+    5.1.1) Add "ForwardAgent=yes" to ~/.ssh/config
+
+    5.1.2) Add your private key to the authentication agent "ssh-add"
+
+  5.2) ssh pkgbuild.com
+
+  5.3) [first time only] check out initscripts from svn
+
+    5.3.1) svn checkout -N svn+ssh://gerolde.archlinux.org/srv/svn-packages
+
+    5.3.2) "cd svn-packages && svn update initscripts"
+
+  5.4) get the latest version of initscripts: "cd svn-packages && svn update"
+
+  5.5) update the version field in the PKGBUILD
+
+  5.6) build the package for both arches: "sudo testing-{i686,x86_64}-build"
+
+  5.7) run checkpkg, namcap, and install test at least one of the two packages
+
+  5.8) commit to svn and move package to your staging folder (which needs to exist on gerolde):
+       'testingpkg "commit message"'
diff --git a/rc b/rc.d
index 743d86b..02c2b6c 100755
--- a/rc
+++ b/rc.d
@@ -4,12 +4,13 @@
 . /etc/rc.d/functions
 
 usage() {
-    cat >&2 << EOF
-usage: rc action daemon ...
+	local name=${0##*/}
+	cat >&2 << EOF
+usage: $name action daemon ...
 
-e.g: rc list
-     rc help
-     rc start sshd gpm
+e.g: $name list
+     $name help
+     $name start sshd gpm
 EOF
 	exit 1
 }
@@ -37,7 +38,7 @@ case $1 in
 			else
 				printf "${C_OTHER}[${C_FAIL}    ${C_OTHER}]"
 			fi
-			printf " ${C_MAIN}$d${C_CLEAR}\n"
+			printf " ${C_CLEAR}$d\n"
 		done
 		;;
 	*)
diff --git a/rc.shutdown b/rc.shutdown
index a78bc4d..604fdec 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -42,15 +42,12 @@ fi
 # Write to wtmp file before unmounting
 /sbin/halt -w
 
-stat_busy "Deactivating Swap"
-/sbin/swapoff -a
-stat_done
+status "Deactivating Swap" /sbin/swapoff -a
 
 # stop monitoring of lvm2 groups before unmounting filesystems
 if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then
-	stat_busy "Deactivating monitoring of LVM2 groups"
-	/sbin/vgchange --monitor n >/dev/null 2>&1
-	stat_done
+	status "Deactivating monitoring of LVM2 groups" \
+		/sbin/vgchange --monitor n >/dev/null 2>&1
 fi
 
 stat_busy "Unmounting Filesystems"
@@ -83,14 +80,10 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then
 fi
 
 if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then
-	stat_busy "Deactivating LVM2 groups"
-	/sbin/vgchange --sysinit -a n >/dev/null 2>&1
-	stat_done
+	status "Deactivating LVM2 groups" /sbin/vgchange --sysinit -a n >/dev/null 2>&1
 fi
 
-stat_busy "Remounting Root Filesystem Read-only"
-/bin/mount -n -o remount,ro /
-stat_done
+status "Remounting Root Filesystem Read-only" /bin/mount -n -o remount,ro /
 
 run_hook shutdown_poweroff
 
diff --git a/rc.single b/rc.single
index 06bd83c..d1191d2 100755
--- a/rc.single
+++ b/rc.single
@@ -10,10 +10,7 @@ run_hook single_start
 
 if [[ $PREVLEVEL != N ]]; then
 	kill_everything single
-	stat_busy "Starting UDev Daemon"
-	/sbin/udevd --daemon
-	stat_done
-
+	status "Starting UDev Daemon" /sbin/udevd --daemon
 	run_hook single_udevlaunched
 
 	# Trigger udev uevents
diff --git a/rc.sysinit b/rc.sysinit
index 466b439..908f639 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -276,8 +276,7 @@ if [[ -x /sbin/fsck ]]; then
 	stat_done
 fi
 
-stat_busy "Mounting Local Filesystems"
-/bin/mount -n -o remount,rw /
+status "Mounting Local Filesystems" /bin/mount -n -o remount,rw /
 
 # don't touch /etc/mtab if it is a symlink to /proc/self/mounts
 if [[ -L /etc/mtab ]]; then
@@ -318,6 +317,8 @@ stat_busy "Removing Leftover Files"
 /bin/mountpoint -q /tmp || /bin/rm -rf /tmp/* /tmp/.* &>/dev/null
 [[ ! -L /var/lock ]] && /bin/rm -rf /var/lock/*
 [[ ! -L /var/run && -d /var/run ]] && /usr/bin/find /var/run/ \! -type d -delete
+[[ ! -L /var/run && ! -L /var/run/daemons ]] && /bin/rm -rf /var/run/daemons \
+                                             && /bin/ln -s /run/daemons /var/run/daemons
 : >| /var/run/utmp
 /bin/chmod 0664 /var/run/utmp
 /bin/chown root:utmp /var/run/utmp
@@ -373,6 +374,16 @@ fi
 # Set console font if required
 set_consolefont
 
+# Adding persistent network/cdrom generated rules
+# When the rules are generated before /etc is mounted rw they are saved to /run,
+# we therefore need to copy this from /run to /etc. This functionality is going away one day.
+for f in cd net; do
+    [[ -f /run/udev/tmp-rules--70-persistent-$f.rules ]] || continue
+    stat_busy "Adding persistent $f udev rules"
+    /bin/cat "/run/udev/tmp-rules--70-persistent-$f.rules" >> "/etc/udev/rules.d/70-persistent-$f.rules"
+    stat_done
+done
+
 /bin/dmesg >| /var/log/dmesg.log
 
 run_hook sysinit_end