Changeset 4405

Timestamp:

Apr 25, 2017, 9:03:51 AM (4 years ago)

Author:

hectorgh

Message:

adding restart of dnsmasq as a parameter

Location:

llx-netinstall/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• install.llx-netinstall/usr/share/n4d/python-plugins/NetinstallManager.py (modified) (2 diffs)

llx-netinstall/trunk/fuentes/debian/changelog

@@ +1 @@
+llx-netinstall (0.60) xenial; urgency=medium
+
+  * load_exports won't restart dnsmasq by default. 
+    zero-server-wizard's 999-final_operations will manage that.
+
+ -- Hector Garcia Huerta <hectorgh@gmail.com>  Tue, 25 Apr 2017 09:02:00 +0200
+
 llx-netinstall (0.59) xenial; urgency=medium
 

llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/n4d/python-plugins/NetinstallManager.py

@@ -54 +54 @@
         #def test
                 
-        def load_exports(self):
+        def load_exports(self,restart_dnsmasq=False):
                 #Get template
                 template_cname = self.tpl_env.get_template("cname")
@@ -85 +85 @@
                 #Write template values
                 n4d_mv(tmpfilepath,'/var/lib/dnsmasq/config/cname-preseed',True,'root','root','0644',True )
-                #subprocess.Popen(['/etc/init.d/dnsmasq','restart'],stdout=subprocess.PIPE).communicate()
+                if restart_dnsmasq:
+                        subprocess.Popen(['systemctl','restart','dnsmasq'],stdout=subprocess.PIPE).communicate()
                 return {'status':True,'msg':'Exports written'}
         #def load_exports