From 9cfbf211b381ac6c1ca7afc5cb9c9c144524789c Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sat, 9 Jul 2022 17:59:59 -0500 Subject: [PATCH] Update: Use "settings" instead of "setting" for better consistency between fake program and controller program. Featureless Make is using "settings" and the Controller program is using "setting". Fix this inconsistency. The term "settings" sounds more accurate than "setting". --- level_3/controller/c/common.c | 8 ++++---- level_3/controller/c/common.h | 12 ++++++------ level_3/controller/c/common/private-common.c | 2 +- level_3/controller/c/common/private-common.h | 6 +++--- level_3/controller/c/entry/private-entry.c | 4 ++-- level_3/controller/c/rule/private-rule.c | 4 ++-- level_3/controller/c/rule/private-rule_print.c | 2 +- level_3/controller/data/settings/entries/default.entry | 2 +- level_3/controller/data/settings/entries/maintenance.entry | 2 +- .../data/settings/example/entries/asynchronous.entry | 2 +- .../data/settings/example/entries/delay-program.entry | 2 +- .../data/settings/example/entries/delay-service.entry | 2 +- .../data/settings/example/entries/htop-alternate.entry | 2 +- .../data/settings/example/entries/htop-command.entry | 2 +- level_3/controller/data/settings/example/entries/htop.entry | 2 +- level_3/controller/data/settings/example/entries/iki.entry | 2 +- .../data/settings/example/entries/serial-alternate.entry | 2 +- level_3/controller/data/settings/example/entries/up.entry | 2 +- .../data/settings/example/rules/asynchronous/sleep_1.rule | 2 +- .../data/settings/example/rules/asynchronous/sleep_10.rule | 2 +- .../data/settings/example/rules/asynchronous/sleep_2.rule | 2 +- .../data/settings/example/rules/asynchronous/sleep_3.rule | 2 +- .../data/settings/example/rules/asynchronous/sleep_5.rule | 2 +- .../data/settings/example/rules/asynchronous/sleep_8.rule | 2 +- .../controller/data/settings/example/rules/command/htop.rule | 2 +- .../data/settings/example/rules/command/multiple.rule | 2 +- .../controller/data/settings/example/rules/delay/long.rule | 2 +- .../controller/data/settings/example/rules/delay/short.rule | 2 +- .../data/settings/example/rules/environment/default.rule | 2 +- .../data/settings/example/rules/environment/empty.rule | 2 +- .../data/settings/example/rules/environment/exported.rule | 2 +- .../data/settings/example/rules/environment/exporting.rule | 2 +- .../data/settings/example/rules/maintenance/boom.rule | 2 +- .../settings/example/rules/script/create_socket_path.rule | 2 +- .../controller/data/settings/example/rules/script/fail.rule | 2 +- .../controller/data/settings/example/rules/script/iki.rule | 2 +- .../controller/data/settings/example/rules/script/php.rule | 2 +- .../data/settings/example/rules/script/python.rule | 2 +- .../data/settings/example/rules/script/require_me.rule | 2 +- .../data/settings/example/rules/script/succeed.rule | 2 +- .../controller/data/settings/example/rules/serial/s_1.rule | 2 +- .../controller/data/settings/example/rules/serial/s_2.rule | 2 +- .../controller/data/settings/example/rules/serial/s_3.rule | 2 +- .../controller/data/settings/example/rules/serial/s_4.rule | 2 +- .../controller/data/settings/example/rules/serial/s_5.rule | 2 +- .../controller/data/settings/example/rules/serial/s_6.rule | 2 +- .../controller/data/settings/example/rules/service/sshd.rule | 2 +- .../data/settings/example/rules/utility/sleeper_1.rule | 2 +- .../data/settings/example/rules/utility/sleeper_2.rule | 2 +- .../data/settings/example/rules/utility/sleeper_3.rule | 2 +- level_3/controller/data/settings/rules/boot/devices.rule | 2 +- level_3/controller/data/settings/rules/boot/file_system.rule | 2 +- level_3/controller/data/settings/rules/boot/modules.rule | 2 +- level_3/controller/data/settings/rules/boot/proc.rule | 2 +- level_3/controller/data/settings/rules/boot/root.rule | 2 +- .../controller/data/settings/rules/maintenance/console.rule | 2 +- level_3/controller/data/settings/rules/net/all.rule | 2 +- level_3/controller/data/settings/rules/net/loopback.rule | 2 +- level_3/controller/data/settings/rules/service/dbus.rule | 2 +- level_3/controller/data/settings/rules/service/logger.rule | 2 +- level_3/controller/data/settings/rules/service/mouse.rule | 2 +- level_3/controller/data/settings/rules/task/clock.rule | 2 +- level_3/controller/data/settings/rules/task/keyboard.rule | 2 +- level_3/controller/data/settings/rules/task/ntpdate.rule | 2 +- level_3/controller/data/settings/rules/terminal/four.rule | 2 +- level_3/controller/data/settings/rules/terminal/one.rule | 2 +- level_3/controller/data/settings/rules/terminal/three.rule | 2 +- level_3/controller/data/settings/rules/terminal/two.rule | 2 +- level_3/controller/documents/entry.txt | 2 +- level_3/controller/documents/exit.txt | 2 +- level_3/controller/documents/rule.txt | 4 ++-- level_3/controller/specifications/entry.txt | 2 +- level_3/controller/specifications/exit.txt | 2 +- level_3/controller/specifications/rule.txt | 8 ++++---- level_3/fake/c/private-common.h | 2 +- 75 files changed, 91 insertions(+), 91 deletions(-) diff --git a/level_3/controller/c/common.c b/level_3/controller/c/common.c index 30db3ed..3d4d102 100644 --- a/level_3/controller/c/common.c +++ b/level_3/controller/c/common.c @@ -438,8 +438,8 @@ extern "C" { return controller_rule_item_type_service_e; } - if (fl_string_dynamic_compare(item, controller_setting_s) == F_equal_to) { - return controller_rule_item_type_setting_e; + if (fl_string_dynamic_compare(item, controller_settings_s) == F_equal_to) { + return controller_rule_item_type_settings_e; } if (fl_string_dynamic_compare(item, controller_utility_s) == F_equal_to) { @@ -463,8 +463,8 @@ extern "C" { case controller_rule_item_type_service_e: return controller_service_s; - case controller_rule_item_type_setting_e: - return controller_setting_s; + case controller_rule_item_type_settings_e: + return controller_settings_s; case controller_rule_item_type_utility_e: return controller_utility_s; diff --git a/level_3/controller/c/common.h b/level_3/controller/c/common.h index 2e851c7..f436b54 100644 --- a/level_3/controller/c/common.h +++ b/level_3/controller/c/common.h @@ -399,18 +399,18 @@ extern "C" { * Codes representing rule items. * * controller_rule_item_type_*: - * - command: The item type represents a command operation. - * - script: The item type represents a script operation. - * - service: The item type represents a service operation. - * - setting: The item type represents a setting operation. - * - utility: The item type represents a utility operation. + * - command: The item type represents a command operation. + * - script: The item type represents a script operation. + * - service: The item type represents a service operation. + * - settings: The item type represents a setting operation. + * - utility: The item type represents a utility operation. */ #ifndef _di_controller_rule_item_types_t_ enum { controller_rule_item_type_command_e = 1, controller_rule_item_type_script_e, controller_rule_item_type_service_e, - controller_rule_item_type_setting_e, + controller_rule_item_type_settings_e, controller_rule_item_type_utility_e, }; #endif // _di_controller_rule_item_types_t_ diff --git a/level_3/controller/c/common/private-common.c b/level_3/controller/c/common/private-common.c index 6cb1c2e..4bdee30 100644 --- a/level_3/controller/c/common/private-common.c +++ b/level_3/controller/c/common/private-common.c @@ -104,7 +104,7 @@ extern "C" { const f_string_static_t controller_scheduler_s = macro_f_string_static_t_initialize(CONTROLLER_scheduler_s, 0, CONTROLLER_scheduler_s_length); const f_string_static_t controller_script_s = macro_f_string_static_t_initialize(CONTROLLER_script_s, 0, CONTROLLER_script_s_length); const f_string_static_t controller_service_s = macro_f_string_static_t_initialize(CONTROLLER_service_s, 0, CONTROLLER_service_s_length); - const f_string_static_t controller_setting_s = macro_f_string_static_t_initialize(CONTROLLER_setting_s, 0, CONTROLLER_setting_s_length); + const f_string_static_t controller_settings_s = macro_f_string_static_t_initialize(CONTROLLER_settings_s, 0, CONTROLLER_settings_s_length); const f_string_static_t controller_session_s = macro_f_string_static_t_initialize(CONTROLLER_session_s, 0, CONTROLLER_session_s_length); const f_string_static_t controller_session_new_s = macro_f_string_static_t_initialize(CONTROLLER_session_new_s, 0, CONTROLLER_session_new_s_length); const f_string_static_t controller_session_same_s = macro_f_string_static_t_initialize(CONTROLLER_session_same_s, 0, CONTROLLER_session_same_s_length); diff --git a/level_3/controller/c/common/private-common.h b/level_3/controller/c/common/private-common.h index c528612..8b68e04 100644 --- a/level_3/controller/c/common/private-common.h +++ b/level_3/controller/c/common/private-common.h @@ -131,7 +131,7 @@ extern "C" { #define CONTROLLER_session_s "session" #define CONTROLLER_session_new_s "session_new" #define CONTROLLER_session_same_s "session_same" - #define CONTROLLER_setting_s "setting" + #define CONTROLLER_settings_s "settings" #define CONTROLLER_sigpending_s "sigpending" #define CONTROLLER_show_s "show" #define CONTROLLER_shutdown_s "shutdown" @@ -262,7 +262,7 @@ extern "C" { #define CONTROLLER_session_s_length 7 #define CONTROLLER_session_new_s_length 11 #define CONTROLLER_session_same_s_length 12 - #define CONTROLLER_setting_s_length 7 + #define CONTROLLER_settings_s_length 8 #define CONTROLLER_show_s_length 4 #define CONTROLLER_shutdown_s_length 8 #define CONTROLLER_sigpending_s_length 10 @@ -393,7 +393,7 @@ extern "C" { extern const f_string_static_t controller_session_s; extern const f_string_static_t controller_session_new_s; extern const f_string_static_t controller_session_same_s; - extern const f_string_static_t controller_setting_s; + extern const f_string_static_t controller_settings_s; extern const f_string_static_t controller_show_s; extern const f_string_static_t controller_shutdown_s; extern const f_string_static_t controller_sigpending_s; diff --git a/level_3/controller/c/entry/private-entry.c b/level_3/controller/c/entry/private-entry.c index c8f2d70..6f9473c 100644 --- a/level_3/controller/c/entry/private-entry.c +++ b/level_3/controller/c/entry/private-entry.c @@ -687,7 +687,7 @@ extern "C" { if (fl_string_dynamic_compare(controller_main_s, actions->array[cache->ats.array[at_j]].parameters.array[0]) == F_equal_to) { continue; } - else if (fl_string_dynamic_compare(controller_setting_s, actions->array[cache->ats.array[at_j]].parameters.array[0]) == F_equal_to) { + else if (fl_string_dynamic_compare(controller_settings_s, actions->array[cache->ats.array[at_j]].parameters.array[0]) == F_equal_to) { continue; } @@ -1700,7 +1700,7 @@ extern "C" { entry->items.used = 1; } } - else if (fl_string_dynamic_compare(controller_setting_s, cache->action.name_item) == F_equal_to) { + else if (fl_string_dynamic_compare(controller_settings_s, cache->action.name_item) == F_equal_to) { status = controller_entry_settings_read(global, is_entry, *range, cache); continue; diff --git a/level_3/controller/c/rule/private-rule.c b/level_3/controller/c/rule/private-rule.c index d2ebfe8..7ae1c89 100644 --- a/level_3/controller/c/rule/private-rule.c +++ b/level_3/controller/c/rule/private-rule.c @@ -1171,7 +1171,7 @@ extern "C" { for (i = 0; i < process->rule.items.used && controller_thread_is_enabled_process(process, global.thread); ++i) { - if (process->rule.items.array[i].type == controller_rule_item_type_setting_e) continue; + if (process->rule.items.array[i].type == controller_rule_item_type_settings_e) continue; for (j = 0; j < process->rule.items.array[i].actions.used; ++j) { @@ -3804,7 +3804,7 @@ extern "C" { break; } - if (fl_string_dynamic_compare(controller_setting_s, cache->action.name_item) == F_equal_to) { + if (fl_string_dynamic_compare(controller_settings_s, cache->action.name_item) == F_equal_to) { rule->items.array[rule->items.used].type = 0; } else if (fl_string_dynamic_compare(controller_command_s, cache->action.name_item) == F_equal_to) { diff --git a/level_3/controller/c/rule/private-rule_print.c b/level_3/controller/c/rule/private-rule_print.c index 543933f..0f6a730 100644 --- a/level_3/controller/c/rule/private-rule_print.c +++ b/level_3/controller/c/rule/private-rule_print.c @@ -45,7 +45,7 @@ extern "C" { } if (cache.name_item.used) { - fl_print_format("rule %r '%]", print.to.stream, item ? controller_item_s : controller_setting_s, print.context); + fl_print_format("rule %r '%]", print.to.stream, item ? controller_item_s : controller_settings_s, print.context); fl_print_format("%[%Q%]", print.to.stream, print.notable, cache.name_item, print.notable); fl_print_format("%[' on line%] ", print.to.stream, print.context, print.context); fl_print_format("%[%un%]", print.to.stream, print.notable, cache.line_item, print.notable); diff --git a/level_3/controller/data/settings/entries/default.entry b/level_3/controller/data/settings/entries/default.entry index 8d043a8..1330803 100644 --- a/level_3/controller/data/settings/entries/default.entry +++ b/level_3/controller/data/settings/entries/default.entry @@ -3,7 +3,7 @@ # A very basic boot process. # -setting: +settings: pid ready show init diff --git a/level_3/controller/data/settings/entries/maintenance.entry b/level_3/controller/data/settings/entries/maintenance.entry index 15a948b..2c6a6c7 100644 --- a/level_3/controller/data/settings/entries/maintenance.entry +++ b/level_3/controller/data/settings/entries/maintenance.entry @@ -3,7 +3,7 @@ # A boot to bash process. # -setting: +settings: pid disable show init diff --git a/level_3/controller/data/settings/example/entries/asynchronous.entry b/level_3/controller/data/settings/example/entries/asynchronous.entry index 5314a4f..8d2756e 100644 --- a/level_3/controller/data/settings/example/entries/asynchronous.entry +++ b/level_3/controller/data/settings/example/entries/asynchronous.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: mode program main: diff --git a/level_3/controller/data/settings/example/entries/delay-program.entry b/level_3/controller/data/settings/example/entries/delay-program.entry index c88c9f7..e5fb3b5 100644 --- a/level_3/controller/data/settings/example/entries/delay-program.entry +++ b/level_3/controller/data/settings/example/entries/delay-program.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: mode program main: diff --git a/level_3/controller/data/settings/example/entries/delay-service.entry b/level_3/controller/data/settings/example/entries/delay-service.entry index 2e41157..da9ee04 100644 --- a/level_3/controller/data/settings/example/entries/delay-service.entry +++ b/level_3/controller/data/settings/example/entries/delay-service.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: mode service main: diff --git a/level_3/controller/data/settings/example/entries/htop-alternate.entry b/level_3/controller/data/settings/example/entries/htop-alternate.entry index 0de943c..3c8bed6 100644 --- a/level_3/controller/data/settings/example/entries/htop-alternate.entry +++ b/level_3/controller/data/settings/example/entries/htop-alternate.entry @@ -3,7 +3,7 @@ # This example shows how htop can be started during the exit process rather than the entry. # See the htop-alternate.exit example. -setting: +settings: mode program control htop.socket diff --git a/level_3/controller/data/settings/example/entries/htop-command.entry b/level_3/controller/data/settings/example/entries/htop-command.entry index 190f47b..19dae00 100644 --- a/level_3/controller/data/settings/example/entries/htop-command.entry +++ b/level_3/controller/data/settings/example/entries/htop-command.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: mode program control htop.socket diff --git a/level_3/controller/data/settings/example/entries/htop.entry b/level_3/controller/data/settings/example/entries/htop.entry index 70ea564..ff78686 100644 --- a/level_3/controller/data/settings/example/entries/htop.entry +++ b/level_3/controller/data/settings/example/entries/htop.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: mode program control htop.socket diff --git a/level_3/controller/data/settings/example/entries/iki.entry b/level_3/controller/data/settings/example/entries/iki.entry index 5e05ca1..9a04ab8 100644 --- a/level_3/controller/data/settings/example/entries/iki.entry +++ b/level_3/controller/data/settings/example/entries/iki.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: mode program main: diff --git a/level_3/controller/data/settings/example/entries/serial-alternate.entry b/level_3/controller/data/settings/example/entries/serial-alternate.entry index 9482bfc..ecfabbc 100644 --- a/level_3/controller/data/settings/example/entries/serial-alternate.entry +++ b/level_3/controller/data/settings/example/entries/serial-alternate.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: mode program main: diff --git a/level_3/controller/data/settings/example/entries/up.entry b/level_3/controller/data/settings/example/entries/up.entry index c22112f..c38b6cd 100644 --- a/level_3/controller/data/settings/example/entries/up.entry +++ b/level_3/controller/data/settings/example/entries/up.entry @@ -1,6 +1,6 @@ # fss-0005 -setting: +settings: control controller/run/up.socket pid ready pid_file controller/run/up.pid diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_1.rule b/level_3/controller/data/settings/example/rules/asynchronous/sleep_1.rule index 3a6a241..f722689 100644 --- a/level_3/controller/data/settings/example/rules/asynchronous/sleep_1.rule +++ b/level_3/controller/data/settings/example/rules/asynchronous/sleep_1.rule @@ -3,7 +3,7 @@ # Note: The example setting "limit nice 1 2" may cause this rule to fail if the user has insufficient privileges granted by ulimits or some other system security measure. # -setting: +settings: name "Sleep 1 Seconds." nice 15 limit nice 1 2 diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_10.rule b/level_3/controller/data/settings/example/rules/asynchronous/sleep_10.rule index a77d9e5..8734190 100644 --- a/level_3/controller/data/settings/example/rules/asynchronous/sleep_10.rule +++ b/level_3/controller/data/settings/example/rules/asynchronous/sleep_10.rule @@ -3,7 +3,7 @@ # Note: The example setting "limit nice 1 2" may cause this rule to fail if the user has insufficient privileges granted by ulimits or some other system security measure. # -setting: +settings: name "Sleep 10 Seconds." nice 15 limit nice 1 2 diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_2.rule b/level_3/controller/data/settings/example/rules/asynchronous/sleep_2.rule index 039fa57..c854695 100644 --- a/level_3/controller/data/settings/example/rules/asynchronous/sleep_2.rule +++ b/level_3/controller/data/settings/example/rules/asynchronous/sleep_2.rule @@ -3,7 +3,7 @@ # Note: The example setting "limit nice 1 2" may cause this rule to fail if the user has insufficient privileges granted by ulimits or some other system security measure. # -setting: +settings: name "Sleep 2 Seconds." nice 15 limit nice 1 2 diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_3.rule b/level_3/controller/data/settings/example/rules/asynchronous/sleep_3.rule index 6ea17c1..ad3d8f9 100644 --- a/level_3/controller/data/settings/example/rules/asynchronous/sleep_3.rule +++ b/level_3/controller/data/settings/example/rules/asynchronous/sleep_3.rule @@ -3,7 +3,7 @@ # Note: The example setting "limit nice 1 2" may cause this rule to fail if the user has insufficient privileges granted by ulimits or some other system security measure. # -setting: +settings: name "Sleep 3 Seconds." nice 15 limit nice 1 2 diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_5.rule b/level_3/controller/data/settings/example/rules/asynchronous/sleep_5.rule index 3440eaa..e4ed3db 100644 --- a/level_3/controller/data/settings/example/rules/asynchronous/sleep_5.rule +++ b/level_3/controller/data/settings/example/rules/asynchronous/sleep_5.rule @@ -3,7 +3,7 @@ # Note: The example setting "limit nice 1 2" may cause this rule to fail if the user has insufficient privileges granted by ulimits or some other system security measure. # -setting: +settings: name "Sleep 5 Seconds." nice 15 limit nice 1 2 diff --git a/level_3/controller/data/settings/example/rules/asynchronous/sleep_8.rule b/level_3/controller/data/settings/example/rules/asynchronous/sleep_8.rule index fadc8d7..a9af412 100644 --- a/level_3/controller/data/settings/example/rules/asynchronous/sleep_8.rule +++ b/level_3/controller/data/settings/example/rules/asynchronous/sleep_8.rule @@ -3,7 +3,7 @@ # Note: The example setting "limit nice 1 2" may cause this rule to fail if the user has insufficient privileges granted by ulimits or some other system security measure. # -setting: +settings: name "Sleep 8 Seconds." nice 15 limit nice 1 2 diff --git a/level_3/controller/data/settings/example/rules/command/htop.rule b/level_3/controller/data/settings/example/rules/command/htop.rule index af43951..197ad86 100644 --- a/level_3/controller/data/settings/example/rules/command/htop.rule +++ b/level_3/controller/data/settings/example/rules/command/htop.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Run htop" command: diff --git a/level_3/controller/data/settings/example/rules/command/multiple.rule b/level_3/controller/data/settings/example/rules/command/multiple.rule index 82760c9..8b3fd73 100644 --- a/level_3/controller/data/settings/example/rules/command/multiple.rule +++ b/level_3/controller/data/settings/example/rules/command/multiple.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Multiple Commands: id, whoami, date, etc.." capability "all=" control_group new memory/example diff --git a/level_3/controller/data/settings/example/rules/delay/long.rule b/level_3/controller/data/settings/example/rules/delay/long.rule index e9557a6..19ebc2a 100644 --- a/level_3/controller/data/settings/example/rules/delay/long.rule +++ b/level_3/controller/data/settings/example/rules/delay/long.rule @@ -3,7 +3,7 @@ # Rule for a long delay. # -setting: +settings: name "Delay for 3 minutes." script: diff --git a/level_3/controller/data/settings/example/rules/delay/short.rule b/level_3/controller/data/settings/example/rules/delay/short.rule index f014a22..12e0856 100644 --- a/level_3/controller/data/settings/example/rules/delay/short.rule +++ b/level_3/controller/data/settings/example/rules/delay/short.rule @@ -3,7 +3,7 @@ # Rule for a short delay. # -setting: +settings: name "Delay for 3 seconds." script: diff --git a/level_3/controller/data/settings/example/rules/environment/default.rule b/level_3/controller/data/settings/example/rules/environment/default.rule index 9b21b7a..8c34d8c 100644 --- a/level_3/controller/data/settings/example/rules/environment/default.rule +++ b/level_3/controller/data/settings/example/rules/environment/default.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Environment default" engine bash diff --git a/level_3/controller/data/settings/example/rules/environment/empty.rule b/level_3/controller/data/settings/example/rules/environment/empty.rule index 7305fa8..532da0c 100644 --- a/level_3/controller/data/settings/example/rules/environment/empty.rule +++ b/level_3/controller/data/settings/example/rules/environment/empty.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Environment set to nothing" environment engine bash diff --git a/level_3/controller/data/settings/example/rules/environment/exported.rule b/level_3/controller/data/settings/example/rules/environment/exported.rule index 66e5183..2e01c29 100644 --- a/level_3/controller/data/settings/example/rules/environment/exported.rule +++ b/level_3/controller/data/settings/example/rules/environment/exported.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Environment with PATH" environment PATH engine bash diff --git a/level_3/controller/data/settings/example/rules/environment/exporting.rule b/level_3/controller/data/settings/example/rules/environment/exporting.rule index d02cf22..7b874c2 100644 --- a/level_3/controller/data/settings/example/rules/environment/exporting.rule +++ b/level_3/controller/data/settings/example/rules/environment/exporting.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Environment with PATH" environment PATH custom_variable engine bash diff --git a/level_3/controller/data/settings/example/rules/maintenance/boom.rule b/level_3/controller/data/settings/example/rules/maintenance/boom.rule index 170a27b..7278506 100644 --- a/level_3/controller/data/settings/example/rules/maintenance/boom.rule +++ b/level_3/controller/data/settings/example/rules/maintenance/boom.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Explosion!" engine sh diff --git a/level_3/controller/data/settings/example/rules/script/create_socket_path.rule b/level_3/controller/data/settings/example/rules/script/create_socket_path.rule index b689b60..796b366 100644 --- a/level_3/controller/data/settings/example/rules/script/create_socket_path.rule +++ b/level_3/controller/data/settings/example/rules/script/create_socket_path.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Create Socket Path" parameter verbose -v diff --git a/level_3/controller/data/settings/example/rules/script/fail.rule b/level_3/controller/data/settings/example/rules/script/fail.rule index ec101ef..dd77b41 100644 --- a/level_3/controller/data/settings/example/rules/script/fail.rule +++ b/level_3/controller/data/settings/example/rules/script/fail.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Script #2" on start need script succeed diff --git a/level_3/controller/data/settings/example/rules/script/iki.rule b/level_3/controller/data/settings/example/rules/script/iki.rule index 4bc0765..c451918 100644 --- a/level_3/controller/data/settings/example/rules/script/iki.rule +++ b/level_3/controller/data/settings/example/rules/script/iki.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "IKI Variable Substitution" environment PATH IKI_TEST define IKI_TEST "This is iki data in an environment variable." diff --git a/level_3/controller/data/settings/example/rules/script/php.rule b/level_3/controller/data/settings/example/rules/script/php.rule index 9b07be1..65ed2fc 100644 --- a/level_3/controller/data/settings/example/rules/script/php.rule +++ b/level_3/controller/data/settings/example/rules/script/php.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "PHP script" environment PATH engine php diff --git a/level_3/controller/data/settings/example/rules/script/python.rule b/level_3/controller/data/settings/example/rules/script/python.rule index 6e6a22c..a486a6a 100644 --- a/level_3/controller/data/settings/example/rules/script/python.rule +++ b/level_3/controller/data/settings/example/rules/script/python.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Python (Version 3.X) script" environment PATH engine python3 diff --git a/level_3/controller/data/settings/example/rules/script/require_me.rule b/level_3/controller/data/settings/example/rules/script/require_me.rule index afb8106..bede8df 100644 --- a/level_3/controller/data/settings/example/rules/script/require_me.rule +++ b/level_3/controller/data/settings/example/rules/script/require_me.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Example script for needs, wants, and wishes." environment PATH engine sh diff --git a/level_3/controller/data/settings/example/rules/script/succeed.rule b/level_3/controller/data/settings/example/rules/script/succeed.rule index 5c88fc3..fa0df59 100644 --- a/level_3/controller/data/settings/example/rules/script/succeed.rule +++ b/level_3/controller/data/settings/example/rules/script/succeed.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Script #1" environment PATH engine sh diff --git a/level_3/controller/data/settings/example/rules/serial/s_1.rule b/level_3/controller/data/settings/example/rules/serial/s_1.rule index e4568b0..bb84e2d 100644 --- a/level_3/controller/data/settings/example/rules/serial/s_1.rule +++ b/level_3/controller/data/settings/example/rules/serial/s_1.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Serial 1" on stop need serial s_2 diff --git a/level_3/controller/data/settings/example/rules/serial/s_2.rule b/level_3/controller/data/settings/example/rules/serial/s_2.rule index 2bb7cec..5496172 100644 --- a/level_3/controller/data/settings/example/rules/serial/s_2.rule +++ b/level_3/controller/data/settings/example/rules/serial/s_2.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Serial 2" on start need serial s_1 on stop need serial s_3 diff --git a/level_3/controller/data/settings/example/rules/serial/s_3.rule b/level_3/controller/data/settings/example/rules/serial/s_3.rule index cd1d84e..fee1d88 100644 --- a/level_3/controller/data/settings/example/rules/serial/s_3.rule +++ b/level_3/controller/data/settings/example/rules/serial/s_3.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Serial 3" on start need serial s_2 on stop need serial s_4 diff --git a/level_3/controller/data/settings/example/rules/serial/s_4.rule b/level_3/controller/data/settings/example/rules/serial/s_4.rule index 6be76e0..ff7040f 100644 --- a/level_3/controller/data/settings/example/rules/serial/s_4.rule +++ b/level_3/controller/data/settings/example/rules/serial/s_4.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Serial 4" on start need serial s_3 on stop need serial s_5 diff --git a/level_3/controller/data/settings/example/rules/serial/s_5.rule b/level_3/controller/data/settings/example/rules/serial/s_5.rule index a08bd1f..11c7c6c 100644 --- a/level_3/controller/data/settings/example/rules/serial/s_5.rule +++ b/level_3/controller/data/settings/example/rules/serial/s_5.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Serial 5" on start need serial s_4 on stop need serial s_6 diff --git a/level_3/controller/data/settings/example/rules/serial/s_6.rule b/level_3/controller/data/settings/example/rules/serial/s_6.rule index 23be70d..4eba10d 100644 --- a/level_3/controller/data/settings/example/rules/serial/s_6.rule +++ b/level_3/controller/data/settings/example/rules/serial/s_6.rule @@ -1,6 +1,6 @@ # fss-000d -setting: +settings: name "Serial 6" on start need serial s_5 diff --git a/level_3/controller/data/settings/example/rules/service/sshd.rule b/level_3/controller/data/settings/example/rules/service/sshd.rule index 5a5f3b6..3ef5c2e 100644 --- a/level_3/controller/data/settings/example/rules/service/sshd.rule +++ b/level_3/controller/data/settings/example/rules/service/sshd.rule @@ -4,7 +4,7 @@ # Sshd appears to require a full path. # -setting: +settings: name "SSH Service" nice 15 diff --git a/level_3/controller/data/settings/example/rules/utility/sleeper_1.rule b/level_3/controller/data/settings/example/rules/utility/sleeper_1.rule index f90ceca..9aafe87 100644 --- a/level_3/controller/data/settings/example/rules/utility/sleeper_1.rule +++ b/level_3/controller/data/settings/example/rules/utility/sleeper_1.rule @@ -1,7 +1,7 @@ # fss-000d # sleeper rule whose program creates its own PID file, runs in the background, sleep for a while, removes PID file, and returns. -setting: +settings: name "Sleeper #1" nice 10 diff --git a/level_3/controller/data/settings/example/rules/utility/sleeper_2.rule b/level_3/controller/data/settings/example/rules/utility/sleeper_2.rule index 27b0a0a..2bc5cfc 100644 --- a/level_3/controller/data/settings/example/rules/utility/sleeper_2.rule +++ b/level_3/controller/data/settings/example/rules/utility/sleeper_2.rule @@ -1,7 +1,7 @@ # fss-000d # sleeper rule whose program creates its own PID file, runs in the background, sleep for a while, removes PID file, and returns. -setting: +settings: name "Sleeper #2" nice 10 diff --git a/level_3/controller/data/settings/example/rules/utility/sleeper_3.rule b/level_3/controller/data/settings/example/rules/utility/sleeper_3.rule index 550c716..07ba570 100644 --- a/level_3/controller/data/settings/example/rules/utility/sleeper_3.rule +++ b/level_3/controller/data/settings/example/rules/utility/sleeper_3.rule @@ -1,7 +1,7 @@ # fss-000d # sleeper rule whose program creates its own PID file, runs in the background, sleep for a while, removes PID file, and returns. -setting: +settings: name "Sleeper #2" nice 10 diff --git a/level_3/controller/data/settings/rules/boot/devices.rule b/level_3/controller/data/settings/rules/boot/devices.rule index a682657..61d3038 100644 --- a/level_3/controller/data/settings/rules/boot/devices.rule +++ b/level_3/controller/data/settings/rules/boot/devices.rule @@ -3,7 +3,7 @@ # Rule for initializing the /dev file system. # -setting: +settings: name "Setup /dev file system" on start need boot root diff --git a/level_3/controller/data/settings/rules/boot/file_system.rule b/level_3/controller/data/settings/rules/boot/file_system.rule index 25912b9..41e6932 100644 --- a/level_3/controller/data/settings/rules/boot/file_system.rule +++ b/level_3/controller/data/settings/rules/boot/file_system.rule @@ -3,7 +3,7 @@ # Rule for initializing the filesystem. # -setting: +settings: name "Setup Filesystem" on start need boot root diff --git a/level_3/controller/data/settings/rules/boot/modules.rule b/level_3/controller/data/settings/rules/boot/modules.rule index 2852aef..5572d90 100644 --- a/level_3/controller/data/settings/rules/boot/modules.rule +++ b/level_3/controller/data/settings/rules/boot/modules.rule @@ -3,7 +3,7 @@ # Rule for initializing the kernel modules. # -setting: +settings: name "Setup Kernel Modules" on start need boot root diff --git a/level_3/controller/data/settings/rules/boot/proc.rule b/level_3/controller/data/settings/rules/boot/proc.rule index 12ffc18..acb9fa5 100644 --- a/level_3/controller/data/settings/rules/boot/proc.rule +++ b/level_3/controller/data/settings/rules/boot/proc.rule @@ -3,7 +3,7 @@ # Rule for initializing the /proc filesystem. # -setting: +settings: name "Setup /proc Filesystem" on start need boot root diff --git a/level_3/controller/data/settings/rules/boot/root.rule b/level_3/controller/data/settings/rules/boot/root.rule index f5c63fe..5f3abf6 100644 --- a/level_3/controller/data/settings/rules/boot/root.rule +++ b/level_3/controller/data/settings/rules/boot/root.rule @@ -3,7 +3,7 @@ # Rule for initializing the root filesystem, assuring certain directories always exist. # -setting: +settings: name "Setup Root Filesystem" command: diff --git a/level_3/controller/data/settings/rules/maintenance/console.rule b/level_3/controller/data/settings/rules/maintenance/console.rule index babf4a7..1cad18f 100644 --- a/level_3/controller/data/settings/rules/maintenance/console.rule +++ b/level_3/controller/data/settings/rules/maintenance/console.rule @@ -3,7 +3,7 @@ # Rule for maintenance/failsafe console. # -setting: +settings: name "Maintenance Console" command: diff --git a/level_3/controller/data/settings/rules/net/all.rule b/level_3/controller/data/settings/rules/net/all.rule index 1d30602..79c2819 100644 --- a/level_3/controller/data/settings/rules/net/all.rule +++ b/level_3/controller/data/settings/rules/net/all.rule @@ -3,7 +3,7 @@ # Rule for starting all network devices. # -setting: +settings: name "System Network" capability cap_net_admin= diff --git a/level_3/controller/data/settings/rules/net/loopback.rule b/level_3/controller/data/settings/rules/net/loopback.rule index 957eb9c..9377cdd 100644 --- a/level_3/controller/data/settings/rules/net/loopback.rule +++ b/level_3/controller/data/settings/rules/net/loopback.rule @@ -3,7 +3,7 @@ # Rule for loopback device. # -setting: +settings: name "Loopback Device" on start need boot modules diff --git a/level_3/controller/data/settings/rules/service/dbus.rule b/level_3/controller/data/settings/rules/service/dbus.rule index 989b117..d32e1e0 100644 --- a/level_3/controller/data/settings/rules/service/dbus.rule +++ b/level_3/controller/data/settings/rules/service/dbus.rule @@ -3,7 +3,7 @@ # Rule for D-Bus service. # -setting: +settings: name "D-BUS" capability all= nice 15 diff --git a/level_3/controller/data/settings/rules/service/logger.rule b/level_3/controller/data/settings/rules/service/logger.rule index ad4eda2..6ac54c7 100644 --- a/level_3/controller/data/settings/rules/service/logger.rule +++ b/level_3/controller/data/settings/rules/service/logger.rule @@ -3,7 +3,7 @@ # Rule for system logger service. # -setting: +settings: name "System Logger" capability all= nice 19 diff --git a/level_3/controller/data/settings/rules/service/mouse.rule b/level_3/controller/data/settings/rules/service/mouse.rule index 0c41300..ad97095 100644 --- a/level_3/controller/data/settings/rules/service/mouse.rule +++ b/level_3/controller/data/settings/rules/service/mouse.rule @@ -3,7 +3,7 @@ # Rule for console mouse. # -setting: +settings: name "Console Mouse" capability all= nice 15 diff --git a/level_3/controller/data/settings/rules/task/clock.rule b/level_3/controller/data/settings/rules/task/clock.rule index 5e91914..663f159 100644 --- a/level_3/controller/data/settings/rules/task/clock.rule +++ b/level_3/controller/data/settings/rules/task/clock.rule @@ -3,7 +3,7 @@ # Rule for setting the clock. # -setting: +settings: name "Setup Clock" capability cap_sys_time= nice 15 diff --git a/level_3/controller/data/settings/rules/task/keyboard.rule b/level_3/controller/data/settings/rules/task/keyboard.rule index ac3042e..72c7add 100644 --- a/level_3/controller/data/settings/rules/task/keyboard.rule +++ b/level_3/controller/data/settings/rules/task/keyboard.rule @@ -3,6 +3,6 @@ # Rule for setting the keyboard. # -setting: +settings: name "System Keyboard" nice 15 diff --git a/level_3/controller/data/settings/rules/task/ntpdate.rule b/level_3/controller/data/settings/rules/task/ntpdate.rule index 2040744..5956114 100644 --- a/level_3/controller/data/settings/rules/task/ntpdate.rule +++ b/level_3/controller/data/settings/rules/task/ntpdate.rule @@ -3,7 +3,7 @@ # Rule for executing ntpdate. # -setting: +settings: name "System Clock Using NTP Date" capability cap_sys_time= nice 15 diff --git a/level_3/controller/data/settings/rules/terminal/four.rule b/level_3/controller/data/settings/rules/terminal/four.rule index 3748807..5bc8189 100644 --- a/level_3/controller/data/settings/rules/terminal/four.rule +++ b/level_3/controller/data/settings/rules/terminal/four.rule @@ -6,7 +6,7 @@ # -J = don't clear on start, good for debugging. # 9600 and 115200 are common frequencies. -setting: +settings: name "System Terminal 4" command: diff --git a/level_3/controller/data/settings/rules/terminal/one.rule b/level_3/controller/data/settings/rules/terminal/one.rule index faa1e09..14b0d64 100644 --- a/level_3/controller/data/settings/rules/terminal/one.rule +++ b/level_3/controller/data/settings/rules/terminal/one.rule @@ -6,7 +6,7 @@ # -J = don't clear on start, good for debugging. # 9600 and 115200 are common frequencies. -setting: +settings: name "System Terminal 1" command: diff --git a/level_3/controller/data/settings/rules/terminal/three.rule b/level_3/controller/data/settings/rules/terminal/three.rule index f73ad24..aa90f01 100644 --- a/level_3/controller/data/settings/rules/terminal/three.rule +++ b/level_3/controller/data/settings/rules/terminal/three.rule @@ -6,7 +6,7 @@ # -J = don't clear on start, good for debugging. # 9600 and 115200 are common frequencies. -setting: +settings: name "System Terminal 3" command: diff --git a/level_3/controller/data/settings/rules/terminal/two.rule b/level_3/controller/data/settings/rules/terminal/two.rule index d0ab2cc..2dde16e 100644 --- a/level_3/controller/data/settings/rules/terminal/two.rule +++ b/level_3/controller/data/settings/rules/terminal/two.rule @@ -6,7 +6,7 @@ # -J = don't clear on start, good for debugging. # 9600 and 115200 are common frequencies. -setting: +settings: name "System Terminal 2" command: diff --git a/level_3/controller/documents/entry.txt b/level_3/controller/documents/entry.txt index 17335fc..7ae86aa 100644 --- a/level_3/controller/documents/entry.txt +++ b/level_3/controller/documents/entry.txt @@ -13,7 +13,7 @@ Entry Documentation: All other Basic List Objects are not executed unless either an "item" or a "failsafe" specifies a valid Item name. Execution of all Items are top-down. - - The "setting" item Object\: + - The "settings" item Object\: Represents Entry settings and is not an "item" that can be executed. A number of settings are supported, but if this Item Object is not specified, then defaults are used. The following settings are available: "control", "control_group", "control_mode", "control_user", "define", "mode", "parameter", "pid", "pid_file", "session", "show". diff --git a/level_3/controller/documents/exit.txt b/level_3/controller/documents/exit.txt index 8d252e5..ad1ad87 100644 --- a/level_3/controller/documents/exit.txt +++ b/level_3/controller/documents/exit.txt @@ -11,7 +11,7 @@ Exit Documentation: An Exit is a special variation or subset of an Entry. - - The "setting" Item Object\: + - The "settings" Item Object\: Represents settings and is not an "item" that can be executed. A number of settings are supported, but if this Item Object is not specified, then defaults are used. The following settings are available: "pid" and "show". diff --git a/level_3/controller/documents/rule.txt b/level_3/controller/documents/rule.txt index 60bde60..8c8ea1a 100644 --- a/level_3/controller/documents/rule.txt +++ b/level_3/controller/documents/rule.txt @@ -8,10 +8,10 @@ Rule Documentation: A Rule file, such as "ssh.rule", is intended to designate what to execute. - The rule file is read top-down, except for the outer most list "setting", which is intended to store setting data for this rule. + The rule file is read top-down, except for the outer most list "settings", which is intended to store setting data for this rule. Multiple outer most list Objects may be specified and they are executed as provided, in a top-down manner. - - The "setting" Rule Type has the following FSS-0001 (Extended) Content\: + - The "settings" Rule Type has the following FSS-0001 (Extended) Content\: - "affinity": Define one or more processors to restrict this rule by with each number representing a specific processor by its id (starting at 0). - "capability": Define a set of capabilities in which to use, using the capability "text" format (such as "= cap_chown+ep"). - "cgroup": Define a cgroup (control group) in which everything within this rule executes under. diff --git a/level_3/controller/specifications/entry.txt b/level_3/controller/specifications/entry.txt index 0ae7357..b45dc8a 100644 --- a/level_3/controller/specifications/entry.txt +++ b/level_3/controller/specifications/entry.txt @@ -24,7 +24,7 @@ Entry Specification: The first Content represents the file path (without any leading/trailing slashes and without file extension). The second Content represent the basename of the command file. - - "setting": optional, Actions may be one of\: + - "settings": optional, Actions may be one of\: - "control": One to two Content. The first Content is a relative or absolute path to a socket file. The second Content an optional "readonly". diff --git a/level_3/controller/specifications/exit.txt b/level_3/controller/specifications/exit.txt index 9365f8e..603ac6d 100644 --- a/level_3/controller/specifications/exit.txt +++ b/level_3/controller/specifications/exit.txt @@ -19,7 +19,7 @@ Exit Specification: The Items: - "main": required. - - "setting": optional, Actions may be one of: + - "settings": optional, Actions may be one of: - "pid": Exactly one Content that is one of "disable", "require", or "ready". - "session": Exactly one Content that is one of "new" or "same". - "show": Exactly one Content that is one of "normal" or "init". diff --git a/level_3/controller/specifications/rule.txt b/level_3/controller/specifications/rule.txt index e1490bb..a4b8361 100644 --- a/level_3/controller/specifications/rule.txt +++ b/level_3/controller/specifications/rule.txt @@ -24,14 +24,14 @@ Rule Specification: - "command": FSS-0003 (Extended List) or FSS-0001 (Extended). - "script": FSS-0003 (Extended List) or FSS-0001 (Extended). - "service": FSS-0003 (Extended List) or FSS-0001 (Extended). - - "setting": (Required) FSS-0001 (Extended). + - "settings": (Required) FSS-0001 (Extended). - "utility": FSS-0003 (Extended List) or FSS-0001 (Extended). - For the above Rule Types, "setting" may be specified only once whereas the others may be specifed multiple times. - The "setting" Rule Type is always processed first, regardless of position. + For the above Rule Types, "settings" may be specified only once whereas the others may be specifed multiple times. + The "settings" Rule Type is always processed first, regardless of position. The other Rule Types are processed top-down. - The "setting" Rule Type has the following FSS-0001 (Extended)\: + The "settings" Rule Type has the following FSS-0001 (Extended)\: - "affinity": One or more Content, each must be a 0 or greater whole number. - "capability": One Content representing capabilities. - "cgroup": Two or more Content, the first Content being either "existing" or "new" and the remaining representing a valid cgroup (control group) name, must have at least 1 graph character (non white space printing character) (leading and trailing white space are trimmed off). diff --git a/level_3/fake/c/private-common.h b/level_3/fake/c/private-common.h index 6e252be..4610343 100644 --- a/level_3/fake/c/private-common.h +++ b/level_3/fake/c/private-common.h @@ -193,7 +193,7 @@ extern "C" { * Build settings data. * * data_build_setting_flag_*: - * - has_environment: Designate that the "environment" is specified in the "setting" Section of the Fakefile. + * - has_environment: Designate that the "environment" is specified in the "settings" Section of the Fakefile. * * flag: Flags from data_build_setting_flag_* (Not strictly part of the build settings file). * -- 1.8.3.1