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

chore(app-emulation/docker): remove symlink-usr case

Browse Source 
We are never shipping another -generic image so just make symlink-usr
the only .service file.
This commit is contained in:
Brandon Philips 2014-05-16 13:56:52 -07:00
parent 17ef058245
commit da4253ab4c
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -166,11 +166,7 @@ src_install() {
newinitd contrib/init/openrc/docker.initd docker
newconfd contrib/init/openrc/docker.confd docker
if use symlink-usr; then
systemd_dounit "${FILESDIR}/symlink-usr/docker.service"
else
systemd_dounit "${FILESDIR}/docker.service"
fi
systemd_dounit "${FILESDIR}/docker.service"
systemd_dounit "${FILESDIR}/docker.socket"
insinto /usr/lib/systemd/network

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/docker.service vendored
View File

@ -6,7 +6,7 @@ Documentation=http://docs.docker.io
ExecStartPre=/bin/mount --make-rprivate /
# Run docker but don't have docker automatically restart
# containers. This is a job for systemd and unit files.
ExecStart=/usr/bin/docker -d -r=false -H fd://
ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd://
[Install]
WantedBy=multi-user.target

12
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/symlink-usr/docker.service vendored
View File

@ -1,12 +0,0 @@
[Unit]
Description=Docker Application Container Engine
Documentation=http://docs.docker.io
[Service]
ExecStartPre=/bin/mount --make-rprivate /
# Run docker but don't have docker automatically restart
# containers. This is a job for systemd and unit files.
ExecStart=/usr/bin/docker -d -s=btrfs -r=false -H fd://
[Install]
WantedBy=multi-user.target