Fixs in Packer cleanup/minimize scripts

* Need root, use sudo.
* Don't do yum remove of packages that aren't installed
* Fix shebang

Change-Id: I883d32898e60333530e2e976710dbd73399aba4b
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/packer/provision/cleanup_centos.sh b/packer/provision/cleanup_centos.sh
index c430573643f4bd860be17290c6d45e6f10843a3e..e93c227f4b58a0910cc5a0a1337ab5a92084cdd9 100644 (file)
--- a/packer/provision/cleanup_centos.sh
+++ b/packer/provision/cleanup_centos.sh
@@ -1,10 +1,10 @@
 #!/bin/bash -eux
 
-yum -y remove gcc cpp kernel-devel kernel-headers perl
-yum -y clean all
+sudo yum -y remove gcc cpp kernel-devel kernel-headers perl
+sudo yum -y clean all
 
-rm -f /etc/udev/rules.d/70-persistent-net.rules
+sudo rm -f /etc/udev/rules.d/70-persistent-net.rules
 if [ -r /etc/sysconfig/network-scripts/ifcfg-eth0 ]; then
-  sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0
-  sed -i 's/^UUID.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0
+  sudo sed -i 's/^HWADDR.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0
+  sudo sed -i 's/^UUID.*$//' /etc/sysconfig/network-scripts/ifcfg-eth0
 fi

diff --git a/packer/provision/cleanup_fedora.sh b/packer/provision/cleanup_fedora.sh
index a1712b80d4d83729ce4825bab3460a3cdcd629ad..94e01cf1c8bc5bc7e53f50a61a7a2d1b8805d913 100644 (file)
--- a/packer/provision/cleanup_fedora.sh
+++ b/packer/provision/cleanup_fedora.sh
@@ -1,4 +1,3 @@
 #!/bin/bash -eux
 
-dnf -y remove gcc cpp kernel-devel kernel-headers perl
-dnf -y clean all
+sudo dnf -y clean all

diff --git a/packer/provision/minimize.sh b/packer/provision/minimize.sh
index 4af9c6eaedb438ebc5c149f4929240bb059a48a6..0b1beb61c18ed45e1975a3d545d0f7cd52d08be3 100644 (file)
--- a/packer/provision/minimize.sh
+++ b/packer/provision/minimize.sh
@@ -1,7 +1,19 @@
-#!bin/sh -eux
+#!/usr/bin/env bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+set -ex
+
+# This doesn't seem to reduce the size of the box, and may break
+# Docker builds. See comments on git.opendaylight.org/gerrit/#/c/50382.
+
+# Write 0s in free space until full (full->exit 1, force 0)
+#sudo dd if=/dev/zero of=/EMPTY bs=1M || true
+
+# Remove pointer to all the 0-space
+#sudo rm -f /EMPTY
 
-dd if=/dev/zero of=/EMPTY bs=1M
-rm -f /EMPTY
 # Block until the empty file has been removed, otherwise, Packer
 # will try to kill the box while the disk is still full and that's bad
-sync
+#sudo sync