summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg2-admin1
-rwxr-xr-xsrc/sbin/bcfg2-info1
-rwxr-xr-xsrc/sbin/bcfg2-lint1
-rwxr-xr-xsrc/sbin/bcfg2-server1
-rwxr-xr-xsrc/sbin/bcfg2-test5
5 files changed, 7 insertions, 2 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 007dd0af3..7cc19be8f 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -44,6 +44,7 @@ def main():
'plugins': Bcfg2.Options.SERVER_PLUGINS,
'event debug': Bcfg2.Options.DEBUG,
'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR,
+ 'ignore': Bcfg2.Options.SERVER_FAM_IGNORE,
'password': Bcfg2.Options.SERVER_PASSWORD,
'encoding': Bcfg2.Options.ENCODING,
}
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 8598a58eb..fdcf9ac17 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -648,6 +648,7 @@ if __name__ == '__main__':
'password': Bcfg2.Options.SERVER_PASSWORD,
'mconnect': Bcfg2.Options.SERVER_MCONNECT,
'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR,
+ 'ignore': Bcfg2.Options.SERVER_FAM_IGNORE,
'location': Bcfg2.Options.SERVER_LOCATION,
'static': Bcfg2.Options.SERVER_STATIC,
'key': Bcfg2.Options.SERVER_KEY,
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 78b833f02..bc1e5b70e 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -82,6 +82,7 @@ if __name__ == '__main__':
'plugins': Bcfg2.Options.SERVER_PLUGINS,
'mconnect': Bcfg2.Options.SERVER_MCONNECT,
'filemonitor': Bcfg2.Options.SERVER_FILEMONITOR,
+ 'ignore': Bcfg2.Options.SERVER_FAM_IGNORE,
'location': Bcfg2.Options.SERVER_LOCATION,
'static': Bcfg2.Options.SERVER_STATIC,
'key': Bcfg2.Options.SERVER_KEY,
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 757172464..1b8b0d158 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -26,6 +26,7 @@ if __name__ == '__main__':
'plugins' : Bcfg2.Options.SERVER_PLUGINS,
'password' : Bcfg2.Options.SERVER_PASSWORD,
'fm' : Bcfg2.Options.SERVER_FILEMONITOR,
+ 'ignore' : Bcfg2.Options.SERVER_FAM_IGNORE,
'key' : Bcfg2.Options.SERVER_KEY,
'cert' : Bcfg2.Options.SERVER_CERT,
'ca' : Bcfg2.Options.SERVER_CA,
diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test
index e3cfd27cc..7ddbb3509 100755
--- a/src/sbin/bcfg2-test
+++ b/src/sbin/bcfg2-test
@@ -70,7 +70,8 @@ def main():
'password': Bcfg2.Options.SERVER_PASSWORD,
'verbose': Bcfg2.Options.VERBOSE,
'noseopts': Bcfg2.Options.TEST_NOSEOPTS,
- 'ignore': Bcfg2.Options.TEST_IGNORE,
+ 'ignore': Bcfg2.Options.SERVER_FAM_IGNORE,
+ 'test_ignore': Bcfg2.Options.TEST_IGNORE,
'validate': Bcfg2.Options.CFG_VALIDATION,
}
setup = Bcfg2.Options.OptionParser(optinfo)
@@ -92,7 +93,7 @@ def main():
)
ignore = dict()
- for entry in setup['ignore']:
+ for entry in setup['test_ignore']:
tag, name = entry.split(":")
try:
ignore[tag].append(name)