Take the new doc out of the branch and into trunk

[nodemanager.git] / conf_files.py

diff --git a/conf_files.py b/conf_files.py
index d584c2a..4903b3f 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -29,7 +29,7 @@ class conf_files:
     def system(self, cmd):
         if not self.noscripts and cmd:
             logger.log('conf_files: running command %s' % cmd)
-            return os.system(cmd)
+            return tools.fork_as(None, os.system, cmd)
         else: return 0
 
     def update_conf_file(self, cf_rec):
@@ -96,7 +96,7 @@ if __name__ == '__main__':
     parser = optparse.OptionParser()
     parser.add_option('-f', '--config', action='store', dest='config', default='/etc/planetlab/plc_config', help='PLC configuration file')
     parser.add_option('-k', '--session', action='store', dest='session', default='/etc/planetlab/session', help='API session key (or file)')
-    parser.add_option('--noscripts', action='store', dest='noscripts', default=False, help='Do not run pre- or post-install scripts')
+    parser.add_option('--noscripts', action='store_true', dest='noscripts', default=False, help='Do not run pre- or post-install scripts')
     (options, args) = parser.parse_args()
 
     # Load /etc/planetlab/plc_config