From 18c7a9ccc117597100c8e741bbd112cbda93d893 Mon Sep 17 00:00:00 2001 From: torben Date: Thu, 26 Nov 2015 18:07:49 +0100 Subject: Many ubuntu specific fixes. --- dev-tools/archLinuxStartup.nsh | 5 +++++ dev-tools/example-openslx.config | 2 +- dev-tools/startup.nsh | 5 ----- dev-tools/ubuntuStartup.nsh | 1 + dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100755 dev-tools/archLinuxStartup.nsh delete mode 100755 dev-tools/startup.nsh create mode 100755 dev-tools/ubuntuStartup.nsh (limited to 'dev-tools') diff --git a/dev-tools/archLinuxStartup.nsh b/dev-tools/archLinuxStartup.nsh new file mode 100755 index 00000000..b36f4f85 --- /dev/null +++ b/dev-tools/archLinuxStartup.nsh @@ -0,0 +1,5 @@ +if exist fs0:\debug then + rm fs0:\debug + \vmlinuz-linux initrd=\initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0::enp0s3:off vconsole.font=latarcyrheb-sun16 vconsole.keymap=de +endif +\vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" diff --git a/dev-tools/example-openslx.config b/dev-tools/example-openslx.config index 393989ea..7b085740 100644 --- a/dev-tools/example-openslx.config +++ b/dev-tools/example-openslx.config @@ -2,7 +2,7 @@ SLX_CONFIGURATION_LOCATION='/opt/openslx/' 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.vdi' +SLX_DNBD3_IMAGE='archLinux.vmdk' SLX_SYSTEM_PARTITION_LABEL='system' # TODO: Following parameter aren't supported yet. diff --git a/dev-tools/startup.nsh b/dev-tools/startup.nsh deleted file mode 100755 index b36f4f85..00000000 --- a/dev-tools/startup.nsh +++ /dev/null @@ -1,5 +0,0 @@ -if exist fs0:\debug then - rm fs0:\debug - \vmlinuz-linux initrd=\initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0::enp0s3:off vconsole.font=latarcyrheb-sun16 vconsole.keymap=de -endif -\vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" diff --git a/dev-tools/ubuntuStartup.nsh b/dev-tools/ubuntuStartup.nsh new file mode 100755 index 00000000..621056bc --- /dev/null +++ b/dev-tools/ubuntuStartup.nsh @@ -0,0 +1 @@ +\EFI\ubuntu\grubx64.efi diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index ee38ed10..1e459616 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 ^test 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-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=/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=ubuntu/ vga=current LABEL BootNormal MENU LABEL ^Boot Normal (HDD) -- cgit v1.2.3-55-g7522