host flavor: fix copying for Debian

This makes the host flavor work on Debian for me. Tested with systemd-228-2. Fixes #1809
rkt · Nov 30, 2015 · ec44009 · ec44009
1 parent 306fe5b
commit ec44009
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/stage1/init/init.go b/stage1/init/init.go
@@ -236,7 +236,7 @@ func installAssets() error {
 		return err
 	}
 
-	systemdUnitsPath := "/usr/lib/systemd/system"
+	systemdUnitsPath := "/lib/systemd/system"
 	assets := []string{
 		proj2aci.GetAssetString("/usr/lib/systemd/systemd", systemdBin),
 		proj2aci.GetAssetString("/usr/bin/systemctl", systemctlBin),

diff --git a/stage1/usr_from_host/usr_from_host.mk b/stage1/usr_from_host/usr_from_host.mk
@@ -4,8 +4,15 @@ S1_RF_USR_STAMPS += $(UFH_STAMP)
 
 $(call generate-stamp-rule,$(UFH_STAMP),,$(S1_RF_ACIROOTFSDIR), \
 	$(call vb,v2,LN SF,host $(S1_RF_ACIROOTFSDIR)/flavor) \
-	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
+
+CLEAN_SYMLINKS += $(S1_RF_ACIROOTFSDIR)/flavor $(S1_RF_ACIROOTFSDIR)/lib $(S1_RF_ACIROOTFSDIR)/lib64 $(S1_RF_ACIROOTFSDIR)/usr/lib64
+
+CLEAN_DIRS += $(S1_RF_ACIROOTFSDIR)/usr/lib
 
 $(call undefine-namespaces,UFH)