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

Merge pull request #550 from marineam/systemd

Browse Source 
Minor systemd fixes
This commit is contained in:
Michael Marineau 2014-04-16 16:24:10 -07:00
commit 0bcf42792f
5 changed files with 10 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/gentoo-run.conf vendored
View File

@ -1,5 +0,0 @@
# New OpenRC versions replace /var/lock with a symlink to /run/lock.
# We just create that directory for now, just in case.
# Of course, it's not guaranteed that'll satisfy all relevant packages.
d /run/lock 0755 root root -

9
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-coreos.conf vendored Normal file
View File

@ -0,0 +1,9 @@
d /etc/binfmt.d - - - - -
d /etc/modules-load.d - - - - -
d /etc/sysctl.d - - - - -
d /etc/systemd - - - - -
d /etc/systemd/network - - - - -
d /etc/systemd/system - - - - -
d /etc/systemd/user - - - - -
d /etc/tmpfiles.d - - - - -
d /var/lib/systemd - - - - -

19
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-lock.mount vendored
View File

@ -1,19 +0,0 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
[Unit]
Description=Lock Directory
Before=local-fs.target
# skip mounting if the directory does not exist or is a symlink
ConditionPathIsDirectory=/var/lock
ConditionPathIsSymbolicLink=!/var/lock
[Mount]
What=/run/lock
Where=/var/lock
Type=bind
Options=bind

19
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/var-run.mount vendored
View File

@ -1,19 +0,0 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
[Unit]
Description=Runtime Directory
Before=local-fs.target
# skip mounting if the directory does not exist or is a symlink
ConditionPathIsDirectory=/var/run
ConditionPathIsSymbolicLink=!/var/run
[Mount]
What=/run
Where=/var/run
Type=bind
Options=bind

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

@ -350,11 +350,7 @@ multilib_src_install_all() {
# Disable storing coredumps in journald, bug #433457
mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
# Preserve empty dir /var, bug #437008
keepdir /var/lib/systemd
# Keep /etc clean
rmdir "${D}"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d || die
systemd_dotmpfilesd "${FILESDIR}"/systemd-coreos.conf
# Don't default to graphical.target
rm "${D}"/usr/lib/systemd/system/default.target || die