Merge pull request #1710 from jrha/sysctl

ncm-sysctl: Cleanup & fixes
quattor · Sep 17, 2024 · ecf8f9c · ecf8f9c
2 parents 44a6d4f + 04c2abb
commit ecf8f9c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/ncm-sysctl/src/main/pan/components/sysctl/schema.pan b/ncm-sysctl/src/main/pan/components/sysctl/schema.pan
@@ -16,7 +16,7 @@ type component_sysctl_structure = {
     include structure_component
 
     'command' : string = '/sbin/sysctl' with match(SELF, '^/.+')
-    'compat-v1' : boolean = false
+    'compat-v1' ? boolean with deprecated(0, 'compat-v1 has no effect and will be removed in a future release')
     'confFile' : string = '/etc/sysctl.conf' with match(SELF, '^(/.+|[^/]+)\.conf$') # disallow / unless an absolute path is supplied.
     'variables' ? string{}
 };

diff --git a/ncm-sysctl/src/test/perl/configure.t b/ncm-sysctl/src/test/perl/configure.t
@@ -1,5 +1,3 @@
-#!/usr/bin/perl
-# -*- mode: cperl -*-
 use strict;
 use warnings;
 

diff --git a/ncm-sysctl/src/test/resources/simple.pan b/ncm-sysctl/src/test/resources/simple.pan
@@ -4,6 +4,3 @@ prefix "/software/components/sysctl";
 "command" = "/sbin/sysctl";
 "confFile" = "50-quattor.conf";
 "variables/kernel.sysrq" = "1";
-
-
-