Move dinit-rc back to /etc

stay-on-etc 0.0.10
M. Herdiansyah 11 months ago
parent ab89fe9137
commit 877647da87
  1. 36
      Makefile
  2. 4
      scripts/cgroups
  3. 2
      scripts/hwclock
  4. 2
      services/binfmt
  5. 2
      services/cgroups
  6. 2
      services/cleanup
  7. 2
      services/dmesg
  8. 2
      services/hostname
  9. 2
      services/hwclock
  10. 2
      services/network
  11. 2
      services/pseudofs
  12. 4
      services/random-seed
  13. 4
      services/rclocal
  14. 2
      services/vconsole

@ -1,11 +1,9 @@
PREFIX ?= /usr
SYSCONFDIR ?= /etc
BINDIR ?= $(PREFIX)/bin
DATADIR ?= $(PREFIX)/share
LIBDIR ?= $(PREFIX)/lib
MANDIR ?= $(DATADIR)/man/man8
DINITDIR ?= $(SYSCONFDIR)/dinit.d
DINITLIBDIR ?= $(LIBDIR)/dinit.d
PREFIX ?= /usr
SYSCONFDIR ?= /etc
BINDIR ?= $(PREFIX)/bin
DATADIR ?= $(PREFIX)/share
MANDIR ?= $(DATADIR)/man/man8
DINITDIR ?= $(SYSCONFDIR)/dinit.d
BIN_PROGRAMS = modules-load
@ -84,22 +82,24 @@ install:
install -d $(DESTDIR)$(SYSCONFDIR)
install -d $(DESTDIR)$(MANDIR)
install -d $(DESTDIR)$(DINITDIR)
install -d $(DESTDIR)$(DINITLIBDIR)
install -d $(DESTDIR)$(DINITLIBDIR)/scripts
install -d $(DESTDIR)$(DINITLIBDIR)/boot.d
install -d $(DESTDIR)$(DINITLIBDIR)/mount.d
install -d $(DESTDIR)$(DINITDIR)/config
install -d $(DESTDIR)$(DINITDIR)/scripts
install -d $(DESTDIR)$(DINITDIR)/boot.d
install -d $(DESTDIR)$(DINITDIR)/mount.d
# placeholder
touch $(DESTDIR)$(DINITLIBDIR)/mount.d/.KEEP
touch $(DESTDIR)$(DINITDIR)/mount.d/.KEEP
# default services
ln -sf ../loginready $(DESTDIR)$(DINITLIBDIR)/boot.d/loginready
ln -sf ../misc $(DESTDIR)$(DINITLIBDIR)/boot.d/misc
ln -sf ../loginready $(DESTDIR)$(DINITDIR)/boot.d/loginready
ln -sf ../misc $(DESTDIR)$(DINITDIR)/boot.d/misc
ln -sf ../mount $(DESTDIR)$(DINITDIR)/boot.d/mount
ln -sf ../setup $(DESTDIR)$(DINITDIR)/boot.d/setup
# config files
for conf in $(CONF_FILES); do \
install -m 644 config/$$conf $(DESTDIR)$(DINITDIR); \
install -m 644 config/$$conf $(DESTDIR)$(DINITDIR)/config; \
done
# scripts
for script in $(SCRIPTS); do \
install -m 755 scripts/$$script $(DESTDIR)$(DINITLIBDIR)/scripts; \
install -m 755 scripts/$$script $(DESTDIR)$(DINITDIR)/scripts; \
done
# programs
for prog in $(BIN_PROGRAMS); do \
@ -111,5 +111,5 @@ install:
done
# services
for srv in $(SERVICES); do \
install -m 644 services/$$srv $(DESTDIR)$(DINITLIBDIR); \
install -m 644 services/$$srv $(DESTDIR)$(DINITDIR); \
done

@ -1,6 +1,6 @@
#!/bin/sh
[ -r /etc/dinit.d/cgroups.conf ] && . /etc/dinit.d/cgroups.conf
[ -r /etc/dinit.d/config/cgroups.conf ] && . /etc/dinit.d/config/cgroups.conf
CGROUP_OPTS=nodev,noexec,nosuid
@ -25,7 +25,7 @@ cgroup1_base() {
if ! mountpoint -q /sys/fs/cgroup/openrc; then
local agent
agent="/usr/lib/dinit.d/scripts/cgroup-release-agent.sh"
agent="/etc/dinit.d/scripts/cgroup-release-agent.sh"
mkdir /sys/fs/cgroup/openrc
mount -n -t cgroup -o none,${CGROUP_OPTS},name=openrc,release_agent="$agent" openrc /sys/fs/cgroup/openrc
printf 1 > /sys/fs/cgroup/openrc/notify_on_release

@ -1,5 +1,5 @@
#!/bin/sh
. /etc/dinit.d/hwclock.conf
. /etc/dinit.d/config/hwclock.conf
HARDWARECLOCK=${HARDWARECLOCK:-UTC}

@ -1,4 +1,4 @@
type = scripted
command = /usr/lib/dinit.d/scripts/binfmt
command = /etc/dinit.d/scripts/binfmt
depends-on = pseudofs
restart = false

@ -1,4 +1,4 @@
type = scripted
command = /usr/lib/dinit.d/scripts/cgroups
command = /etc/dinit.d/scripts/cgroups
restart = false
depends-on = pseudofs

@ -1,4 +1,4 @@
type = scripted
command = /usr/lib/dinit.d/scripts/cleanup
command = /etc/dinit.d/scripts/cleanup
restart = false
waits-for = fsck

@ -1,4 +1,4 @@
type = scripted
command = /usr/lib/dinit.d/scripts/dmesg
command = /etc/dinit.d/scripts/dmesg
restart = false
waits-for = loginready

@ -1,4 +1,4 @@
type = scripted
command = /usr/lib/dinit.d/scripts/hostname
command = /etc/dinit.d/scripts/hostname
restart = false
waits-for = pseudofs

@ -1,5 +1,5 @@
type = scripted
command = /usr/lib/dinit.d/scripts/hwclock
command = /etc/dinit.d/scripts/hwclock
logfile = /run/hwclock.log
restart = false
depends-on = udevd

@ -1,5 +1,5 @@
type = scripted
command = /usr/lib/dinit.d/scripts/network
command = /etc/dinit.d/scripts/network
restart = false
waits-for = pseudofs
waits-for = net-lo

@ -1,4 +1,4 @@
type = scripted
command = /usr/lib/dinit.d/scripts/pseudofs
command = /etc/dinit.d/scripts/pseudofs
restart = false
options = starts-rwfs

@ -1,6 +1,6 @@
type = scripted
command = /usr/lib/dinit.d/scripts/random-seed load
stop-command = /usr/lib/dinit.d/scripts/random-seed save
command = /etc/dinit.d/scripts/random-seed load
stop-command = /etc/dinit.d/scripts/random-seed save
restart = false
waits-for = pseudofs
waits-for = udev-settle

@ -1,4 +1,4 @@
type = scripted
command = /bin/sh /etc/dinit.d/rc.local
stop-command = /bin/sh /etc/dinit.d/rc.shutdown
command = /bin/sh /etc/dinit.d/config/rc.local
stop-command = /bin/sh /etc/dinit.d/config/rc.shutdown
restart = false

@ -1,4 +1,4 @@
type = scripted
command = /usr/lib/dinit.d/scripts/vconsole
command = /etc/dinit.d/scripts/vconsole
restart = false
waits-for = hostname

Loading…
Cancel
Save