lib/url: Include port in pb_url_to_string()

[petitboot] / utils / pb-udhcpc

diff --git a/utils/pb-udhcpc b/utils/pb-udhcpc
index 7ed9035d5e9dad89f7880a0815e645320b8939d4..1b705cc955baef1dbe203642f76f5b041249f711 100644 (file)
--- a/utils/pb-udhcpc
+++ b/utils/pb-udhcpc
@@ -18,8 +18,8 @@ pb_add () {
        paramstr=''
 
        # Collect relevant DHCP response parameters into $paramstr
-       for name in pxeconffile pxepathprefix bootfile mac ip siaddr \
-               serverid tftp
+       for name in pxeconffile pxepathprefix reboottime bootfile mac ip \
+               siaddr serverid tftp ipv6 bootfile_url bootfile_param
        do
                value=$(eval "echo \${$name}")
                [ -n "$value" ] || continue;
@@ -40,7 +40,7 @@ pb_add () {
 
        # Collect relevant parameters to add an option to the bootfile
        # parameter
-       for name in rootpath siaddr bootfile
+       for name in rootpath siaddr bootfile mac
         do
                 value=$(eval "echo \${$name}")
                 [ -n "$value" ] || continue;
@@ -53,7 +53,8 @@ pb_add () {
 }
 
 pb_remove () {
-       pb-event remove@${interface}
+       mac=$(cat /sys/class/net/$interface/address)
+       pb-event remove@${interface} mac=$mac
 }
 
 case "$1" in