diff --git a/tests/regression/apparmor/mkprofile.pl b/tests/regression/apparmor/mkprofile.pl index 2ba52bda9..c012e3c9c 100755 --- a/tests/regression/apparmor/mkprofile.pl +++ b/tests/regression/apparmor/mkprofile.pl @@ -362,7 +362,7 @@ sub emit_flags($) { # generate profiles based on cmd line arguments sub gen_from_args() { my $bin = shift @ARGV; - !(-e $bin || $nowarn) && print STDERR "Warning: execname '$bin': no such file or directory\n"; + my $addimage = 0; unless ($nodefault) { gen_default_rules(); @@ -396,12 +396,18 @@ sub gen_from_args() { gen_hat($rule); } elsif ($rule =~ /^addimage:/) { gen_addimage($rule); + $addimage = 1; } else { gen_file($rule); } } + !(-e $bin || $addimage || $nowarn) && print STDERR "Warning: execname '$bin': no such file or directory\n"; + print STDOUT "# Profile autogenerated by $__VERSION__\n"; + if (not substr($bin, 0, 1) eq "/") { + print STDOUT "profile " + } print STDOUT "$bin "; emit_flags('__no_hat'); print STDOUT "{\n"; diff --git a/tests/regression/apparmor/prologue.inc b/tests/regression/apparmor/prologue.inc index 716ea7ac4..9d74ac94c 100755 --- a/tests/regression/apparmor/prologue.inc +++ b/tests/regression/apparmor/prologue.inc @@ -350,10 +350,6 @@ fi # mandatory after -- case "$1" in image=*) imagename=`echo $1 | sed 's/^image=\([^:]*\).*$/\1/'` - if [ ! -x "$imagename" ] - then - fatalerror "invalid imagename specified in input '$1'" - fi num_emitted=0 shift ;;