Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

move runsvdir to /run/runit

  • Loading branch information...
commit 06b7292b41348ae592db1720df863a033818729d 1 parent 294c277
Christian Neukirchen authored September 01, 2012
4  ignite/etc/runit/1
@@ -19,7 +19,7 @@ mountpoint -q /sys     || mount -t sysfs sys /sys -o nosuid,noexec,nodev
19 19
 mountpoint -q /run     || mount -t tmpfs run /run -o mode=0755,nosuid,nodev
20 20
 mountpoint -q /dev     || mount -t devtmpfs dev /dev -o mode=0755,nosuid
21 21
 
22  
-mkdir -p -m0755 /run/lock /run/lock/lvm /run/lvm /run/user /dev/pts /dev/shm
  22
+mkdir -p -m0755 /run/runit /run/lock /run/lock/lvm /run/lvm /run/user /dev/pts /dev/shm
23 23
 mountpoint -q /dev/pts || mount -n -t devpts devpts /dev/pts -o mode=0620,gid=5,nosuid,noexec
24 24
 mountpoint -q /dev/shm || mount -n -t tmpfs shm /dev/shm -o mode=1777,nosuid,nodev
25 25
 
@@ -72,4 +72,4 @@ rm -f /etc/nologin /forcefsck /forcequotacheck /fastboot
72 72
 
73 73
 dmesg >/var/log/dmesg.log
74 74
 
75  
-install -m0 /dev/null /etc/runit/stopit
  75
+install -m0 /dev/null /run/runit/stopit
7  ignite/etc/runit/2
@@ -16,13 +16,12 @@ for w in $(</proc/cmdline); do
16 16
     runlevel=*) curlevel=${w#*runlevel=};;
17 17
   esac
18 18
 done
19  
-[[ $curlevel == default ]] && svdir=/run/service || svdir=/run/service.$curlevel
20 19
 
21 20
 sysctl --system
22 21
 
23 22
 for runlevel in ${!DAEMONS_*}; do
24 23
   runlevel=${runlevel#DAEMONS_}
25  
-  [[ $runlevel == default ]] && d=/run/service || d=/run/service.$runlevel
  24
+  d=/run/runit/runsvdir/$runlevel
26 25
   mkdir -p $d
27 26
   ref="DAEMONS_${runlevel}[@]"
28 27
   for daemon in "${!ref}"; do
@@ -39,7 +38,7 @@ done
39 38
 
40 39
 [ -x /etc/rc.local ] && /etc/rc.local
41 40
 
42  
-runsvchdir $svdir
  41
+ln -s /run/runit/runsvdir/$curlevel /run/runit/runsvdir/current
43 42
 
44 43
 exec env - PATH=$PATH \
45  
-runsvdir -P /etc/runit/runsvdir/current 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
  44
+runsvdir -P /run/runit/runsvdir/current 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
12  ignite/etc/runit/3
@@ -38,9 +38,9 @@ killall5 -15
38 38
 i=10; while killall5 -18 && (( i-- )) ; do echo -n .; sleep 0.5; done; echo
39 39
 killall5 -9
40 40
 
41  
-umount -a -t tmpfs,nosysfs,noproc,nodevtmpfs
  41
+umount /tmp
42 42
 swapoff -a
43  
-umount -r -a -t nosysfs,noproc,nodevtmpfs
  43
+umount -r -a -t nosysfs,noproc,nodevtmpfs,notmpfs
44 44
 
45 45
 [[ $USELVM = yes ]] && vgchange --sysinit -a n
46 46
 #cryptsetup luksClose data
@@ -49,11 +49,3 @@ umount -r -a -t nosysfs,noproc,nodevtmpfs
49 49
 mount -o remount,ro /
50 50
 sleep 1
51 51
 sync
52  
-
53  
-if test -x /etc/runit/reboot
54  
-  echo Rebooting...
55  
-  reboot -d -f -i
56  
-else
57  
-  echo Power off...
58  
-  poweroff -d -f -h -i
59  
-fi
1  ignite/etc/runit/reboot
1  ignite/etc/runit/runsvdir
1  ignite/etc/runit/stopit
2  ignite/etc/sv/sulogin/supervise
3  runit-musl/PKGBUILD
@@ -41,9 +41,8 @@ package() {
41 41
   cd $srcdir/admin/$_pkgname-$pkgver/src
42 42
 
43 43
   # default services
44  
-  install -d -m0755 "$pkgdir/etc/runit/runsvdir/runit-default"
45 44
   install -d -m0755 "$pkgdir/var"
46  
-  ln -s ../etc/runit/runsvdir/current "${pkgdir}/var/service" || return 1
  45
+  ln -s ../run/runit/runsvdir/current "${pkgdir}/var/service" || return 1
47 46
 
48 47
   install -d -m0755 $pkgdir/sbin
49 48
   install -s -m0755 $srcdir/admin/$_pkgname-$pkgver/src/{chpst,runit,runit-init,runsv,runsvchdir,runsvdir,sv,svlogd,utmpset} $pkgdir/sbin

0 notes on commit 06b7292

Please sign in to comment.
Something went wrong with that request. Please try again.