diff options
author | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
---|---|---|
committer | CyberLeo <cyberleo@cyberleo.net> | 2020-03-28 05:45:52 -0500 |
commit | 9297468fa579836e3a6a381b798feb6b78217c2d (patch) | |
tree | 53168212f427afbcf0693b534530a4af803152e9 /system/openrc | |
parent | a63cc05c53a6f4c22422dc8c69808b14d87a6f6e (diff) | |
parent | da5a69b65a8791fffa6e93366ee585f87eff136d (diff) | |
download | packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.gz packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.bz2 packages-9297468fa579836e3a6a381b798feb6b78217c2d.tar.xz packages-9297468fa579836e3a6a381b798feb6b78217c2d.zip |
Merge branch 'master' into zfs
Diffstat (limited to 'system/openrc')
-rw-r--r-- | system/openrc/APKBUILD | 3 | ||||
-rw-r--r-- | system/openrc/openrc.post-install | 32 |
2 files changed, 2 insertions, 33 deletions
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD index 6c41d9f99..2b1c5f520 100644 --- a/system/openrc/APKBUILD +++ b/system/openrc/APKBUILD @@ -38,18 +38,15 @@ prepare() { } build() { - cd "$builddir" export BRANDING="Adélie Linux" make LIBEXECDIR=/lib/rc MKNET=no } check() { - cd "$builddir" make check } package() { - cd "$builddir" make LIBEXECDIR=/lib/rc DESTDIR="$pkgdir/" install # we cannot have anything turned on by default diff --git a/system/openrc/openrc.post-install b/system/openrc/openrc.post-install index 1057eed41..0f6572ef7 100644 --- a/system/openrc/openrc.post-install +++ b/system/openrc/openrc.post-install @@ -1,36 +1,8 @@ #!/bin/sh -rc_update() { - local svc="$1" - local level="$2" - mkdir -p /etc/runlevels/$level - ln -sf /etc/init.d/$svc /etc/runlevels/$level -} - -if [ ! -d etc/rcS.d ] && [ ! -d etc/rcL.d ]; then +if [ -d /etc/runlevels ]; then exit 0 fi -for i in etc/rc[SL].d/*; do - [ -L "$i" ] || continue - oldsvc=${i##*/S[0-9][0-9]} - # some services are renamed - case "$oldsvc" in - modutils) svc=modules;; - procps) svc=sysctl;; - bootmisc.sh) svc=bootmisc;; - keymap) svc=keymaps;; - rc.local) svc=local;; - *) svc=$oldsvc;; - esac - - # add the service to correct "runlevel" - case "$svc" in - hwclock|modules|sysctl|hostname|keymaps|syslog|bootmisc) - rc_update $svc boot;; - *) rc_update $svc default;; - esac - - rm $i -done +cp -PRr /usr/share/openrc/runlevels /etc/ |