diff options
| author | jandob | 2015-11-26 18:10:55 +0100 |
|---|---|---|
| committer | jandob | 2015-11-26 18:10:55 +0100 |
| commit | 355d4074ba41504550e5e8568a9ab6db00ea07cb (patch) | |
| tree | a89b3c54237459106aae6da6dae2bb06c729085c /dev-tools | |
| parent | add documentation (diff) | |
| parent | Many ubuntu specific fixes. (diff) | |
| download | systemd-init-355d4074ba41504550e5e8568a9ab6db00ea07cb.tar.gz systemd-init-355d4074ba41504550e5e8568a9ab6db00ea07cb.tar.xz systemd-init-355d4074ba41504550e5e8568a9ab6db00ea07cb.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init
Diffstat (limited to 'dev-tools')
| -rwxr-xr-x | dev-tools/archLinuxStartup.nsh (renamed from dev-tools/startup.nsh) | 0 | ||||
| -rw-r--r-- | dev-tools/example-openslx.config | 2 | ||||
| -rwxr-xr-x | dev-tools/ubuntuStartup.nsh | 1 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/dev-tools/startup.nsh b/dev-tools/archLinuxStartup.nsh index b36f4f85..b36f4f85 100755 --- a/dev-tools/startup.nsh +++ b/dev-tools/archLinuxStartup.nsh 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/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 efe9d298..1e459616 100644 --- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default @@ -6,9 +6,9 @@ PROMPT 0 MENU TITLE My PXE Boot Menu LABEL arch -MENU LABEL ^arch network boot +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) |