diff options
-rw-r--r-- | Makefile | 4 | ||||
-rwxr-xr-x | rootfs/patchroot.sh (renamed from patchroot.sh) | 0 | ||||
-rw-r--r-- | rootfs/samiztest.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 | ||
224 | rootfs/samizdat.patch.btrfs: rootfs/samizdat.seed.btrfs \ | 224 | rootfs/samizdat.patch.btrfs: rootfs/samizdat.seed.btrfs \ |
225 | $(if $(INTERACTIVE_CHROOT),FORCE,patchroot.sh) | 225 | $(if $(INTERACTIVE_CHROOT),FORCE,rootfs/patchroot.sh) |
226 | ifneq ($(shell id -u),0) | 226 | ifneq ($(shell id -u),0) |
227 | $(SUDO_MAKE) $@ | 227 | $(SUDO_MAKE) $@ |
228 | else | 228 | else |
@@ -241,7 +241,7 @@ else | |||
241 | ifdef INTERACTIVE_CHROOT | 241 | ifdef INTERACTIVE_CHROOT |
242 | chroot $@.mnt bash -i | 242 | chroot $@.mnt bash -i |
243 | else | 243 | else |
244 | chroot $@.mnt sh < patchroot.sh | 244 | chroot $@.mnt sh < rootfs/patchroot.sh |
245 | endif | 245 | endif |
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 @@ | |||
1 | parent: samizdat | 1 | parent: samizdat |
2 | binaries: | 2 | binaries: |
3 | - '../patchroot.sh' | 3 | - './patchroot.sh' |
4 | seedme: 600000000 | 4 | seedme: 600000000 |
5 | apt-update: true | 5 | apt-update: true |
6 | 6 | ||