diff options
| author | jandob | 2015-11-27 14:43:19 +0100 |
|---|---|---|
| committer | jandob | 2015-11-27 14:43:19 +0100 |
| commit | 171fc3a219dbf2025bd4edae8c88695a2c5b312d (patch) | |
| tree | af661a4abbc77be9c8d3f3d514583f56d13494da /dev-tools | |
| parent | assume row disk if no partition hint is given in the configuration (diff) | |
| parent | Fix. (diff) | |
| download | systemd-init-171fc3a219dbf2025bd4edae8c88695a2c5b312d.tar.gz systemd-init-171fc3a219dbf2025bd4edae8c88695a2c5b312d.tar.xz systemd-init-171fc3a219dbf2025bd4edae8c88695a2c5b312d.zip | |
merge
Diffstat (limited to 'dev-tools')
| -rw-r--r-- | dev-tools/example-openslx.config | 2 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/dev-tools/example-openslx.config b/dev-tools/example-openslx.config index f93fa82f..4db11c6b 100644 --- a/dev-tools/example-openslx.config +++ b/dev-tools/example-openslx.config @@ -3,7 +3,7 @@ SLX_DNBD3_SERVERS='132.230.4.201,132.230.4.202,10.0.2.2' SLX_DNBD3_RID='0' SLX_DNBD3_DEVICE='/dev/dnbd0' SLX_DNBD3_IMAGE='archLinux.vmdk' -SLX_SYSTEM_PARTITION_LABEL='system' +SLX_SYSTEM_PARTITION_IDENTIFIER='system' SLX_PERSISTENT_PARTITION_PATTERN_LABEL_UUID_TYPE='' SLX_TMP_PARTITION_PATTERN_LABEL_UUID_TYPE='' SLX_RAMDISK_SIZE=524288 diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 36bc382e..3371b5ed 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -3,18 +3,19 @@ TIMEOUT 300 ALLOWOPTIONS 0 PROMPT 0 -MENU TITLE My PXE Boot Menu +MENU TITLE Janosch und Torbens Bastelspassmenu LABEL arch MENU LABEL ^arch network boot 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 +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 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 +SYSAPPEND 2 LABEL ubuntu MENU LABEL ^ubuntu network boot 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 +APPEND initrd=/ubuntu-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 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 +SYSAPPEND 2 LABEL BootNormal MENU LABEL ^Boot Normal (HDD) |