diff options
| author | jandob | 2016-02-04 13:47:10 +0100 |
|---|---|---|
| committer | jandob | 2016-02-04 13:47:10 +0100 |
| commit | 88d12916bf7959d73df31b1aed2259c451674b8a (patch) | |
| tree | 7d7a4c1685674f246eb9099c58d95b611cb3e4e8 /dev-tools | |
| parent | fix (diff) | |
| parent | Make proper names for developing boot enties. (diff) | |
| download | systemd-init-88d12916bf7959d73df31b1aed2259c451674b8a.tar.gz systemd-init-88d12916bf7959d73df31b1aed2259c451674b8a.tar.xz systemd-init-88d12916bf7959d73df31b1aed2259c451674b8a.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 | 2 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default index 16135097..8968ad50 100755 --- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default @@ -96,7 +96,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/ + 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 SYSAPPEND 2 IPAPPEND 3 MENU DEFAULT diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 31011d44..2134db2f 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -12,13 +12,13 @@ APPEND initrd=/archLinux-initramfs-test.img acpi_osi="!Windows 2012" ip=10.0.2.1 SYSAPPEND 2 LABEL arch -MENU LABEL ^archLinux +MENU LABEL ^archLinux debug KERNEL /archLinux-vmlinuz-linux APPEND initrd=/archLinux-initramfs-test.img 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 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/ systemd.log_level=info systemd.journald.forward_to_console=1 SYSAPPEND 2 LABEL arch -MENU LABEL ^archlinux +MENU LABEL ^archlinux serial debug KERNEL /archLinux-vmlinuz-linux APPEND initrd=/archLinux-initramfs-test.img 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 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/ systemd.log_level=info systemd.journald.forward_to_console=1 console=tty0 console=ttyS0,128000 SYSAPPEND 2 |