From a567261c0696d11110f6b90886bef6caf9fbca33 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 4 Jan 2014 08:45:39 -0500 Subject: [PATCH] fedostree/make-trees: Add a conf file, use split log files by default The conf file is necessary so I can run this on RHEL7, and use --enablerepo=fedora20. --- fedostree/fedostree-make-trees | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fedostree/fedostree-make-trees b/fedostree/fedostree-make-trees index 36bd7a53..598fba05 100755 --- a/fedostree/fedostree-make-trees +++ b/fedostree/fedostree-make-trees @@ -3,11 +3,19 @@ set -e set -x +DEFAULT_ENABLED_REPOS="--enablerepo=fedora --enablerepo=updates --enablerepo=walters-nss-altfiles" +DEFAULT_OS_ARGS="--os=fedora --os-version=20" +DEFAULT_PACKAGES="kernel ostree fedora-release lvm2 btrfs-progs e2fsprogs" + +if test -f ./fedostree.conf; then + . ./fedostree.conf +fi + docommit() { name=$1 shift echo "Starting rpm-ostree run at" $(date) - rpm-ostree --repo=repo --enablerepo=fedora --enablerepo=updates --enablerepo=walters-nss-altfiles create "${name}" kernel ostree fedora-release lvm2 btrfs-progs e2fsprogs "$@" + rpm-ostree --repo=repo ${ENABLED_REPOS:-${DEFAULT_ENABLED_REPOS}} ${OS_ARGS:-${DEFAULT_OS_ARGS}} create "${name}" ${PACKAGES:-${DEFAULT_PACKAGES}} "$@" > log-${name}.txt 2>&1 echo "Completed rpm-ostree run at" $(date) }