From 208da5f60529d3fb32dde8f8c3ce90511821cbd5 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 13 Apr 2015 13:51:51 -0400 Subject: [PATCH] Update packages earlier Turns out that updating packages last causes some pretty non-intuitive behaviour if you are trying to pin a package to a specific version. Lets just update the base RPMs first... subsequent installations should install the most updated version anyways (unless they are pinned). Also moves the package-installs script from the 00 step to 01 so we can do the update first. Co-Authored-By: Ben Nemec Change-Id: I962046cc6048e852e6582fbc579f88bb73e23fdd --- elements/base/install.d/00-up-to-date | 11 +++++++++++ elements/base/install.d/99-up-to-date | 11 ----------- elements/package-installs/install.d/00-package-installs | 10 ---------- elements/package-installs/install.d/01-package-installs | 10 ++++++++++ 4 files changed, 21 insertions(+), 21 deletions(-) create mode 100755 elements/base/install.d/00-up-to-date delete mode 100755 elements/base/install.d/99-up-to-date delete mode 100755 elements/package-installs/install.d/00-package-installs create mode 100755 elements/package-installs/install.d/01-package-installs diff --git a/elements/base/install.d/00-up-to-date b/elements/base/install.d/00-up-to-date new file mode 100755 index 0000000..d2b45d7 --- /dev/null +++ b/elements/base/install.d/00-up-to-date @@ -0,0 +1,11 @@ +#!/bin/bash +# Fully upgrade everything on the system (if the package manager knows how to +# do it). + +if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +install-packages -u diff --git a/elements/base/install.d/99-up-to-date b/elements/base/install.d/99-up-to-date deleted file mode 100755 index d2b45d7..0000000 --- a/elements/base/install.d/99-up-to-date +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Fully upgrade everything on the system (if the package manager knows how to -# do it). - -if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then - set -x -fi -set -eu -set -o pipefail - -install-packages -u diff --git a/elements/package-installs/install.d/00-package-installs b/elements/package-installs/install.d/00-package-installs deleted file mode 100755 index e64cbc7..0000000 --- a/elements/package-installs/install.d/00-package-installs +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then - set -x -fi -set -eu -set -o pipefail - -package-installs -d $(dirname $0) -package-installs-v2 --phase install.d /tmp/package-installs.json diff --git a/elements/package-installs/install.d/01-package-installs b/elements/package-installs/install.d/01-package-installs new file mode 100755 index 0000000..e64cbc7 --- /dev/null +++ b/elements/package-installs/install.d/01-package-installs @@ -0,0 +1,10 @@ +#!/bin/bash + +if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +package-installs -d $(dirname $0) +package-installs-v2 --phase install.d /tmp/package-installs.json -- 1.9.1