aboutsummaryrefslogtreecommitdiffstats
path: root/tools/ubuntu-server-cloudimg-modify.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tools/ubuntu-server-cloudimg-modify.sh')
-rwxr-xr-xtools/ubuntu-server-cloudimg-modify.sh31
1 files changed, 18 insertions, 13 deletions
diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index ce320a205..fb2ae3fe8 100755
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -24,7 +24,7 @@ if [ $# -eq 1 ]; then
fi
# iperf3 only available for trusty in backports
-if [ grep -q trusty /etc/apt/sources.list ]; then
+if grep -q trusty /etc/apt/sources.list ; then
if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
echo "deb [arch=${YARD_IMG_ARCH}] http://ports.ubuntu.com/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
else
@@ -48,7 +48,7 @@ EOF
apt-get update
if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
apt-get install -y \
- linux-headers-$(echo $CLOUD_KERNEL_VERSION | cut -d'-' -f3,4,5) \
+ linux-headers-"$(echo ${CLOUD_KERNEL_VERSION} | cut -d'-' -f3,4,5)" \
unzip
#resize root partition (/dev/vdb1) It is supposed to be default but the image is booted differently for arm64
cat <<EOF >/etc/cloud/cloud.cfg.d/15_growpart.cfg
@@ -76,36 +76,41 @@ apt-get install -y \
stress \
sysstat
+CLONE_DEST=/opt/tempT
+
+# remove before cloning
+rm -rf -- "${CLONE_DEST}"
+
if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
wget https://github.com/kdlucas/byte-unixbench/archive/master.zip
unzip master.zip && rm master.zip
- mkdir /opt/tempT
- mv byte-unixbench-master/UnixBench /opt/tempT
+ mkdir "${CLONE_DEST}"
+ mv byte-unixbench-master/UnixBench "${CLONE_DEST}"
sed -i -e 's/OPTON += -march=native -mtune=native/OPTON += -march=armv8-a -mtune=generic/g' \
- -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' /opt/tempT/UnixBench/Makefile
+ -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' "${CLONE_DEST}/UnixBench/Makefile"
else
- git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
+ git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
fi
-make --directory /opt/tempT/UnixBench/
+make --directory "${CLONE_DEST}/UnixBench/"
if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
wget https://github.com/beefyamoeba5/ramspeed/archive/master.zip
unzip master.zip && rm master.zip
- mkdir /opt/tempT/RAMspeed
- mv ramspeed-master/* /opt/tempT/RAMspeed/
+ mkdir "${CLONE_DEST}/RAMspeed"
+ mv ramspeed-master/* "${CLONE_DEST}/RAMspeed/"
else
- git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
+ git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed"
fi
-cd /opt/tempT/RAMspeed/ramspeed-2.6.0
+cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0"
mkdir temp
bash build.sh
if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
wget https://github.com/beefyamoeba5/cachestat/archive/master.zip
unzip master.zip && rm master.zip
- mv cachestat-master/cachestat /opt/tempT
+ mv cachestat-master/cachestat "${CLONE_DEST}"
else
- git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
+ git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
fi
# restore symlink