From 5a1bd7e3b8d735c180bb0b158a5dead8c549f65a Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 25 Oct 2018 11:23:29 +0100 Subject: [PATCH] ncm-metaconfig: Switch to using standard caf_serviceaction --- ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan b/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan index e3ee6935a9..6f3edb6a16 100644 --- a/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan +++ b/ncm-metaconfig/src/main/pan/components/metaconfig/schema.pan @@ -84,8 +84,6 @@ type ${project.artifactId}_textrender_convert = { true; }; -type caf_service_action = string with match(SELF, '^(restart|condrestart|reload|stop_sleep_start)$'); - type ${project.artifactId}_actions = { @{Always run, happens before possible modifications. A failure will cancel any file modification, unless the command is prefixed with -.} @@ -116,7 +114,7 @@ type ${project.artifactId}_config = { for the daemon will be taken at most once. If multiple actions are to be taken for the same daemon, all actions will be taken (no attempt to optimize is made).} - 'daemons' ? caf_service_action{} + 'daemons' ? caf_serviceaction{} @{Module to render the configuration file. See 'CONFIGURATION MODULES' in manpage.} 'module' : string @{Extension for the file's backup.}