summaryrefslogtreecommitdiff
path: root/hooks/build-os-post
diff options
context:
space:
mode:
Diffstat (limited to 'hooks/build-os-post')
-rwxr-xr-xhooks/build-os-post/40-ostree-demo-scripts1
-rwxr-xr-xhooks/build-os-post/90-ostree-path-mangles6
2 files changed, 4 insertions, 3 deletions
diff --git a/hooks/build-os-post/40-ostree-demo-scripts b/hooks/build-os-post/40-ostree-demo-scripts
index 6ea5627..cb8d693 100755
--- a/hooks/build-os-post/40-ostree-demo-scripts
+++ b/hooks/build-os-post/40-ostree-demo-scripts
@@ -2,6 +2,7 @@
set -o pipefail
+#TODO: package this stuff in .debs and put in a reprepro
cat > "${root:?}"/usr/sbin/halo-upgrade << EOF
#!/bin/bash -e
diff --git a/hooks/build-os-post/90-ostree-path-mangles b/hooks/build-os-post/90-ostree-path-mangles
index b2709f3..8a478b8 100755
--- a/hooks/build-os-post/90-ostree-path-mangles
+++ b/hooks/build-os-post/90-ostree-path-mangles
@@ -1,8 +1,8 @@
#!/bin/bash -xe
set -o pipefail
-# remove everything from dev and var
-rm -rf "${root:?}"/dev/* "${root:?}"/var/*
+# remove everything from dev
+rm -rvf "${root:?}"/dev/*
# add sysroot mountpoint and ostree link to root
mkdir -p "${root:?}"/sysroot
@@ -32,7 +32,7 @@ EOF
# move /etc to /usr/etc
mv "${root:?}"/etc "${root:?}"/usr/etc
-mkdir "${root:?}"/etc # do we need this?
+mkdir "${root:?}"/etc #TODO: do we need this?
# link persistent directories to /var
for dir in home opt srv mnt tmp; do