summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndrew Cady <d@cryptonomic.net>2020-10-30 10:34:22 -0400
committerAndrew Cady <d@cryptonomic.net>2020-10-30 10:34:22 -0400
commit20911c341f18824545150187adb11d4daa94216d (patch)
treea785aa1c3c4b7e1370f3c807c7a295352370cfd5 /Makefile
parent3287df49902a7a99bf050cb95344096012896ff4 (diff)
Remove or disable references to initrd.sh
The program 'mkinitramfs-samizdat' will replace initrd.sh for now.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c327b76..f460b61 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ SUDO_MAKE = sudo MAKEFLAGS="$$MAKEFLAGS" $(MAKE)
92.PHONY: install-configuration install-bootserver install-boot-server start-bootserver 92.PHONY: install-configuration install-bootserver install-boot-server start-bootserver
93install-boot-server: install-bootserver 93install-boot-server: install-bootserver
94install-bootserver: | rootfs/samizdat.btrfs 94install-bootserver: | rootfs/samizdat.btrfs
95 sudo initrd.sh 95 exit 1; sudo initrd.sh
96 $(SUDO_MAKE) instdir=/ real-install-bootserver start-bootserver 96 $(SUDO_MAKE) instdir=/ real-install-bootserver start-bootserver
97 97
98start-bootserver: 98start-bootserver:
@@ -162,8 +162,8 @@ $(btrfs_images): FORCE
162 $(MAKE) -C rootfs $(notdir $@) 162 $(MAKE) -C rootfs $(notdir $@)
163 163
164boot: rootfs 164boot: rootfs
165 sudo initrd.sh 165 sudo ./src/mkinitramfs-samizdat
166 sudo SLOW_BOOT=y qemu.sh 166 sudo ./src/parted-usb.sh
167 167
168fastboot: rootfs 168fastboot: rootfs
169 sudo qemu.sh 169 sudo qemu.sh
@@ -171,7 +171,7 @@ fastboot: rootfs
171reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse-child=$$child; true) 171reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse-child=$$child; true)
172 172
173samizdat.netinst.iso: | rootfs/samizdat.btrfs 173samizdat.netinst.iso: | rootfs/samizdat.btrfs
174 sudo initrd.sh 174 exit 1; sudo initrd.sh
175 sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@ 175 sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@
176 176
177reused-child: 177reused-child:
@@ -268,7 +268,7 @@ patched.iso: gold.iso rootfs/samizdat.patch.btrfs
268gold.iso: rootfs/seed.iso reused-child 268gold.iso: rootfs/seed.iso reused-child
269 sudo grub-efi.sh 269 sudo grub-efi.sh
270 ! grep 'vmlinuz.*nbdroot' -r ${samizdat_grub_efi_dir} 270 ! grep 'vmlinuz.*nbdroot' -r ${samizdat_grub_efi_dir}
271 initrd.sh 271 exit 1; initrd.sh
272 rm -f $@~tmp 272 rm -f $@~tmp
273 cp --reflink $< $@~tmp 273 cp --reflink $< $@~tmp
274 sudo xorrisofs -iso-level 3 -- \ 274 sudo xorrisofs -iso-level 3 -- \