summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-01-17 15:51:54 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-01-17 17:01:47 +0800
commitf2acf9d2573ebbfb7478e97c4066c128ddaa5a18 (patch)
tree95f6ba125d82469e7329e6bd2c339480e3ec563d /utils
parentd14bf38b9881c385478a460e3058d7cadee107fb (diff)
downloadpetitboot-f2acf9d2573ebbfb7478e97c4066c128ddaa5a18.zip
petitboot-f2acf9d2573ebbfb7478e97c4066c128ddaa5a18.tar.gz
discover: Support DHCP "pathprefix" configuration option
This change implements support for the DHCP "pathprefix" option. We use the following logic: - If pathprefix is present and a full URL, we base the config file location on pathprefix + conffile - If pathprefix is present but not a full URL, we use it as the path component of the URL, and pick up the host from other parameters in the DHCP response - If no pathprefix is present, we determine the configuration prefix from the DHCP bootfile parameter. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'utils')
-rw-r--r--utils/pb-udhcpc3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/pb-udhcpc b/utils/pb-udhcpc
index 4ff0dcf..714d5b4 100644
--- a/utils/pb-udhcpc
+++ b/utils/pb-udhcpc
@@ -18,7 +18,8 @@ pb_add () {
paramstr=''
# Collect relevant DHCP response parameters into $paramstr
- for name in pxeconffile bootfile mac ip siaddr serverid tftp
+ for name in pxeconffile pxepathprefix bootfile mac ip siaddr \
+ serverid tftp
do
value=$(eval "echo \${$name}")
[ -n "$value" ] || continue;
OpenPOWER on IntegriCloud