summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-01-20 08:58:49 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-01-21 13:36:01 +0800
commit6d05fe798a06ba93418a1f8517e8f30cadcfd5e4 (patch)
treedee01306db5a2e16554d437d74b3dadc0eb9282a /utils
parent416647ec10a0ca505de35348620391fde80043c0 (diff)
downloadpetitboot-6d05fe798a06ba93418a1f8517e8f30cadcfd5e4.zip
petitboot-6d05fe798a06ba93418a1f8517e8f30cadcfd5e4.tar.gz
utils/pb-udhcpc: Unify references to DHCP bootfile parameter
udhcpc may pass the bootfile parameter as either $bootfile or $boot_file, depending on whether the option is present in the BOOTP header, or as a DHCP vendor option. We have code in pb-udhcpc to unify this to $bootfile, but we only use the unified value in one of the user events. This change uses the correct value of bootfile, and fixes the check to conditionally generate the explicit add event. We also need to update the user-event code to use the right event parameter name. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'utils')
-rw-r--r--utils/pb-udhcpc18
1 files changed, 10 insertions, 8 deletions
diff --git a/utils/pb-udhcpc b/utils/pb-udhcpc
index f0703ae..7ed9035 100644
--- a/utils/pb-udhcpc
+++ b/utils/pb-udhcpc
@@ -29,17 +29,18 @@ pb_add () {
pb-event dhcp@${interface} $paramstr
- # Check if an explicit config file present
- if [ -n "${conffile}" ]
+ # Check if an explicit boot file present. If there is, add it as
+ # an option directly.
+ if [ -z "${bootfile}" ]
then
return;
fi
- # Finally, add an option for the boot_file parameter
- paramstr='name=netboot'
+ paramstr=""
- # Collect relevant parameters to add an option to the boot_file parameter
- for name in rootpath siaddr boot_file
+ # Collect relevant parameters to add an option to the bootfile
+ # parameter
+ for name in rootpath siaddr bootfile
do
value=$(eval "echo \${$name}")
[ -n "$value" ] || continue;
@@ -47,11 +48,12 @@ pb_add () {
paramstr="$paramstr $name=$value"
done
- pb-event add@${interface} $paramstr
+ pb-event add@${interface} name="netboot $interface ($bootfile)" \
+ $paramstr
}
pb_remove () {
- pb-event remove@${interface} name=netboot
+ pb-event remove@${interface}
}
case "$1" in
OpenPOWER on IntegriCloud