mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 17:36:59 +02:00
fix(sys-apps/systemd): Fix default.target in /usr instead of /etc
This commit is contained in:
parent
3df2a112de
commit
cf07cc9834
@ -37,7 +37,7 @@ DEPEND="
|
||||
RDEPEND="${DEPEND}
|
||||
sys-block/parted
|
||||
sys-apps/gptfdisk
|
||||
sys-apps/systemd
|
||||
>=sys-apps/systemd-207-r5
|
||||
"
|
||||
|
||||
src_install() {
|
||||
@ -48,9 +48,6 @@ src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
fi
|
||||
|
||||
# Set the default target to multi-user not graphical, this is CoreOS!
|
||||
dosym /usr/lib/systemd/system/multi-user.target /etc/systemd/system/default.target
|
||||
|
||||
systemd_enable_service basic.target coreos-startup.target
|
||||
|
||||
# Services!
|
||||
|
@ -242,11 +242,6 @@ multilib_src_install() {
|
||||
|
||||
emake "${mymakeopts[@]}"
|
||||
fi
|
||||
|
||||
rmdir ${D}/etc/binfmt.d
|
||||
rmdir ${D}/etc/sysctl.d
|
||||
rmdir ${D}/etc/tmpfiles.d
|
||||
rmdir ${D}/etc/modules-load.d
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
@ -262,6 +257,13 @@ multilib_src_install_all() {
|
||||
|
||||
# Preserve empty dir /var, bug #437008
|
||||
keepdir /var/lib/systemd
|
||||
|
||||
# Keep /etc clean
|
||||
rmdir "${D}"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d || die
|
||||
|
||||
# Don't default to graphical.target
|
||||
rm "${D}"/usr/lib/systemd/system/default.target || die
|
||||
dosym multi-user.target /usr/lib/systemd/system/default.target
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
@ -321,11 +321,6 @@ multilib_src_install() {
|
||||
local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
|
||||
emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
|
||||
pkgconfiglib_DATA="${pcfiles[*]}"
|
||||
|
||||
rmdir ${D}/etc/binfmt.d
|
||||
rmdir ${D}/etc/sysctl.d
|
||||
rmdir ${D}/etc/tmpfiles.d
|
||||
rmdir ${D}/etc/modules-load.d
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
@ -342,6 +337,13 @@ multilib_src_install_all() {
|
||||
|
||||
# Preserve empty dir /var, bug #437008
|
||||
keepdir /var/lib/systemd
|
||||
|
||||
# Keep /etc clean
|
||||
rmdir "${D}"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d || die
|
||||
|
||||
# Don't default to graphical.target
|
||||
rm "${D}"/usr/lib/systemd/system/default.target || die
|
||||
dosym multi-user.target /usr/lib/systemd/system/default.target
|
||||
}
|
||||
|
||||
migrate_locale() {
|
||||
|
@ -328,11 +328,6 @@ multilib_src_install() {
|
||||
local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
|
||||
emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
|
||||
pkgconfiglib_DATA="${pcfiles[*]}"
|
||||
|
||||
rmdir ${D}/etc/binfmt.d
|
||||
rmdir ${D}/etc/sysctl.d
|
||||
rmdir ${D}/etc/tmpfiles.d
|
||||
rmdir ${D}/etc/modules-load.d
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
@ -349,6 +344,13 @@ multilib_src_install_all() {
|
||||
|
||||
# Preserve empty dir /var, bug #437008
|
||||
keepdir /var/lib/systemd
|
||||
|
||||
# Keep /etc clean
|
||||
rmdir "${D}"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d || die
|
||||
|
||||
# Don't default to graphical.target
|
||||
rm "${D}"/usr/lib/systemd/system/default.target || die
|
||||
dosym multi-user.target /usr/lib/systemd/system/default.target
|
||||
}
|
||||
|
||||
migrate_locale() {
|
||||
|
Loading…
Reference in New Issue
Block a user