commit b437b3edaf1027e9e3b8bdb878a9f9f3eb21b6a4
author Keith Haddow <haddowk@chromium.org> Fri May 18 17:05:17 2018
committer chrome-bot <chrome-bot@chromium.org> Sat May 19 03:08:30 2018
tree a0ff030603bdf0386437b8b844830e673b72b67e
parent e68a6ee3f027d7b5a1e8c821aae5c5a0469997cd

[moblab] Fix some issues with the build_base_image

Some changes I made to appease lint broke the script,
fixing the breakages

BUG=None
TEST=local testing

Change-Id: I0ea593ad67b51415e46532d8123aaa94cd88053c
Reviewed-on: https://chromium-review.googlesource.com/1066315
Commit-Ready: Keith Haddow <haddowk@chromium.org>
Tested-by: Keith Haddow <haddowk@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>

scripts/build_base_image.sh

diff --git a/scripts/build_base_image.sh b/scripts/build_base_image.sh
index ea12d38..5bd48b8 100755
--- a/scripts/build_base_image.sh
+++ b/scripts/build_base_image.sh
@@ -31,7 +31,7 @@
   sudo apt-get -y update
   sudo apt-get -y upgrade
   # Install the required packages
-  sudo apt-get -y install "${PACKAGES}"
+  sudo apt-get -y install ${PACKAGES}
   # Install the google cloud sdk
   export CLOUD_SDK_REPO="cloud-sdk-\$(lsb_release -c -s)"
   curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
@@ -66,17 +66,10 @@
     -- -d "${DISTRIBUTION}" -r "${REVISION}" -a "${ARCH}"
 
   # Set up the networking for the container on moblab
-  local network_config="lxc.net.0.type = veth\n\
-lxc.net.0.flags = up\n\
-lxc.net.0.link = lxcbr0\n\
-lxc.net.0.hwaddr = 00:16:3e:0a:31:c2"
+  local network_config="lxc.net.0.type = veth\nlxc.net.0.flags = up\nlxc.net.0.link = lxcbr0\nlxc.net.0.hwaddr = 00:16:3e:0a:31:c2"
 
-  sudo sed -E s#"^lxc.rootfs.path = dir.*$"#\
-"lxc.rootfs.path = dir:/mnt/moblab/containers/${CONTAINER_NAME}/rootfs\n"#\
--i "${DIRECTORY}/${CONTAINER_NAME}/config"
-  sudo sed -E s#"^lxc.net.0.type.*$"#\
-"${network_config}"#\
--i "${DIRECTORY}/${CONTAINER_NAME}/config"
+  sudo sed -E s#"^lxc.rootfs.path = dir.*$"#"lxc.rootfs.path = dir:/mnt/moblab/containers/${CONTAINER_NAME}/rootfs\n"# -i "${DIRECTORY}/${CONTAINER_NAME}/config"
+  sudo sed -E s#"^lxc.net.0.type.*$"#"${network_config}"# -i "${DIRECTORY}/${CONTAINER_NAME}/config"
 
   # Install a script that will setup the container on the moblab.
   rm /tmp/container_install_script