gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-19 20:38:00 +01:00
Code Issues Projects Releases Wiki Activity

Changed DHCP client order to dhcpcd -> pump -> dhclient

Browse Source
This commit is contained in:
Adam Blackburn
2009-05-20 07:01:31 +08:00
parent f609ff99fe
commit d693839013
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@@ -86,6 +86,8 @@ class configure(Command):
('initfilename=', None, "set the name of the init file (don't use)"), ('initfilename=', None, "set the name of the init file (don't use)"),
('wicdgroup=', None, "set the name of the group used for wicd"), ('wicdgroup=', None, "set the name of the group used for wicd"),
('distro=', None, 'set the distribution for which wicd will be installed'), ('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 # Configure switches
('no-install-init', None, "do not install the init file"), ('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.pidfile = '/var/run/wicd/wicd.pid'
self.initfilename = os.path.basename(self.initfile) self.initfilename = os.path.basename(self.initfile)
self.wicdgroup = 'users' self.wicdgroup = 'users'
self.loggroup = ''
self.logperms = '0600'
def distro_check(self): def distro_check(self):
print "Distro is: "+self.distro print "Distro is: "+self.distro

12
wicd/wnettools.py
View File

@@ -213,17 +213,17 @@ class BaseInterface(object):
""" """
def get_client_name(cl): def get_client_name(cl):
""" Converts the integer value for a dhcp client to a string. """ """ Converts the integer value for a dhcp client to a string. """
if self.dhclient_cmd and cl in [misc.DHCLIENT, misc.AUTO]: if self.dhcpcd_cmd and cl in [misc.DHCPCD, 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]:
client = "dhcpcd" client = "dhcpcd"
cmd = self.dhcpcd_cmd cmd = self.dhcpcd_cmd
elif self.pump_cmd and cl in [misc.PUMP, misc.AUTO]: elif self.pump_cmd and cl in [misc.PUMP, misc.AUTO]:
client = "pump" client = "pump"
cmd = self.pump_cmd 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: else:
client = None client = None
cmd = "" cmd = ""