diff --git a/system/base/dhcpcd/actions.py b/system/base/dhcpcd/actions.py index 471d029d..662040ae 100644 --- a/system/base/dhcpcd/actions.py +++ b/system/base/dhcpcd/actions.py @@ -10,20 +10,22 @@ from pisi.actionsapi import get from pisi.actionsapi import shelltools def setup(): - autotools.configure("--libexecdir=/lib/dhcpcd \ + autotools.configure("--libexecdir=/usr/lib/dhcpcd \ --dbdir=/var/lib/dhcpcd \ --localstatedir=/var \ + --sbindir=/usr/bin \ --rundir=/run") def build(): autotools.make() def install(): - autotools.rawInstall("DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd DESTDIR=%s" % get.installDIR()) + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) # Set Options in /etc/dhcpcd.conf Disable ip4vall shelltools.echo("%s/etc/dhcpcd.conf" % get.installDIR(), "noipv4ll") # Remove hooks install the compat one - pisitools.remove("/lib/dhcpcd/dhcpcd-hooks/*") - pisitools.insinto("/lib/dhcpcd/dhcpcd-hooks", "dhcpcd-hooks/50-dhcpcd-compat") + pisitools.remove("/usr/lib/dhcpcd/dhcpcd-hooks/*") + pisitools.insinto("/usr/lib/dhcpcd/dhcpcd-hooks", "dhcpcd-hooks/50-dhcpcd-compat") pisitools.dodoc("README") +#DBDIR=/var/lib/dhcpcd LIBEXECDIR=/usr/lib/dhcpcd diff --git a/system/base/dhcpcd/comar/service.py b/system/base/dhcpcd/comar/service.py new file mode 100644 index 00000000..44de32bf --- /dev/null +++ b/system/base/dhcpcd/comar/service.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +from comar.service import * +import os + +serviceType = "local" +serviceDefault = "conditional" +serviceDesc = _({"en": "Dhcp client", + "tr": "Dhcp istemcisi"}) + +MSG_BACKEND_WARNING = _({ + "en" : "dhcp is not enabled by default. You can change this from /etc/dhcpcd.conf.", + "tr" : "dhcp öntanımlı olarak etkin değil. /etc/dhcpcd.conf dosyasından bu ayarı değiştirebilirsiniz." + }) + +pidfile="/var/run/dhcpcd.pid" +USETHIS=eval(config.get("DEFAULT", "True")) + +@synchronized +def start(): + if not USETHIS: + fail(MSG_BACKEND_WARNING) + + startService(command="/usr/bin/dhcpcd", + args="daemon -q -b %s" % pidfile, + donotify=True) + +@synchronized +def stop(): + stopService(command="/usr/bin/dhcpcd -x", + donotify=True) + + try: + os.unlink(pidfile) + except: + pass + +def ready(): + if not USETHIS: + fail(MSG_BACKEND_WARNING) + else: + start() + +def status(): + return isServiceRunning(pidfile=pidfile) diff --git a/system/base/dhcpcd/pspec.xml b/system/base/dhcpcd/pspec.xml index 41004448..ac64903f 100644 --- a/system/base/dhcpcd/pspec.xml +++ b/system/base/dhcpcd/pspec.xml @@ -26,18 +26,22 @@ /etc /lib/dhcpcd - /usr/lib/dhcpcd/dev/udev.so - /usr/sbin + /usr/lib/dhcpcd + /usr/bin /usr/share/doc /usr/share/man /usr/share/dhcpcd /var/lib/dhcpcd + /run/dhcp + + System.Service + - 2017-02-21 + 2017-02-23 6.11.5 Version bump. Ertuğrul Erata