aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatei Valeanu <Matei.Valeanu@enea.com>2017-04-06 12:34:05 +0200
committerMatei Valeanu <Matei.Valeanu@enea.com>2017-04-06 15:48:03 +0200
commiteb8fbde87578e3853ffd23e403fd46bac6039cd0 (patch)
tree0236bb6253cd373512294165547e6e525589a0e9
parent86eaf30b6b76d6ca1acbea243d2fdf100df43388 (diff)
build/install: Add USB boot option
Use isohybrid to add MBR for booting via BIOS from USB flash drives Also, Makefile "$(wildcard ubuntu-builder/*)" does not expand to what is expected (does not include ubuntu-builder/Dockerfile), as it uses a previous cached value. Check this link for an explanation: http://stackoverflow.com/questions/41470676/makefile-variable-expansion-with-wildcard-when-rule-creates-new-file JIRA: FUEL-236 Change-Id: I9c6521a382917822ce930ddf76391c5f3c3a9cb7 Signed-off-by: Matei Valeanu <Matei.Valeanu@enea.com>
-rw-r--r--build/docker/Dockerfile3
-rw-r--r--build/docker/Makefile2
-rwxr-xr-xbuild/install/install.sh2
3 files changed, 5 insertions, 2 deletions
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index e41d5ec28..ce0c595d4 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -20,7 +20,8 @@ RUN apt-get install -y software-properties-common python-software-properties \
make python-setuptools python-all dpkg-dev debhelper ruby-json \
fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \
ca-certificates sudo apt-utils lsb-release dosfstools debmirror p7zip-full \
- build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
+ build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev \
+ syslinux
RUN gem install fpm
RUN pip install git+https://github.com/openstack/fuel-plugins
diff --git a/build/docker/Makefile b/build/docker/Makefile
index 783881e8d..cdf4a359c 100644
--- a/build/docker/Makefile
+++ b/build/docker/Makefile
@@ -74,7 +74,7 @@ deepclean: clean clean-cache
# - ubuntu-builder Dockerfile (includes eventual proxy env vars), runcontext;
# - The contents of this Makefile
.cacheid: .dockercfg
- sha1sum Makefile runcontext $(wildcard ubuntu-builder/*) > .cachedata
+ sha1sum Makefile runcontext ubuntu-builder/* > .cachedata
cat .cachedata | $(CACHETOOL) getid > .cacheid
# Clean local data related to caching - called prior to ordinary build
diff --git a/build/install/install.sh b/build/install/install.sh
index 19ff14946..c03b7decb 100755
--- a/build/install/install.sh
+++ b/build/install/install.sh
@@ -208,6 +208,8 @@ make_iso_image() {
--joliet-long \
-x "lost+found" -o $NEWISO .
+ isohybrid $NEWISO
+
isoinfo -d -i $NEWISO
}