diff options
| author | jandob | 2015-11-20 18:55:01 +0100 |
|---|---|---|
| committer | jandob | 2015-11-20 18:55:01 +0100 |
| commit | 5f2520f389d39241aefa8ec3055f0b81b6bda100 (patch) | |
| tree | a393562f94694dba0bf4063638e2850c721271ca /dev-tools | |
| parent | update rebash (diff) | |
| parent | Configure keyboard. (diff) | |
| download | systemd-init-5f2520f389d39241aefa8ec3055f0b81b6bda100.tar.gz systemd-init-5f2520f389d39241aefa8ec3055f0b81b6bda100.tar.xz systemd-init-5f2520f389d39241aefa8ec3055f0b81b6bda100.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init
Diffstat (limited to 'dev-tools')
| -rwxr-xr-x | dev-tools/openslxTFTPRoot/pxelinux.cfg/default | 4 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default index be39f633..48691a20 100755 --- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default @@ -62,7 +62,7 @@ LABEL net MENU LABEL ^Dracut TEST Torben KERNEL http://132.230.4.201:8080/vmlinuz-linux INITRD http://132.230.4.201:8080/initramfs-test.img - APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.201:80,132.230.4.201:8080,132.230.4.201:8008,132.230.4.201:8090,132.230.4.201:8280,132.230.4.201:8888 slxbase=/archLinux/ vga=current + APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:80,132.230.4.201:8080,132.230.4.201:8008,132.230.4.201:8090,132.230.4.201:8280,132.230.4.201:8888 slxbase=archLinux/ vga=current IPAPPEND 3 MENU DEFAULT @@ -70,6 +70,6 @@ LABEL net MENU LABEL ^Dracut TEST Janosch KERNEL http://132.230.4.202:8080/vmlinuz-linux INITRD http://132.230.4.202:8080/initramfs-test.img - APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.202:80,132.230.4.202:8080,132.230.4.202:8008,132.230.4.202:8090,132.230.4.202:8280,132.230.4.202:8888 slxbase=/ vga=current + APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=en rd.locale.LANG=en_US.UTF-8 slxsrv=132.230.4.202:80,132.230.4.202:8080,132.230.4.202:8008,132.230.4.202:8090,132.230.4.202:8280,132.230.4.202:8888 slxbase=archLinux/ vga=current IPAPPEND 3 MENU DEFAULT diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index da5eae74..efe9d298 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -8,7 +8,7 @@ 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 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 +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 LABEL BootNormal MENU LABEL ^Boot Normal (HDD) |