pb-udhcpc: Fix string returned from resolve_url

[petitboot] / utils / pb-udhcpc

diff --git a/utils/pb-udhcpc b/utils/pb-udhcpc
index 729de080885247280aa07ee3b82b886292a5989a..d641e9917b6bd459340ec5dc44c9007cc5d25562 100644 (file)
--- a/utils/pb-udhcpc
+++ b/utils/pb-udhcpc
@@ -17,6 +17,7 @@ resolve_url() {
        if [ "$tmp" != "$file" ]
        then
                echo "$file"
+               return
        fi
 
        # Otherwise, TFTP using an appropriate host. Start with the
@@ -38,8 +39,8 @@ do_pxe() {
        params="conf@/net/${interface} method=dhcp"
 
        # first, try by MAC
-       mac=$(cat /sys/class/net/$interface/address)
-       pb-event $params url=$basedir/$mac
+       mac=$(tr ':' '-' < /sys/class/net/$interface/address)
+       pb-event $params url=$basedir/01-$mac
 
        # try decreasing fragments of IP lease
        ip_hex=$(printf '%02X%02X%02X%02X' $(echo $ip | tr '.' ' '))