diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-29 07:01:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-29 07:01:46 -0700 |
| commit | 742a8b0c6e839aab75c85a8515511866046fd747 (patch) | |
| tree | bcb7652bcf5afd7493ea4af13d8b386e3ec213f9 /contrib/cirrus/packer | |
| parent | 01a802e54682213e243a35ab98488b3f0bf7031e (diff) | |
| parent | e122c24c3600be1d37e252fe843568bf2a179ff1 (diff) | |
| download | podman-742a8b0c6e839aab75c85a8515511866046fd747.tar.gz podman-742a8b0c6e839aab75c85a8515511866046fd747.tar.bz2 podman-742a8b0c6e839aab75c85a8515511866046fd747.zip | |
Merge pull request #4028 from cevich/add_bash_completion_support
cirrus: Add bash-completion support
Diffstat (limited to 'contrib/cirrus/packer')
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 1 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index f84645a04..8e0a2b2ee 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -26,6 +26,7 @@ ooe.sh sudo dnf install -y \ atomic-registries \ autoconf \ automake \ + bash-completion \ bats \ bridge-utils \ btrfs-progs-devel \ diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index da7d457a5..c94e74a08 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -18,8 +18,16 @@ trap "sudo rm -rf $GOPATH" EXIT # Ensure there are no disruptive periodic services enabled by default in image systemd_banish +# Stop disruption upon boot ASAP after booting +echo "Disabling all packaging activity on boot" +# Don't let sed process sed's temporary files +_FILEPATHS=$(sudo ls -1 /etc/apt/apt.conf.d) +for filename in $_FILEPATHS; do \ + echo "Checking/Patching $filename" + sudo sed -i -r -e "s/$PERIODIC_APT_RE/"'\10"\;/' "/etc/apt/apt.conf.d/$filename"; done + echo "Updating/configuring package repositories." -$LILTO $SUDOAPTGET update +$BIGTO $SUDOAPTGET update echo "Upgrading all packages" $BIGTO $SUDOAPTGET upgrade @@ -41,6 +49,7 @@ $BIGTO $SUDOAPTGET install \ aufs-tools \ autoconf \ automake \ + bash-completion \ bats \ bison \ btrfs-tools \ |