summaryrefslogtreecommitdiffstats
path: root/fuel/build/f_isoroot/f_repobuild/Makefile
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2015-10-07 11:17:10 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2015-11-18 13:42:40 +0100
commit4a6b1e8352731902fb9596176a510f4e24d7e965 (patch)
treef945a647c9c084282bcd63d2c40ad8e836cec92e /fuel/build/f_isoroot/f_repobuild/Makefile
parent27c12b01000ddaa12a57b3383c717fac65417db4 (diff)
EXPERIMENTAL; DO NOT MERGE! Fuel 7.0 rebase
This is work in progress, do not merge but feel free to experiment with this commit changeset as a base. Change-Id: Ifbe1db9c892a94e64abbcfaaf1c98abce0c03dd4 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> Conflicts: fuel/build/config.mk
Diffstat (limited to 'fuel/build/f_isoroot/f_repobuild/Makefile')
-rw-r--r--fuel/build/f_isoroot/f_repobuild/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/fuel/build/f_isoroot/f_repobuild/Makefile b/fuel/build/f_isoroot/f_repobuild/Makefile
index 0f5a6ac12..d7db2dd90 100644
--- a/fuel/build/f_isoroot/f_repobuild/Makefile
+++ b/fuel/build/f_isoroot/f_repobuild/Makefile
@@ -30,16 +30,16 @@ nailgun:
rm -rf tmpiso tmpdir
mkdir tmpiso
fuseiso ${ISOCACHE} tmpiso
- cp tmpiso/ubuntu/pool/main/f/fuel-createmirror/fuel-createmirror_6.1*.deb .
+ cp tmpiso/ubuntu/pool/main/f/fuel-createmirror/fuel-createmirror_*.deb .
fusermount -u tmpiso
rm -rf tmpiso
- sudo dpkg -i fuel-createmirror_6.1*.deb
+ sudo dpkg -i fuel-createmirror_*.deb
sudo sed -i 's/DOCKER_MODE=true/DOCKER_MODE=false/' /etc/fuel-createmirror/common.cfg
sudo sed -i 's/DEBUG="no"/DEBUG="yes"/' /etc/fuel-createmirror/ubuntu.cfg
sudo sed -i "s/MIRROR_UBUNTU_HOST=\".*\"/MIRROR_UBUNTU_HOST=\"$(RSYNC_HOST)\"/" /etc/fuel-createmirror/common.cfg
rm -Rf nailgun
sudo mkdir -p /var/www
- sudo su - -c /opt/fuel-createmirror-6.1/fuel-createmirror
+ sudo su - -c /opt/fuel-createmirror-*/fuel-createmirror
sudo chmod -R 755 /var/www/nailgun
cp -Rp /var/www/nailgun .