Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/syslinux-iso/Makefile2
-rw-r--r--configs/syslinux-iso/boot-files/pxelinux.cfg/default7
-rw-r--r--configs/syslinux-iso/mkinitcpio.conf2
-rw-r--r--configs/syslinux-iso/packages.i6862
-rw-r--r--configs/syslinux-iso/packages.x86_642
5 files changed, 14 insertions, 1 deletions
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile
index 04c2de1..3258b81 100644
--- a/configs/syslinux-iso/Makefile
+++ b/configs/syslinux-iso/Makefile
@@ -43,6 +43,8 @@ bootfiles: root-image
cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/isolinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/isolinux/
+ cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/
+ sed -i "s|XXX|$(LABEL)|g" $(WORKDIR)/iso/boot/pxelinux.cfg/default
# Rules for initcpio images
diff --git a/configs/syslinux-iso/boot-files/pxelinux.cfg/default b/configs/syslinux-iso/boot-files/pxelinux.cfg/default
new file mode 100644
index 0000000..cba1386
--- /dev/null
+++ b/configs/syslinux-iso/boot-files/pxelinux.cfg/default
@@ -0,0 +1,7 @@
+PROMPT 1
+DEFAULT arch
+
+LABEL arch
+KERNEL vmlinuz26
+APPEND initrd=archiso.img archisolabel=XXX
+IPAPPEND 1
diff --git a/configs/syslinux-iso/mkinitcpio.conf b/configs/syslinux-iso/mkinitcpio.conf
index 581385d..3ff159b 100644
--- a/configs/syslinux-iso/mkinitcpio.conf
+++ b/configs/syslinux-iso/mkinitcpio.conf
@@ -2,5 +2,5 @@
MODULES=""
BINARIES=""
FILES=""
-HOOKS="base udev archiso pata scsi sata usb fw pcmcia filesystems usbinput"
+HOOKS="base udev nbd archiso pata scsi sata usb fw pcmcia filesystems usbinput"
COMPRESSION="lzma"
diff --git a/configs/syslinux-iso/packages.i686 b/configs/syslinux-iso/packages.i686
index dccc17e..b837117 100644
--- a/configs/syslinux-iso/packages.i686
+++ b/configs/syslinux-iso/packages.i686
@@ -5,6 +5,7 @@ b43-fwcutter
base
ddrescue
dmraid
+dnsmasq
dnsutils
dosfstools
elinks
@@ -20,6 +21,7 @@ joe
lftp
lilo
memtest86+
+nbd
ndiswrapper
ndiswrapper-utils
nfs-utils
diff --git a/configs/syslinux-iso/packages.x86_64 b/configs/syslinux-iso/packages.x86_64
index dccc17e..b837117 100644
--- a/configs/syslinux-iso/packages.x86_64
+++ b/configs/syslinux-iso/packages.x86_64
@@ -5,6 +5,7 @@ b43-fwcutter
base
ddrescue
dmraid
+dnsmasq
dnsutils
dosfstools
elinks
@@ -20,6 +21,7 @@ joe
lftp
lilo
memtest86+
+nbd
ndiswrapper
ndiswrapper-utils
nfs-utils