From eeaa514c2291f716ce168bbeccb24f5873b56527 Mon Sep 17 00:00:00 2001 From: torben Date: Thu, 26 Nov 2015 20:12:49 +0100 Subject: Sync. --- dev-tools/virtualBoxTFTPRoot/.gitignore | 2 +- dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'dev-tools') diff --git a/dev-tools/virtualBoxTFTPRoot/.gitignore b/dev-tools/virtualBoxTFTPRoot/.gitignore index 22535dbd..1a6307a5 100644 --- a/dev-tools/virtualBoxTFTPRoot/.gitignore +++ b/dev-tools/virtualBoxTFTPRoot/.gitignore @@ -1,2 +1,2 @@ *.img -vmlinuz-linux +*vmlinuz-linux diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 6d01d549..36bc382e 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -7,13 +7,14 @@ MENU TITLE My PXE Boot Menu LABEL arch MENU LABEL ^arch network boot -KERNEL /vmlinuz-linux -APPEND initrd=/initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=archLinux/ vga=current +KERNEL /archLinux-vmlinuz-linux +APPEND initrd=/archLinux-initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=archLinux/ vga=current LABEL ubuntu MENU LABEL ^ubuntu network boot -KERNEL /vmlinuz-linux -APPEND initrd=/initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=ubuntu/ vga=current +KERNEL /ubuntu-vmlinuz-linux +APPEND initrd=/ubuntu-initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 net.ifnames=1 slxsrv=10.0.2.2:80,10.0.2.2:8080,10.0.2.2:8008,10.0.2.2:8090,10.0.2.2:8280,10.0.2.2:8888 slxbase=ubuntu/ vga=current +# TODO vconsole.font=latarcyrheb-sun16 LABEL BootNormal MENU LABEL ^Boot Normal (HDD) -- cgit v1.2.3-55-g7522