repository

Carbs Linux repositories
git clone git://git.carbslinux.org/repository
Log | Files | Refs | README | LICENSE

commit 6dbf04260e2a63e9b3f7241ca2e8a64113a28e3d
parent a936d2c266e21cabe0859318a9a2271fd1856975
Author: Cem Keylan <cem@ckyln.com>
Date:   Mon, 30 Mar 2020 14:05:27 +0300

meta: install sysmgr services as well as runit services

Diffstat:
Mcore/busybox/build | 15++++++---------
Mcore/dhcpcd/build | 5++++-
Mcore/eudev/build | 3+++
Mextra/acpid/build | 4++++
Mextra/openssh/build | 7+++++--
Mextra/scron/build | 4++++
6 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/core/busybox/build b/core/busybox/build @@ -31,15 +31,12 @@ done # Set suid on busybox suid. chmod u+s "$1/usr/bin/busybox-suid" -# Install runit services -install -Dm755 crond.run "$1/etc/sv/crond/run" -install -Dm755 ntpd.run "$1/etc/sv/ntpd/run" -install -Dm755 syslogd.run "$1/etc/sv/syslogd/run" -install -Dm755 acpid.run "$1/etc/sv/acpid/run" -ln -s /run/runit/supervise.crond "$1/etc/sv/crond/supervise" -ln -s /run/runit/supervise.ntpd "$1/etc/sv/ntpd/supervise" -ln -s /run/runit/supervise.syslogd "$1/etc/sv/syslogd/supervise" -ln -s /run/runit/supervise.acpid "$1/etc/sv/acpid/supervise" +# Install runit and sysmgr services +for service in crond.run ntpd.run syslogd.run acpid.run ; do + install -Dm755 "$service" "$1/etc/sv/${service%.*}/run" + install -Dm755 "$service" "$1/etc/sysmgr/${service%.*}" + ln -s /run/runit/supervise.${service%.*} "$1/etc/sv/${service%.*}/supervise" +done # Install ntp config install -Dm644 ntp.conf "$1/etc/ntp.conf" diff --git a/core/dhcpcd/build b/core/dhcpcd/build @@ -10,5 +10,8 @@ make make DESTDIR="$1" install # Install runit service. -install -Dm 755 dhcpcd.run "$1/etc/sv/dhcpcd/run" +install -Dm755 dhcpcd.run "$1/etc/sv/dhcpcd/run" ln -s /run/runit/supervise.dhcpcd "$1/etc/sv/dhcpcd/supervise" + +# Install runit service. +install -Dm755 dhcpcd.run "$1/etc/sysmgr/dhcpcd" diff --git a/core/eudev/build b/core/eudev/build @@ -13,3 +13,6 @@ make DESTDIR="$1" install # Install runit service. install -Dm755 udevd.run "$1/etc/sv/udevd/run" ln -s /run/runit/supervise.udevd "$1/etc/sv/udevd/supervise" + +# Install sysmgr service. +install -Dm755 udevd.run "$1/etc/sysmgr/udevd" diff --git a/extra/acpid/build b/extra/acpid/build @@ -6,5 +6,9 @@ make make DESTDIR="$1" install mkdir -p "$1/etc/acpi/events" +# Install runit service. install -Dm755 run "$1/etc/sv/acpid/run" ln -s /run/runit/supervise.acpid "$1/etc/sv/acpid/supervise" + +# Install sysmgr service. +install -Dm755 run "$1/etc/sysmgr/acpid" diff --git a/extra/openssh/build b/extra/openssh/build @@ -21,6 +21,9 @@ make DESTDIR="$1" install install -m 755 contrib/ssh-copy-id "$1/usr/bin/ssh-copy-id" install -m 644 contrib/ssh-copy-id.1 "$1/usr/share/man/man8/ssh-copy-id.1" -# Install runit services. -install -Dm 755 sshd.run "$1/etc/sv/sshd/run" +# Install runit service. +install -Dm755 sshd.run "$1/etc/sv/sshd/run" ln -s /run/runit/supervise.sshd "$1/etc/sv/sshd/supervise" + +# Install sysmgr service. +install -Dm755 sshd.run "$1/etc/sysmgr/sshd" diff --git a/extra/scron/build b/extra/scron/build @@ -6,3 +6,7 @@ make PREFIX="$1/usr" MANPREFIX="$1/usr/share/man" install # Install runit service install -Dm755 scron.run "$1/etc/sv/scron/run" +ln -sv /run/runit/supervise.scron "$1/etc/sv/scron/supervise" + +# Install sysmgr service +install -Dm755 scron.run "$1/etc/sysmgr/scron"