mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-20 22:11:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1037 from marineam/systemd

Browse Source 
systemd: copy symlink-usr handling from old systemd-sysv-utils ebuild
This commit is contained in:
Michael Marineau 2015-01-01 11:34:49 -08:00
commit 8c92e641dd
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r1.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-218-r2.ebuild vendored
View File

@ -38,8 +38,8 @@ IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
selinux ssl sysv-utils terminal test vanilla xkb" selinux ssl sysv-utils terminal test vanilla xkb"
# Gentoo removed this use flag, we'll keep it for now # Gentoo removed the nls use flag, we'll keep it for now
IUSE+=" nls" IUSE+=" nls symlink-usr"
MINKV="3.8" MINKV="3.8"
@ -372,10 +372,12 @@ multilib_src_install_all() {
einstalldocs einstalldocs
if use sysv-utils; then if use sysv-utils; then
local prefix
use symlink-usr && prefix=/usr
for app in halt poweroff reboot runlevel shutdown telinit; do for app in halt poweroff reboot runlevel shutdown telinit; do
dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} dosym /usr/bin/systemctl ${prefix}/sbin/${app}
done done
dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init dosym /usr/lib/systemd/systemd ${prefix}/sbin/init
else else
# we just keep sysvinit tools, so no need for the mans # we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \

10
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -38,8 +38,8 @@ IUSE="acl apparmor audit cryptsetup curl doc elfutils gcrypt gudev http
idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp
selinux ssl sysv-utils terminal test vanilla xkb" selinux ssl sysv-utils terminal test vanilla xkb"
# Gentoo removed this use flag, we'll keep it for now # Gentoo removed the nls use flag, we'll keep it for now
IUSE+=" nls" IUSE+=" nls symlink-usr"
MINKV="3.8" MINKV="3.8"
@ -368,10 +368,12 @@ multilib_src_install_all() {
einstalldocs einstalldocs
if use sysv-utils; then if use sysv-utils; then
local prefix
use symlink-usr && prefix=/usr
for app in halt poweroff reboot runlevel shutdown telinit; do for app in halt poweroff reboot runlevel shutdown telinit; do
dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} dosym /usr/bin/systemctl ${prefix}/sbin/${app}
done done
dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init dosym /usr/lib/systemd/systemd ${prefix}/sbin/init
else else
# we just keep sysvinit tools, so no need for the mans # we just keep sysvinit tools, so no need for the mans
rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \