diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-28 03:00:37 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2017-01-28 03:00:37 -0500 |
commit | a1ab31bc660290b1d054789ad4969701d3b71856 (patch) | |
tree | c431f4798d60aa24f7d2ee95c6bef8db3cf8a913 | |
parent | aab8b529051382be3c9e2f8641ef92568d17ef20 (diff) |
Fix remaining issues with holo integration.
-rwxr-xr-x | drain | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -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 |