Merge pull request #5370 from hu-weihua/18bundle

I agree to merge.
2025-07-25 05:41:09 +00:00 · 2018-07-04 18:40:38 +08:00
parent 193f7f4737 ca5cc198b3
commit 55974d772a
10 changed files with 60 additions and 60 deletions
--- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
@@ -215,12 +215,12 @@ switchdiscover_range_z_V
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
 sles_migration1
 sles_migration2
--- a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle
@@ -212,12 +212,12 @@ nodeset_shell
 nodeset_cmdline
 nodeset_runimg
 nodeset_check_warninginfo
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
 sles_migration1
 sles_migration2
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -227,12 +227,12 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
 xcatconfig_c
 bmcdiscover_help
--- a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
@@ -225,12 +225,12 @@ switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
 nodeset_check_warninginfo
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
 xcatconfig_c
 bmcdiscover_help
--- a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
@@ -198,12 +198,12 @@ switchdiscover_range_z_V
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 sles_migration1
 sles_migration2
 reg_linux_statelite_installation_flat
--- a/xCAT-test/autotest/bundle/sles12_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12_x86_64.bundle
@@ -203,12 +203,12 @@ nodeset_shell
 nodeset_cmdline
 nodeset_runimg
 nodeset_check_warninginfo
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 reg_linux_diskless_installation_flat
 reg_linux_statelite_installation_flat
 SN_setup_case
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
@@ -258,12 +258,12 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_ubuntu
 xcatconfig_c
 bmcdiscover_help
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
@@ -262,12 +262,12 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 nodeset_check_warninginfo
 xcatconfig_u_check_xcatsslversion_ubuntu
 xcatconfig_c
--- a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
@@ -233,12 +233,12 @@ switchdiscover_range_r
 switchdiscover_range_x
 switchdiscover_range_z
 switchdiscover_range_z_V
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
--- a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
@@ -243,10 +243,10 @@ switchdiscover_range_z_V
 nodeset_shell
 nodeset_cmdline
 nodeset_runimg
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
 nodeset_check_warninginfo