diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-24 14:28:10 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-24 14:28:10 +0000 |
commit | 73a884fc41c3d28f56006db6f186bcdb1c2c97df (patch) | |
tree | 1c7d523e372a02767099138e9113dda7d5f4071c | |
parent | 40ddf861c7fb85928105e9c306b725d5b6584e87 (diff) | |
parent | 35ea727e6a84706d7a2145c7c551b2479b717ed4 (diff) | |
download | ironic-python-agent-73a884fc41c3d28f56006db6f186bcdb1c2c97df.tar.gz |
Merge "Add a new location of isolinux.bin for Ubuntu 16.04"2.1.0
-rwxr-xr-x | imagebuild/coreos/iso-image-create | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/imagebuild/coreos/iso-image-create b/imagebuild/coreos/iso-image-create index 0baa6c35..1d5b1206 100755 --- a/imagebuild/coreos/iso-image-create +++ b/imagebuild/coreos/iso-image-create @@ -104,8 +104,13 @@ then elif [ -f /usr/lib/syslinux/isolinux.bin ] then cp /usr/lib/syslinux/isolinux.bin "$TMP_IMAGE_DIR/isolinux" + +elif [ -f /usr/lib/ISOLINUX/isolinux.bin ] +then + cp /usr/lib/ISOLINUX/isolinux.bin "$TMP_IMAGE_DIR/isolinux" + else - err_print "Could not find isolinux.bin. Install syslinux?" + err_print "Could not find isolinux.bin. Install syslinux or isolinux?" cleanup exit 1 fi |