Fix remaining issues with holo integration.

1 files changed, 11 insertions, 3 deletions

diff --git a/drain b/drain
index 594fc3b..c201727 100755
--- a/drain
+++ b/drain
@@ -42,7 +42,6 @@ commit() (
 		mkdir -p chroot/etc
 		(cd chroot/etc && etckeeper init -d "$PWD")
 		mv chroot/etc/.git etc.git
-		ln -sr etc.git etc/.git
 	fi
 	rm -rf chroot
 	mkdir chroot
@@ -68,9 +67,18 @@ commit() (
 		bsdtar xpvf "$file" "${dirs[@]#/}"
 	done
 
-	ln -sr ../etc.git etc/.git
+	ln -srT ../etc.git etc/.git
 
-	HOLO_ROOT_DIR=. holo apply
+	if type holo &>/dev/null; then
+		mkdir -p -- run usr/lib
+		ln -sT /usr/lib/holo usr/lib/holo
+		if [ -f /etc/os-release ]; then
+			ln -sT /etc/os-release usr/lib/os-release
+		else
+			ln -sT /usr/lib/os-release usr/lib/os-release
+		fi
+		HOLO_ROOT_DIR=. holo apply
+	fi
 	cd etc/
 	etckeeper update-ignore -d "$PWD"
 	if etckeeper unclean -d "$PWD"; then