Merge pull request #3439 from lucab/to-upstream/app-smoke-test

stage1: ensure systemd-tmpfiles is available in pod
rkt · Dec 2, 2016 · f5e1238 · f5e1238
2 parents 002b0f2 + 883f51a
commit f5e1238
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/stage1/init/init.go b/stage1/init/init.go
@@ -193,6 +193,10 @@ func installAssets() error {
 	if err != nil {
 		return err
 	}
+	systemdTmpfilesBin, err := common.LookupPath("systemd-tmpfiles", os.Getenv("PATH"))
+	if err != nil {
+		return err
+	}
 	bashBin, err := common.LookupPath("bash", os.Getenv("PATH"))
 	if err != nil {
 		return err
@@ -226,6 +230,7 @@ func installAssets() error {
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd", systemdBin),
 		proj2aci.GetAssetString("/usr/bin/systemctl", systemctlBin),
 		proj2aci.GetAssetString("/usr/bin/systemd-sysusers", systemdSysusersBin),
+		proj2aci.GetAssetString("/usr/bin/systemd-tmpfiles", systemdTmpfilesBin),
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd-journald", systemdJournaldBin),
 		proj2aci.GetAssetString("/usr/bin/bash", bashBin),
 		proj2aci.GetAssetString("/bin/mount", mountBin),

diff --git a/stage1/usr_from_host/usr_from_host.mk b/stage1/usr_from_host/usr_from_host.mk
@@ -3,15 +3,21 @@ $(call setup-stamp-file,UFH_STAMP)
 S1_RF_USR_STAMPS += $(UFH_STAMP)
 
 $(call generate-stamp-rule,$(UFH_STAMP),,$(S1_RF_ACIROOTFSDIR), \
+	$(call vb,v2,LN SF,usr/bin $(S1_RF_ACIROOTFSDIR)/bin) \
+	ln -sf usr/bin "$(S1_RF_ACIROOTFSDIR)/bin" && \
 	$(call vb,v2,LN SF,host $(S1_RF_ACIROOTFSDIR)/flavor) \
 	ln -sf 'host' "$(S1_RF_ACIROOTFSDIR)/flavor" && \
 	mkdir -p "$(S1_RF_ACIROOTFSDIR)/usr/lib" && \
 	ln -sf usr/lib "$(S1_RF_ACIROOTFSDIR)/lib" && \
 	ln -sf usr/lib "$(S1_RF_ACIROOTFSDIR)/lib64"&& \
 	ln -sf lib "$(S1_RF_ACIROOTFSDIR)/usr/lib64")
 
-
-CLEAN_SYMLINKS += $(S1_RF_ACIROOTFSDIR)/flavor $(S1_RF_ACIROOTFSDIR)/lib $(S1_RF_ACIROOTFSDIR)/lib64 $(S1_RF_ACIROOTFSDIR)/usr/lib64
+CLEAN_SYMLINKS += \
+	$(S1_RF_ACIROOTFSDIR)/bin \
+	$(S1_RF_ACIROOTFSDIR)/flavor \
+	$(S1_RF_ACIROOTFSDIR)/lib \
+	$(S1_RF_ACIROOTFSDIR)/lib64 \
+	$(S1_RF_ACIROOTFSDIR)/usr/lib64
 
 CLEAN_DIRS += $(S1_RF_ACIROOTFSDIR)/usr/lib
 

diff --git a/stage1/usr_from_src/usr_from_src.mk b/stage1/usr_from_src/usr_from_src.mk
@@ -126,6 +126,8 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 	$(call vb,v2,CONFIGURE,systemd) \
 	"$(abspath $(UFS_SYSTEMD_SRCDIR))/configure" \
 		$(call vl3,--quiet) \
+		--enable-seccomp \
+		--enable-tmpfiles \
 		--disable-dbus \
 		--disable-kmod \
 		--disable-blkid \
@@ -142,7 +144,6 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 		--disable-binfmt \
 		--disable-vconsole \
 		--disable-quotacheck \
-		--disable-tmpfiles \
 		--disable-randomseed \
 		--disable-backlight \
 		--disable-rfkill \
@@ -163,8 +164,7 @@ $(call generate-stamp-rule,$(UFS_SYSTEMD_BUILD_STAMP),$(UFS_SYSTEMD_CLONE_AND_PA
 		--disable-hibernate \
 		--disable-hwdb \
 		--disable-importd \
-		--disable-firstboot \
-		--enable-seccomp; \
+		--disable-firstboot; \
 	popd $(call vl3,>/dev/null); \
 	$(call vb,v2,BUILD EXT,systemd) \
 	$$(MAKE) -C "$(UFS_SYSTEMD_BUILDDIR)" all V=0 $(call vl2,>/dev/null))