mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 11:55:44 +03:00
Merge pull request #1960 from evverx/fix-ls-can-not-access
tests: fix ls: cannot access /var/tmp/systemd-test.*/journal/*/*.journal
This commit is contained in:
commit
66fac66cc5
@ -11,7 +11,7 @@ check_result_qemu() {
|
|||||||
mount ${LOOPDEV}p1 $TESTDIR/root
|
mount ${LOOPDEV}p1 $TESTDIR/root
|
||||||
[[ -e $TESTDIR/root/testok ]] && ret=0
|
[[ -e $TESTDIR/root/testok ]] && ret=0
|
||||||
[[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
|
[[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
|
||||||
[[ -f $TESTDIR/root/var/log/journal ]] && cp -a $TESTDIR/root/var/log/journal $TESTDIR
|
cp -a $TESTDIR/root/var/log/journal $TESTDIR
|
||||||
umount $TESTDIR/root
|
umount $TESTDIR/root
|
||||||
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
||||||
ls -l $TESTDIR/journal/*/*.journal
|
ls -l $TESTDIR/journal/*/*.journal
|
||||||
|
@ -13,7 +13,7 @@ check_result_qemu() {
|
|||||||
[[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
|
[[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
|
||||||
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
|
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
|
||||||
mount /dev/mapper/varcrypt $TESTDIR/root/var
|
mount /dev/mapper/varcrypt $TESTDIR/root/var
|
||||||
[[ -f $TESTDIR/root/var/log/journal ]] && cp -a $TESTDIR/root/var/log/journal $TESTDIR
|
cp -a $TESTDIR/root/var/log/journal $TESTDIR
|
||||||
umount $TESTDIR/root/var
|
umount $TESTDIR/root/var
|
||||||
umount $TESTDIR/root
|
umount $TESTDIR/root
|
||||||
cryptsetup luksClose /dev/mapper/varcrypt
|
cryptsetup luksClose /dev/mapper/varcrypt
|
||||||
|
Loading…
Reference in New Issue
Block a user