Permalink
Browse files

move runsvdir to /run/runit

  • Loading branch information...
1 parent 294c277 commit 06b7292b41348ae592db1720df863a033818729d @chneukirchen committed Sep 1, 2012
View
@@ -19,7 +19,7 @@ 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 -m0755 /run/lock /run/lock/lvm /run/lvm /run/user /dev/pts /dev/shm
+mkdir -p -m0755 /run/runit /run/lock /run/lock/lvm /run/lvm /run/user /dev/pts /dev/shm
mountpoint -q /dev/pts || mount -n -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
mountpoint -q /dev/shm || mount -n -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev
@@ -72,4 +72,4 @@ rm -f /etc/nologin /forcefsck /forcequotacheck /fastboot
dmesg >/var/log/dmesg.log
-install -m0 /dev/null /etc/runit/stopit
+install -m0 /dev/null /run/runit/stopit
View
@@ -16,13 +16,12 @@ for w in $(</proc/cmdline); do
runlevel=*) curlevel=${w#*runlevel=};;
esac
done
-[[ $curlevel == default ]] && svdir=/run/service || svdir=/run/service.$curlevel
sysctl --system
for runlevel in ${!DAEMONS_*}; do
runlevel=${runlevel#DAEMONS_}
- [[ $runlevel == default ]] && d=/run/service || d=/run/service.$runlevel
+ d=/run/runit/runsvdir/$runlevel
mkdir -p $d
ref="DAEMONS_${runlevel}[@]"
for daemon in "${!ref}"; do
@@ -39,7 +38,7 @@ done
[ -x /etc/rc.local ] && /etc/rc.local
-runsvchdir $svdir
+ln -s /run/runit/runsvdir/$curlevel /run/runit/runsvdir/current
exec env - PATH=$PATH \
-runsvdir -P /etc/runit/runsvdir/current 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+runsvdir -P /run/runit/runsvdir/current 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
View
@@ -38,9 +38,9 @@ killall5 -15
i=10; while killall5 -18 && (( i-- )) ; do echo -n .; sleep 0.5; done; echo
killall5 -9
-umount -a -t tmpfs,nosysfs,noproc,nodevtmpfs
+umount /tmp
swapoff -a
-umount -r -a -t nosysfs,noproc,nodevtmpfs
+umount -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs
[[ $USELVM = yes ]] && vgchange --sysinit -a n
#cryptsetup luksClose data
@@ -49,11 +49,3 @@ umount -r -a -t nosysfs,noproc,nodevtmpfs
mount -o remount,ro /
sleep 1
sync
-
-if test -x /etc/runit/reboot
- echo Rebooting...
- reboot -d -f -i
-else
- echo Power off...
- poweroff -d -f -h -i
-fi
View
@@ -41,9 +41,8 @@ package() {
cd $srcdir/admin/$_pkgname-$pkgver/src
# default services
- install -d -m0755 "$pkgdir/etc/runit/runsvdir/runit-default"
install -d -m0755 "$pkgdir/var"
- ln -s ../etc/runit/runsvdir/current "${pkgdir}/var/service" || return 1
+ ln -s ../run/runit/runsvdir/current "${pkgdir}/var/service" || return 1
install -d -m0755 $pkgdir/sbin
install -s -m0755 $srcdir/admin/$_pkgname-$pkgver/src/{chpst,runit,runit-init,runsv,runsvchdir,runsvdir,sv,svlogd,utmpset} $pkgdir/sbin

0 comments on commit 06b7292

Please sign in to comment.