From 7f0df85dc04280340745e7d228bd56b97eb0f8f4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Jun 2014 15:59:28 -0700 Subject: [PATCH] bump(coreos-base/coreos-init): Updates for empty /etc Fix some issues for booting without using tmpfiles to setup the root filesystem in advance. For example this now works reliably: mkdir -p c/etc cp /etc/os-release c/etc ln -s usr/lib64 c/lib ln -s usr/lib64 c/lib64 ln -s usr/bin c/bin ln -s usr/sbin c/sbin systemd-nspawn --directory=c --bind=/usr --boot --- ...-r89.ebuild => coreos-init-0.0.1-r90.ebuild} | 0 .../coreos-init/coreos-init-9999.ebuild | 17 +++-------------- 2 files changed, 3 insertions(+), 14 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r89.ebuild => coreos-init-0.0.1-r90.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r89.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r90.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r89.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r90.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index d035133d5b..810ea418ff 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="96e8537231d4a10aedd1261ecdb9899d879d97c0" + CROS_WORKON_COMMIT="a4c3267c680a46b110533fb3a5e22048ea386218" KEYWORDS="amd64 arm x86" fi @@ -45,18 +45,7 @@ RDEPEND="${DEPEND} src_install() { emake DESTDIR="${D}" install - # Basic system startup - systemd_enable_service local-fs.target remount-root.service - systemd_enable_service local-fs.target media.mount - systemd_enable_service local-fs.target usr-share-oem.mount - systemd_enable_service default.target resize-btrfs.service - systemd_enable_service default.target ldsocache.service - - # Services! - systemd_enable_service default.target sshd-keygen.service - systemd_enable_service default.target sshd.socket - systemd_enable_service default.target ssh-key-proc-cmdline.service + # Enable some sockets that aren't enabled by their own ebuilds. + systemd_enable_service sockets.target sshd.socket systemd_enable_service sockets.target docker.socket - systemd_enable_service default.target issuegen.service - systemd_enable_service default.target motdgen.timer }