aboutsummaryrefslogtreecommitdiff
path: root/init.d/bootmisc.in
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-11-30 10:00:44 -0600
committerWilliam Hubbs <williamh@gentoo.org>2011-12-03 12:46:52 -0600
commit5adb3930c7a875153c0b817b5c21596a3faaac29 (patch)
tree6afd4ee806cbc2eb92fa00c3a93ab55cbb421f2a /init.d/bootmisc.in
parentb628481701d1f240ff8b2411dc041db332578a8c (diff)
Integrate migrate-run into bootmisc
The migrate-run service was hanging when parallel startup was enabled because of its dependencies. This integrates the logic for this service into bootmisc, which will avoid the issues with parallel startup. I would like to thank Robin H. Johnson <robbat2@gentoo.org> for his input on this patch
Diffstat (limited to 'init.d/bootmisc.in')
-rw-r--r--init.d/bootmisc.in37
1 files changed, 35 insertions, 2 deletions
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 31fa0c8d..96455ad7 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -72,6 +72,26 @@ mkutmp()
chmod 0664 "$1"
}
+migrate_to_run()
+{
+ src="$1"
+ dst="$2"
+ if [ -L $src -a "$(readlink -f $src)" != $dst ]; then
+ ewarn "$src does not point to $dst."
+ ewarn "Setting $src to point to $dst."
+ rm $src
+ elif [ ! -L $src -a -d $src ]; then
+ ebegin "Migrating $src to $dst"
+ cp -a $src/* $dst/
+ rm -rf $src
+ eend $?
+ fi
+ # If $src doesn't exist at all, just run this
+ if [ ! -e $src ]; then
+ ln -s $dst $src
+ fi
+}
+
start()
{
# Remove any added console dirs
@@ -79,8 +99,16 @@ start()
local logw=false runw=false extra=
# Ensure that our basic dirs exist
- [ "$RC_UNAME" = Linux ] && extra=/var/lib/misc # Satisfy Linux FHS
- for x in /var/log /var/run /tmp $extra; do
+ if [ "$RC_UNAME" = Linux ]; then
+ # Satisfy Linux FHS
+ extra=/var/lib/misc
+ if [ ! -d /run ]; then
+ extra="/var/run $extra"
+ fi
+ else
+ extra=/var/run
+ fi
+ for x in /var/log /tmp $extra; do
if ! [ -d $x ]; then
if ! mkdir -p $x; then
eend 1 "failed to create needed directory $x"
@@ -89,6 +117,11 @@ start()
fi
done
+ if [ "$RC_UNAME" = Linux -a -d /run ]; then
+ migrate_to_run /var/lock /run/lock
+ migrate_to_run /var/run /run
+ fi
+
if dir_writable /var/run; then
ebegin "Creating user login records"
local xtra=