summaryrefslogtreecommitdiffstats
path: root/utils/pb-udhcpc
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-07-15 13:11:13 +0800
committerGeoff Levand <geoff@infradead.org>2013-07-23 09:44:45 -0700
commit3b3687fc3d902adcad636fce11c9ff7216b113f9 (patch)
treeec6c37ebbf12cd6662c02d70ab0aa83c4e9c0763 /utils/pb-udhcpc
parent45c7385acbd1299cacfa5cc335ffa6a0f0523980 (diff)
downloadpetitboot-3b3687fc3d902adcad636fce11c9ff7216b113f9.zip
petitboot-3b3687fc3d902adcad636fce11c9ff7216b113f9.tar.gz
pb-udhcp: PXE fixes
Fix a couple of bugs in the udhcp script. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'utils/pb-udhcpc')
-rw-r--r--utils/pb-udhcpc10
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/pb-udhcpc b/utils/pb-udhcpc
index 808f12a..729de08 100644
--- a/utils/pb-udhcpc
+++ b/utils/pb-udhcpc
@@ -13,7 +13,7 @@ resolve_url() {
file="$1"
# URL? use as-is.
- tmp=${file#://*}
+ tmp=${file%://*}
if [ "$tmp" != "$file" ]
then
echo "$file"
@@ -45,7 +45,7 @@ do_pxe() {
ip_hex=$(printf '%02X%02X%02X%02X' $(echo $ip | tr '.' ' '))
for i in $(seq 8 -1 1)
do
- frag=${hex_ip:0:$i}
+ frag=${ip_hex:0:$i}
pb-event $params url=$basedir/$frag
done
@@ -57,7 +57,7 @@ pb_add () {
# Look for an explicit config file location in the DHCP config-file
# parameter
- if [ -n ${conffile} ]
+ if [ -n "${conffile}" ]
then
url=$(resolve_url ${conffile})
pb-event conf@/net/${interface} url=$url method=dhcp
@@ -67,7 +67,7 @@ pb_add () {
# Otherwise, we'll need the boot-file parameter. Looks like udhcpc
# will give us different names, depending if the parameter was in
# the header, or specified by options
- [ -n "$bootfile" ] && bootfile=${boot_file}
+ [ -z "$bootfile" ] && bootfile=${boot_file}
if [ -z "$bootfile" ]
then
@@ -89,7 +89,7 @@ pb_add () {
k_root_dir=${rootpath#*:}
args=
- if [ -n $rootpath ]
+ if [ -n "$rootpath" ]
then
[ ${k_server_ip} != ${rootpath} ] || k_server_ip=${serverid}
args="root=/dev/nfs ip=any nfsroot=${k_server_ip}:${k_root_dir}"
OpenPOWER on IntegriCloud