diff --git a/ncm-freeipa/src/main/perl/freeipa.pm b/ncm-freeipa/src/main/perl/freeipa.pm index ef1ee5e2f3..83bbdca961 100755 --- a/ncm-freeipa/src/main/perl/freeipa.pm +++ b/ncm-freeipa/src/main/perl/freeipa.pm @@ -586,7 +586,7 @@ sub _manual_initialisation my @yum; if (@cli_packages) { push(@yum, qw(yum -y install), @cli_packages); - push(@yum, qw(-c /tmp/aii/yum/yum.conf)) if $opts{aii}; + push(@yum, qw(-c /var/tmp/aii/yum/yum.conf)) if $opts{aii}; } diff --git a/ncm-freeipa/src/test/perl/aii-basic.t b/ncm-freeipa/src/test/perl/aii-basic.t index f97446f17e..565d9f29e1 100644 --- a/ncm-freeipa/src/test/perl/aii-basic.t +++ b/ncm-freeipa/src/test/perl/aii-basic.t @@ -58,7 +58,7 @@ ok(POST_history_ok([ ]), "host_add / host_mod called"); -like($fh, qr(^yum -y install ncm-freeipa-\d+\.\d+\.\d+-\w+ nss-pam-ldapd ipa-client nss-tools openssl pam_krb5 -c /tmp/aii/yum/yum.conf$)m, +like($fh, qr(^yum -y install ncm-freeipa-\d+\.\d+\.\d+-\w+ nss-pam-ldapd ipa-client nss-tools openssl pam_krb5 -c /var/tmp/aii/yum/yum.conf$)m, "install freeipa component and CLI dependencies in post_reboot"); like($fh, qr(^PERL5LIB=/usr/lib/perl perl -MNCM::Component::FreeIPA::CLI -w -e install -- --realm MY.REALM --primary myhost.example.com --domain com --fqdn myhost.example.com --hostcert 1 --otp 'superse\\\$cret\\\$OTP'$)m, "CLI called as expected"); diff --git a/ncm-opennebula/src/main/perl/OpenNebula/AII.pm b/ncm-opennebula/src/main/perl/OpenNebula/AII.pm index bb3d1ff58e..1723e2056b 100644 --- a/ncm-opennebula/src/main/perl/OpenNebula/AII.pm +++ b/ncm-opennebula/src/main/perl/OpenNebula/AII.pm @@ -279,7 +279,7 @@ sub aii_post_reboot my $tree = $config->getElement($path)->getTree(); print <aii_post_reboot($cfg, $path); -like($fh, qr{^yum\s-c\s/tmp/aii/yum/yum.conf\s-y\sinstall\sacpid}m, 'yum install acpid present'); +like($fh, qr{^yum\s-c\s/var/tmp/aii/yum/yum.conf\s-y\sinstall\sacpid}m, 'yum install acpid present'); like($fh, qr{^service\sacpid\sstart}m, 'service acpid restart present'); # close the selected FH and reset STDOUT