summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-05-31 20:30:03 -0400
committerAndrew Cady <d@jerkface.net>2020-05-31 20:30:03 -0400
commitcede3f14a47999fc54fb6bcec1749e6da82bc4b0 (patch)
tree242affe9162559a925bf788c0498951d0c116e72
parentcac7813c7dfad18b14945f7078ec135c6535a621 (diff)
move file into rootfs/
-rw-r--r--Makefile4
-rwxr-xr-xrootfs/patchroot.sh (renamed from patchroot.sh)0
-rw-r--r--rootfs/samiztest.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cf700ee..65733be 100644
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,7 @@ apt-get-update-stamp: FORCE
222 @if $(stale); then set -x; sudo apt-get update && touch $@; fi 222 @if $(stale); then set -x; sudo apt-get update && touch $@; fi
223 223
224rootfs/samizdat.patch.btrfs: rootfs/samizdat.seed.btrfs \ 224rootfs/samizdat.patch.btrfs: rootfs/samizdat.seed.btrfs \
225 $(if $(INTERACTIVE_CHROOT),FORCE,patchroot.sh) 225 $(if $(INTERACTIVE_CHROOT),FORCE,rootfs/patchroot.sh)
226ifneq ($(shell id -u),0) 226ifneq ($(shell id -u),0)
227 $(SUDO_MAKE) $@ 227 $(SUDO_MAKE) $@
228else 228else
@@ -241,7 +241,7 @@ else
241ifdef INTERACTIVE_CHROOT 241ifdef INTERACTIVE_CHROOT
242 chroot $@.mnt bash -i 242 chroot $@.mnt bash -i
243else 243else
244 chroot $@.mnt sh < patchroot.sh 244 chroot $@.mnt sh < rootfs/patchroot.sh
245endif 245endif
246 umount $@.mnt 246 umount $@.mnt
247 losetup -f $< 247 losetup -f $<
diff --git a/patchroot.sh b/rootfs/patchroot.sh
index 76eb26a..76eb26a 100755
--- a/patchroot.sh
+++ b/rootfs/patchroot.sh
diff --git a/rootfs/samiztest.yaml b/rootfs/samiztest.yaml
index 4fcaa9f..42ca627 100644
--- a/rootfs/samiztest.yaml
+++ b/rootfs/samiztest.yaml
@@ -1,6 +1,6 @@
1parent: samizdat 1parent: samizdat
2binaries: 2binaries:
3- '../patchroot.sh' 3- './patchroot.sh'
4seedme: 600000000 4seedme: 600000000
5apt-update: true 5apt-update: true
6 6