diff options
author | torben | 2015-11-20 18:32:12 +0100 |
---|---|---|
committer | torben | 2015-11-20 18:32:12 +0100 |
commit | 9ef06ccd6bb9179878928a73495285682e4bcb19 (patch) | |
tree | 9ffc4108ea8beff06d8d9e42f5835f37406a13ca | |
parent | Improve slx config. (diff) | |
download | systemd-init-9ef06ccd6bb9179878928a73495285682e4bcb19.tar.gz systemd-init-9ef06ccd6bb9179878928a73495285682e4bcb19.tar.xz systemd-init-9ef06ccd6bb9179878928a73495285682e4bcb19.zip |
Fix.
-rwxr-xr-x | builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh | 2 | ||||
-rwxr-xr-x | dev-tools/openslxTFTPRoot/pxelinux.cfg/default | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh index 581c8e05..f0753831 100755 --- a/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh +++ b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh @@ -7,7 +7,7 @@ IFS="," local host for host in ${SLX_SERVER}; do info "Trying host \"$host\"." - wget --timeout 5 --quiet "http://${host}${SLX_SERVER_BASE}${configuration_file_name}" \ + wget --timeout 5 --quiet "http://${host}/${SLX_SERVER_BASE}${configuration_file_name}" \ --output-document "/$configuration_file_name" local return_code="$?" [[ $return_code == 0 ]] && break diff --git a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default index be39f633..a07a3141 100755 --- a/dev-tools/openslxTFTPRoot/pxelinux.cfg/default +++ b/dev-tools/openslxTFTPRoot/pxelinux.cfg/default @@ -62,7 +62,7 @@ LABEL net MENU LABEL ^Dracut TEST Torben KERNEL http://132.230.4.201:8080/vmlinuz-linux INITRD http://132.230.4.201:8080/initramfs-test.img - APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.201:80,132.230.4.201:8080,132.230.4.201:8008,132.230.4.201:8090,132.230.4.201:8280,132.230.4.201:8888 slxbase=/archLinux/ vga=current + APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.201:80,132.230.4.201:8080,132.230.4.201:8008,132.230.4.201:8090,132.230.4.201:8280,132.230.4.201:8888 slxbase=archLinux/ vga=current IPAPPEND 3 MENU DEFAULT @@ -70,6 +70,6 @@ LABEL net MENU LABEL ^Dracut TEST Janosch KERNEL http://132.230.4.202:8080/vmlinuz-linux INITRD http://132.230.4.202:8080/initramfs-test.img - APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.202:80,132.230.4.202:8080,132.230.4.202:8008,132.230.4.202:8090,132.230.4.202:8280,132.230.4.202:8888 slxbase=/ vga=current + APPEND root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.202:80,132.230.4.202:8080,132.230.4.202:8008,132.230.4.202:8090,132.230.4.202:8280,132.230.4.202:8888 slxbase=archLinux/ vga=current IPAPPEND 3 MENU DEFAULT |