diff options
| author | torben | 2015-11-20 18:39:20 +0100 |
|---|---|---|
| committer | torben | 2015-11-20 18:39:20 +0100 |
| commit | 5c073095e706ba3c0b39a9ae2126c6c1eb86739b (patch) | |
| tree | 44fa295509581e2c66c59a5c6a92442ac448c931 | |
| parent | Fix. (diff) | |
| download | systemd-init-5c073095e706ba3c0b39a9ae2126c6c1eb86739b.tar.gz systemd-init-5c073095e706ba3c0b39a9ae2126c6c1eb86739b.tar.xz systemd-init-5c073095e706ba3c0b39a9ae2126c6c1eb86739b.zip | |
Fix pxe server config.
| -rwxr-xr-x | builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh | 8 | ||||
| -rw-r--r-- | dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default | 2 |
2 files changed, 5 insertions, 5 deletions
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 233d4640..95ee8fd1 100755 --- a/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh +++ b/builder/dnbd3-rootfs/hooks/pre-mount/prepare-root-partition.sh @@ -7,16 +7,16 @@ IFS="," local host for host in ${SLX_DNBD3_SERVERS}; do info "Trying host \"$host\"." - systemd-preserve-process-marker dnbd3-client --host "$SLX_DNBD3_SERVERS" \ - --image "${SLX_SERVER_BASE}${SLX_DNBD3_IMAGE}" --device \ - "$SLX_DNBD3_DEVICE" --rid "$SLX_DNBD3_RID" + systemd-preserve-process-marker dnbd3-client --host "$host" --image \ + "${SLX_SERVER_BASE#/}${SLX_DNBD3_IMAGE}" --device "$SLX_DNBD3_DEVICE" \ + --rid "$SLX_DNBD3_RID" local return_code="$?" [[ $return_code == 0 ]] && break continue done IFS="$IFS_backup" if [[ $return_code != 0 ]]; then - warn "Failed to connect \"${SLX_SERVER_BASE}${SLX_DNBD3_IMAGE}\" from one of \"$SLX_DNBD3_SERVERS\" to \"$SLX_DNBD3_DEVICE\"." + warn "Failed to connect \"${SLX_SERVER_BASE#/}${SLX_DNBD3_IMAGE}\" from one of \"$SLX_DNBD3_SERVERS\" to \"$SLX_DNBD3_DEVICE\"." emergency_shell -n "Error in $0" return 1 fi diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index da5eae74..6d01e78e 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 ^arch 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 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 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 LABEL BootNormal MENU LABEL ^Boot Normal (HDD) |