From a0e20004b53e0bae4db8323cdbab109118df969d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sedl=C3=A1k?= <jsedlak@redhat.com>
Date: Thu, 10 Sep 2015 09:30:59 +0200
Subject: [PATCH] fix updating and installing packages in virt-builder

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D569
---
 createhdds.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/createhdds.sh b/createhdds.sh
index 33fb8eb..6d164ad 100755
--- a/createhdds.sh
+++ b/createhdds.sh
@@ -38,8 +38,8 @@ function disk_minimal {
 version=$1
 arch=$2
 echo "Creating disk_f${version}_minimal_${arch}.img..."
-virt-builder fedora-${version} -o disk_f${version}_minimal_${arch}.img --arch ${arch} --run-command \
-  "setarch ${arch} dnf -y update" --selinux-relabel --root-password password:weakpassword > /dev/null
+virt-builder fedora-${version} -o disk_f${version}_minimal_${arch}.img --arch ${arch} --update --selinux-relabel \
+  --root-password password:weakpassword > /dev/null
 expect <<_EOF_
 log_user 0
 set timeout -1
@@ -66,9 +66,9 @@ echo "Creating disk_f${version}_desktop_${arch}.img..."
 # 3. install @Fedora Workstation group
 # 4. add new user on first boot
 # 5. use expect to do selinux relabelling and to set password for user
-virt-builder fedora-${version} -o disk_f${version}_desktop_${arch}.img --size 20G --arch ${arch} --run-command \
-  "setarch ${arch} dnf -y remove firewalld* && setarch ${arch} dnf -y update && setarch ${arch} dnf -y install @'Fedora Workstation'" \
-  --selinux-relabel --root-password password:weakpassword --firstboot-command 'useradd -m -p "" ejohn' > /dev/null
+virt-builder fedora-${version} -o disk_f${version}_desktop_${arch}.img --size 20G --arch ${arch} --update \
+  --run-command "dnf -y remove firewalld* && dnf -y install @'Fedora Workstation'" --selinux-relabel \
+  --root-password password:weakpassword --firstboot-command 'useradd -m -p "" ejohn' > /dev/null
 expect <<_EOF_
 log_user 0
 set timeout -1