summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuilder/build-initramfs.sh2
-rwxr-xr-xdev-tools/archLinuxStartup.nsh (renamed from dev-tools/startup.nsh)0
-rw-r--r--dev-tools/example-openslx.config2
-rwxr-xr-xdev-tools/ubuntuStartup.nsh1
-rw-r--r--dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default2
5 files changed, 4 insertions, 3 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 136f9299..8ba7e4a5 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -69,7 +69,7 @@ build_initramfs_create_system_image='no'
build_initramfs_dependencies=(bash cpio git test shift echo mktemp cat rm sed \
gzip curl tar grep make gcc cmake)
# TODO Check for:
-# /usr/lib/x86_64-linux-gnu/libz.so
+# /usr/lib/x86_64-linux-gnu/libz.so ldconfig -p |grep libz.so
# for dnbd3
# endregion
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 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)