diff --git a/tests/guests/Makefile.am b/tests/guests/Makefile.am index d1af37023..e29c2ebf7 100644 --- a/tests/guests/Makefile.am +++ b/tests/guests/Makefile.am @@ -21,6 +21,7 @@ EXTRA_DIST = \ guest-aux/make-debian-img.sh \ guest-aux/debian-packages \ guest-aux/make-fedora-img.pl \ + guest-aux/fedora-journal.tar.xz \ guest-aux/fedora-name.db.txt \ guest-aux/fedora-name.db \ guest-aux/fedora-packages.db.txt \ @@ -81,6 +82,7 @@ blank-%.img: # Make a (dummy) Fedora image. fedora.img: guest-aux/make-fedora-img.pl \ + guest-aux/fedora-journal.tar.xz \ guest-aux/fedora-name.db \ guest-aux/fedora-packages.db SRCDIR=$(srcdir) LAYOUT=partitions $(top_builddir)/run --test $< @@ -90,6 +92,7 @@ fedora.img: guest-aux/make-fedora-img.pl \ fedora-md1.img fedora-md2.img: stamp-fedora-md.img stamp-fedora-md.img: guest-aux/make-fedora-img.pl \ + guest-aux/fedora-journal.tar.xz \ guest-aux/fedora-name.db \ guest-aux/fedora-packages.db rm -f $@ @@ -99,6 +102,7 @@ stamp-fedora-md.img: guest-aux/make-fedora-img.pl \ touch $@ fedora-btrfs.img: guest-aux/make-fedora-img.pl \ + guest-aux/fedora-journal.tar.xz \ guest-aux/fedora-name.db \ guest-aux/fedora-packages.db SRCDIR=$(srcdir) LAYOUT=btrfs $(top_builddir)/run --test $< diff --git a/tests/guests/guest-aux/fedora-journal.tar.xz b/tests/guests/guest-aux/fedora-journal.tar.xz new file mode 100644 index 000000000..3f761ccc5 Binary files /dev/null and b/tests/guests/guest-aux/fedora-journal.tar.xz differ diff --git a/tests/guests/guest-aux/make-fedora-img.pl b/tests/guests/guest-aux/make-fedora-img.pl index 7b0e0aded..05f43f462 100755 --- a/tests/guests/guest-aux/make-fedora-img.pl +++ b/tests/guests/guest-aux/make-fedora-img.pl @@ -202,6 +202,7 @@ $g->mkdir ('/etc'); $g->mkdir ('/etc/sysconfig'); $g->mkdir ('/usr'); $g->mkdir_p ('/var/lib/rpm'); +$g->mkdir_p ('/var/log/journal'); $g->write ('/etc/shadow', "root::15440:0:99999:7:::\n"); $g->chmod (0, '/etc/shadow'); @@ -223,6 +224,8 @@ $g->upload ('guest-aux/fedora-packages.db', '/var/lib/rpm/Packages'); $g->upload ($ENV{SRCDIR}.'/../data/bin-x86_64-dynamic', '/bin/ls'); +$g->txz_in ('guest-aux/fedora-journal.tar.xz', '/var/log/journal'); + $g->mkdir ('/boot/grub'); $g->touch ('/boot/grub/grub.conf');