fix updating and installing packages in virt-builder

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D569
This commit is contained in:
Jan Sedlák 2015-09-10 09:30:59 +02:00
parent 08a84b73cc
commit a0e20004b5

View File

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