Change checking nfs mount for PowerPC

by direct grep of mount command
because nfs mounting not traced in ananconda or packaging log.

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
This commit is contained in:
Michel Normand 2017-08-24 03:40:08 -04:00
parent 9fe10f6715
commit f3878c4380

View File

@ -20,9 +20,15 @@ sub run {
$repourl =~ s/^nfsvers=.://; $repourl =~ s/^nfsvers=.://;
# the above both checks if we're dealing with an NFS URL, and # the above both checks if we're dealing with an NFS URL, and
# strips the 'nfs:' and 'nfsvers=.:' from it if so # strips the 'nfs:' and 'nfsvers=.:' from it if so
if (get_var("OFW")) {
# for PowerPC mounting info may be not in anaconda.log
assert_script_run "mount |grep nfs |grep '${repourl}'";
}
else {
# message is in packaging.log up to F26, anaconda.log F27+ # message is in packaging.log up to F26, anaconda.log F27+
assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log"; assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log";
} }
}
else { else {
assert_script_run "grep \"added repo: 'anaconda'.*${repourl}\" /tmp/packaging.log"; assert_script_run "grep \"added repo: 'anaconda'.*${repourl}\" /tmp/packaging.log";
} }