diff --git a/setup.py b/setup.py index f1cf96b..041597b 100755 --- a/setup.py +++ b/setup.py @@ -86,6 +86,8 @@ class configure(Command): ('initfilename=', None, "set the name of the init file (don't use)"), ('wicdgroup=', None, "set the name of the group used for wicd"), ('distro=', None, 'set the distribution for which wicd will be installed'), + ('loggroup=', None, 'the group the log file belongs to'), + ('logperms=', None, 'the log file permissions'), # Configure switches ('no-install-init', None, "do not install the init file"), @@ -220,6 +222,8 @@ class configure(Command): self.pidfile = '/var/run/wicd/wicd.pid' self.initfilename = os.path.basename(self.initfile) self.wicdgroup = 'users' + self.loggroup = '' + self.logperms = '0600' def distro_check(self): print "Distro is: "+self.distro diff --git a/wicd/wnettools.py b/wicd/wnettools.py index f5d720d..6cd91d2 100644 --- a/wicd/wnettools.py +++ b/wicd/wnettools.py @@ -213,17 +213,17 @@ class BaseInterface(object): """ def get_client_name(cl): """ Converts the integer value for a dhcp client to a string. """ - if self.dhclient_cmd and cl in [misc.DHCLIENT, misc.AUTO]: - client = "dhclient" - cmd = self.dhclient_cmd - if self.dhclient_needs_verbose: - cmd += ' -v' - elif self.dhcpcd_cmd and cl in [misc.DHCPCD, misc.AUTO]: + if self.dhcpcd_cmd and cl in [misc.DHCPCD, misc.AUTO]: client = "dhcpcd" cmd = self.dhcpcd_cmd elif self.pump_cmd and cl in [misc.PUMP, misc.AUTO]: client = "pump" cmd = self.pump_cmd + elif self.dhclient_cmd and cl in [misc.DHCLIENT, misc.AUTO]: + client = "dhclient" + cmd = self.dhclient_cmd + if self.dhclient_needs_verbose: + cmd += ' -v' else: client = None cmd = ""