]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ktest: Allow initrd processing without modules defined
authorSteven Rostedt <srostedt@redhat.com>
Mon, 13 Jun 2011 15:09:22 +0000 (11:09 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Mon, 13 Jun 2011 15:09:22 +0000 (11:09 -0400)
When a config is set with CONFIG_MODULES=n, it does not mean that the
kernel does not need an initrd to boot. For systems that depend on LVM
and such, an initrd must run first.

If POST_INSTALL is defined, then run the post install regardless if
modules are needed or not.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
tools/testing/ktest/ktest.pl

index 83dcfaf0cac4b0a9a5ec2a29fe581c0662d6e840..fb46e12eb1d7d6fa5399f99eaac5e647f36c758c 100755 (executable)
@@ -1031,6 +1031,16 @@ sub monitor {
     return 1;
 }
 
+sub do_post_install {
+
+    return if (!defined($post_install));
+
+    my $cp_post_install = $post_install;
+    $cp_post_install =~ s/\$KERNEL_VERSION/$version/g;
+    run_command "$cp_post_install" or
+       dodie "Failed to run post install";
+}
+
 sub install {
 
     run_scp "$outputdir/$build_target", "$target_image" or
@@ -1050,6 +1060,7 @@ sub install {
     close(IN);
 
     if (!$install_mods) {
+       do_post_install;
        doprint "No modules needed\n";
        return;
     }
@@ -1077,12 +1088,7 @@ sub install {
 
     run_ssh "rm -f /tmp/$modtar";
 
-    return if (!defined($post_install));
-
-    my $cp_post_install = $post_install;
-    $cp_post_install =~ s/\$KERNEL_VERSION/$version/g;
-    run_command "$cp_post_install" or
-       dodie "Failed to run post install";
+    do_post_install;
 }
 
 sub check_buildlog {