mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-04-26 07:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #387 from marineam/etc-cleanup

Browse Source 
Etc cleanup
This commit is contained in:
Michael Marineau 2014-03-04 23:36:20 -08:00
commit 5489ed7518
6 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r39.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r40.ebuild vendored
View File

5
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild vendored
View File

@ -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!

0
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r4.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r6.ebuild vendored
View File

21
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild vendored
View File

@ -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,22 @@ 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
# Move a few services enabled in /etc to /usr
rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die
rmdir "${D}"/etc/systemd/system/getty.target.wants || die
dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target || die
rmdir "${D}"/etc/systemd/system/multi-user.target.wants || die
systemd_enable_service multi-user.target remote-fs.target
}
pkg_postinst() {

24
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild vendored
View File

@ -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,25 @@ 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
# Move a few services enabled in /etc to /usr
rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die
rmdir "${D}"/etc/systemd/system/getty.target.wants || die
dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target \
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service \
|| die
rmdir "${D}"/etc/systemd/system/multi-user.target.wants || die
systemd_enable_service multi-user.target remote-fs.target
systemd_enable_service multi-user.target systemd-networkd.service
}
migrate_locale() {

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

@ -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,25 @@ 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
# Move a few services enabled in /etc to /usr
rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die
rmdir "${D}"/etc/systemd/system/getty.target.wants || die
dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target \
"${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service \
|| die
rmdir "${D}"/etc/systemd/system/multi-user.target.wants || die
systemd_enable_service multi-user.target remote-fs.target
systemd_enable_service multi-user.target systemd-networkd.service
}
migrate_locale() {