Differential D565

relabel /etc when creating upgrade disk images
AbandonedPublic
Actions

Authored by adamwill on Sep 9 2015, 4:37 AM.

Details

Reviewers
garretraziel
jskladan
Summary

While working on changing the upgrade tests to use dnf, I found
that upgrades were failing seemingly because /etc/machine-id
was mislabelled (the upgrade process would succeed but there
were lots of errors caused by failed reads of that file, and
the upgraded system would fail to boot). restorecon'ing /etc
while we're doing stuff to the image seems to fix it.

Test Plan

Try the upgrade tests (PR coming soon, I hope) with disk
images created without this fix, then images created with this fix.
Also you can just boot a VM with the images and check the context of
/etc/machine-id (and look out for the error messages).

Diff Detail

Repository
rOPENQA fedora_openqa
Branch
etc-selinux
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 181
Build 181: arc lint + arc unit
adamwill retitled this revision from to relabel /etc when creating upgrade disk images.Sep 9 2015, 4:37 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: garretraziel, jskladan.
jskladan accepted this revision.Sep 9 2015, 7:44 AM
This revision is now accepted and ready to land.Sep 9 2015, 7:44 AM
adamwill added a comment.Sep 9 2015, 7:47 AM

seems this may actually be a consequence of a virt-builder bug, so holding fire for now.

garretraziel added a comment.Sep 9 2015, 8:28 AM

Yes, this is OK, but I don't think that this should be necessary, because whole system should be relabeled - it seems like there is a bug in virt-builder that is preventing it. As soon as https://bugzilla.redhat.com/show_bug.cgi?id=1261377 gets fixed, this won't be necessary.

adamwill abandoned this revision.Sep 10 2015, 2:38 PM

The problem indeed seems to be fixed by the virt-builder update, so no need for this.

Revision Contents

PathPackages
Mtools/createhdds.sh (4 lines)

Diff 1470

View Options

tools/createhdds.sh

Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Line(s)
46 46​
47spawn qemu-kvm -m 2G -nographic disk_f${version}_minimal_${arch}.img 47​spawn qemu-kvm -m 2G -nographic disk_f${version}_minimal_${arch}.img
48 48​
49expect "localhost login:" 49​expect "localhost login:"
50send "root\r" 50​send "root\r"
51expect "Password:" 51​expect "Password:"
52send "weakpassword\r" 52​send "weakpassword\r"
53expect "~]#" 53​expect "~]#"
54​send "restorecon -vr /etc\r"
55​expect "~]#"
54send "poweroff\r" 56​send "poweroff\r"
55expect "reboot: Power down" 57​expect "reboot: Power down"
56_EOF_ 58​_EOF_
57} 59​}
58 60​
59function disk_desktop { 61​function disk_desktop {
60version=$1 62​version=$1
61arch=$2 63​arch=$2
Show All 13 Lines
75 77​
76spawn qemu-kvm -m 2G -nographic disk_f${version}_desktop_${arch}.img 78​spawn qemu-kvm -m 2G -nographic disk_f${version}_desktop_${arch}.img
77 79​
78expect "localhost login:" 80​expect "localhost login:"
79send "root\r" 81​send "root\r"
80expect "Password:" 82​expect "Password:"
81send "weakpassword\r" 83​send "weakpassword\r"
82expect "~]#" 84​expect "~]#"
85​send "restorecon -vr /etc\r"
86​expect "~]#"
83send "systemctl set-default graphical.target\r" 87​send "systemctl set-default graphical.target\r"
84send "echo 'ejohn:weakpassword' | chpasswd\r" 88​send "echo 'ejohn:weakpassword' | chpasswd\r"
85send "poweroff\r" 89​send "poweroff\r"
86expect "reboot: Power down" 90​expect "reboot: Power down"
87_EOF_ 91​_EOF_
88} 92​}
89 93​
90function disk_ks { 94​function disk_ks {
▲ Show 20 Lines • Show All 100 Lines • Show Last 20 Lines