]> xenbits.xensource.com Git - people/aperard/osstest.git/commitdiff
TestSupport: With sysload, use short option of --load
authorAnthony PERARD <anthony.perard@citrix.com>
Wed, 3 Jan 2018 11:59:09 +0000 (11:59 +0000)
committerAnthony PERARD <anthony.perard@citrix.com>
Thu, 12 Jul 2018 15:49:19 +0000 (16:49 +0100)
The long option --load does not work on CentOS 6, but the short
one -p is working. Have check --help of sysctl on Debian.

Osstest/TestSupport.pm

index 73fcc4b24b7ef5822f630d1960b9eeb722d9d700..f7956dc7fc68ab56a561da53c9adaa31aac53565 100644 (file)
@@ -2894,7 +2894,8 @@ sub target_core_dump_setup ($) {
                  "kernel.core_pattern",
                  # %p==pid,%e==executable name,%t==timestamp
                  "/var/core/%t.%p.%e.core") });
-    target_cmd_root($ho, "sysctl --load /etc/sysctl.conf");
+      # --load doesn't work on CentOS 6, -p is supported everywhere
+    target_cmd_root($ho, "sysctl -p /etc/sysctl.conf");
     my $coredumps_conf = <<'END';
 #<domain>      <type>  <item>       <value>
 *               soft    core         -1