Modified all references from old ftp-iso/-img to netinstall.
This will fix FeatureRequest FS#14587
Signed-off-by: Gerhard Brauer
---
configs/install-iso/Makefile | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 63f7935..8cd05d0 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -7,15 +7,15 @@ ARCH?=`uname -m`
BOOTLOADER?=grub-gfx
PWD:=`pwd`
-FTPname:=$(PWD)/archlinux-$(ver)-ftp-$(ARCH)
+NETname:=$(PWD)/archlinux-$(ver)-netinstall-$(ARCH)
COREname:=$(PWD)/archlinux-$(ver)-core-$(ARCH)
PACKAGES="`cat packages.list` $(BOOTLOADER)"
-all: ftp-iso ftp-usb core-iso core-usb
-all-iso: ftp-iso core-iso
-all-usb: ftp-usb core-usb
-all-ftp: ftp-iso ftp-usb
+all: net-iso net-usb core-iso core-usb
+all-iso: net-iso core-iso
+all-usb: net-usb core-usb
+all-net: net-iso net-usb
all-core: core-iso core-usb
core-usb: core-pkgs overlay $(BOOTLOADER)
@@ -24,11 +24,11 @@ core-usb: core-pkgs overlay $(BOOTLOADER)
core-iso: core-pkgs overlay $(BOOTLOADER)
mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(COREname).iso
-ftp-usb: overlay $(BOOTLOADER)
- mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) usb $(WORKDIR) $(FTPname).img
+net-usb: overlay $(BOOTLOADER)
+ mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) usb $(WORKDIR) $(NETname).img
-ftp-iso: overlay $(BOOTLOADER)
- mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(FTPname).iso
+net-iso: overlay $(BOOTLOADER)
+ mkarchiso -L "ARCHISO-${ver}" -f -p $(BOOTLOADER) iso $(WORKDIR) $(NETname).iso
overlay: base-iso
cp -r overlay $(WORKDIR)/
@@ -61,4 +61,4 @@ syslinux:
cp -r $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux
clean:
- rm -rf $(WORKDIR) *.img.part1 $(FTPname).img $(FTPname).iso $(COREname).img $(COREname).iso
+ rm -rf $(WORKDIR) *.img.part1 $(NETname).img $(NETname).iso $(COREname).img $(COREname).iso
--
1.6.3.3