From 20911c341f18824545150187adb11d4daa94216d Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@cryptonomic.net>
Date: Fri, 30 Oct 2020 10:34:22 -0400
Subject: Remove or disable references to initrd.sh

The program 'mkinitramfs-samizdat' will replace initrd.sh for now.
---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index c327b76..f460b61 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ SUDO_MAKE = sudo MAKEFLAGS="$$MAKEFLAGS" $(MAKE)
 .PHONY: install-configuration install-bootserver install-boot-server start-bootserver
 install-boot-server: install-bootserver
 install-bootserver: | rootfs/samizdat.btrfs
-	sudo initrd.sh
+	exit 1; sudo initrd.sh
 	$(SUDO_MAKE) instdir=/ real-install-bootserver start-bootserver
 
 start-bootserver:
@@ -162,8 +162,8 @@ $(btrfs_images): FORCE
 	$(MAKE) -C rootfs $(notdir $@)
 
 boot: rootfs
-	sudo initrd.sh
-	sudo SLOW_BOOT=y qemu.sh
+	sudo ./src/mkinitramfs-samizdat
+	sudo ./src/parted-usb.sh
 
 fastboot: rootfs
 	sudo qemu.sh
@@ -171,7 +171,7 @@ fastboot: rootfs
 reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse-child=$$child; true)
 
 samizdat.netinst.iso: | rootfs/samizdat.btrfs
-	sudo initrd.sh
+	exit 1; sudo initrd.sh
 	sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@
 
 reused-child:
@@ -268,7 +268,7 @@ patched.iso: gold.iso rootfs/samizdat.patch.btrfs
 gold.iso: rootfs/seed.iso reused-child
 	sudo grub-efi.sh
 	! grep 'vmlinuz.*nbdroot' -r ${samizdat_grub_efi_dir}
-	initrd.sh
+	exit 1; initrd.sh
 	rm -f $@~tmp
 	cp --reflink $< $@~tmp
 	sudo xorrisofs -iso-level 3 -- \
-- 
cgit v1.2.3