From d2f2741e99aa166472d2f350ce5ee27b0bf31f6c Mon Sep 17 00:00:00 2001 From: torben Date: Fri, 27 Nov 2015 13:35:36 +0100 Subject: Fix bootname dependency. --- dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'dev-tools') 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) -- cgit v1.2.3-55-g7522 From 9e2ce3d0d6f913e6f145c6e3e373800086142d52 Mon Sep 17 00:00:00 2001 From: torben Date: Fri, 27 Nov 2015 14:25:56 +0100 Subject: Change slx configuration parameter name since the old one doesn't match it meaning. --- builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh | 2 +- dev-tools/example-openslx.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'dev-tools') diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh index ff1fdcd3..446433b3 100755 --- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh @@ -28,7 +28,7 @@ local nbd_device='/dev/nbd0' systemd-preserve-process-marker qemu-nbd --connect="$nbd_device" \ "$SLX_DNBD3_DEVICE" --read-only local read_only_partition="$(utils.create_partition_via_offset "$nbd_device" \ - "$SLX_SYSTEM_PARTITION_LABEL")" + "$SLX_SYSTEM_PARTITION_IDENTIFIER")" # Make read-only partition writable. ## detect partition for persistent storage 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 -- cgit v1.2.3-55-g7522