diff options
| author | jandob | 2016-03-01 17:53:16 +0100 |
|---|---|---|
| committer | jandob | 2016-03-01 17:53:16 +0100 |
| commit | d47d1ab5fe61c271a62945782474a26d93559eb4 (patch) | |
| tree | 27d9c09c86358e14b1111613a86ac4a23889d1d6 /dev-tools | |
| parent | pxelinux.cfg/default (diff) | |
| parent | Remove unneeded hook files. (diff) | |
| download | systemd-init-d47d1ab5fe61c271a62945782474a26d93559eb4.tar.gz systemd-init-d47d1ab5fe61c271a62945782474a26d93559eb4.tar.xz systemd-init-d47d1ab5fe61c271a62945782474a26d93559eb4.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 | 13 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 2 |
2 files changed, 5 insertions, 10 deletions
diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default index 6e7cf66a..73b71082 100755 --- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default @@ -51,11 +51,6 @@ MENU PASSPROMPT Passwort ben”tigt MENU CLEAR ONTIMEOUT net -LABEL shutdown - MENU HIDE - KERNEL kernel-shutdown - APPEND initrd=initramfs-shutdown quiet - LABEL net MENU LABEL ^archLinux Torben KERNEL http://132.230.4.201:8080/archLinux/vmlinuz-linux @@ -69,7 +64,7 @@ LABEL net MENU LABEL ^archLinux Torben Debug KERNEL http://132.230.4.201:8080/archLinux/vmlinuz-linux INITRD http://132.230.4.201:8080/archLinux/initramfs-test.img - APPEND 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:8080 slxbase=archLinux/ + APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=archLinux/ SYSAPPEND 2 IPAPPEND 3 MENU DEFAULT @@ -78,7 +73,7 @@ LABEL net MENU LABEL ^archLinux Torben serial debug KERNEL http://132.230.4.201:8080/archLinux/vmlinuz-linux INITRD http://132.230.4.201:8080/archLinux/initramfs-test.img - APPEND 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:8080 slxbase=archLinux/ systemd.journald.forward_to_console=1 console=tty0 console=ttyS0,128000 + APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=archLinux/ systemd.journald.forward_to_console=1 console=tty0 console=ttyS0,128000 SYSAPPEND 2 IPAPPEND 3 MENU DEFAULT @@ -96,7 +91,7 @@ LABEL net MENU LABEL ^ubuntu Torben debug KERNEL http://132.230.4.201:8080/ubuntu/vmlinuz-linux INITRD http://132.230.4.201:8080/ubuntu/initramfs-test.img - APPEND 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:8080 slxbase=ubuntu/ brd.rd_size=2097152 + APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=ubuntu/ brd.rd_size=2097152 SYSAPPEND 2 IPAPPEND 3 MENU DEFAULT @@ -114,7 +109,7 @@ LABEL net MENU LABEL ^centOS Torben debug KERNEL http://132.230.4.201:8080/centOS/vmlinuz-linux INITRD http://132.230.4.201:8080/centOS/initramfs-test.img - APPEND 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:8080 slxbase=centOS/ + APPEND loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break rd.break=pre-shutdown vconsole.font=latarcyrheb-sun16 vconsole.keymap=de-latin1-nodeadkeys rd.locale.LANG=de_DE.UTF-8 slxsrv=132.230.4.201:8080 slxbase=centOS/ SYSAPPEND 2 IPAPPEND 3 MENU DEFAULT diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 80014ee7..5133203a 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -8,7 +8,7 @@ MENU TITLE Janosch und Torbens Bastelspassmenu LABEL arch MENU LABEL ^archLinux KERNEL /archLinux-vmlinuz-linux -APPEND initrd=/archLinux-initramfs-test.img acpi_osi="!Windows 2012" ip=10.0.2.15::10.0.2.2:255.255.255.0 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/ +APPEND initrd=/initramfs-test.img acpi_osi="!Windows 2012" ip=10.0.2.15::10.0.2.2:255.255.255.0 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/ SYSAPPEND 2 LABEL arch |