diff options
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 5 | ||||
| -rwxr-xr-x | initramfs/initrd-stuff/init | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index 4a441550..cefd7a26 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -431,8 +431,9 @@ if [ -n "$FILESRC" ] ; then tftpserver=$(uri_token $FILESRC server) tftpgetunpack $tftp $cfgfile $tftpserver else - # fixme: We need to know the prefix somehow - cfgdir="/tftpboot/client-conf" + # we expect the tftp-server to serve from $SLX_TFTPBOOT_PATH, so we + # just use the relative path from that here: + cfgdir="client-config" local tftpserver=$serverip # try to get configuration files successively; start with distro client # and try last distro default ... diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 022b45f4..6353d286 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -103,7 +103,7 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup ;; # if (external, via tftp) configuration file retrieval should be # triggered, if no source is given try dhcp server and predefined - # standard path (~/tftpboot/client-conf/ ...) + # standard path (.../tftpboot/client-config/ ...) file) FILE="yes" rm /tmp/file-done |