mirror of git://git.savannah.gnu.org/guix.git
services: wpa-supplicant: Support specifying additional service dependencies.
* gnu/services/networking.scm (<wpa-supplicant-configuration>)[requirement]: New parameter. (wpa-supplicant-shepherd-service): Use it instead of hard-coded list. * doc/guix.texi (Networking Services): Document accordingly.
This commit is contained in:
parent
6f8f13e941
commit
4d06076714
|
@ -14172,6 +14172,9 @@ It takes the following parameters:
|
||||||
@item @code{wpa-supplicant} (default: @code{wpa-supplicant})
|
@item @code{wpa-supplicant} (default: @code{wpa-supplicant})
|
||||||
The WPA Supplicant package to use.
|
The WPA Supplicant package to use.
|
||||||
|
|
||||||
|
@item @code{requirement} (default: @code{'(user-processes dbus-system loopback syslogd)}
|
||||||
|
List of services that should be started before WPA Supplicant starts.
|
||||||
|
|
||||||
@item @code{dbus?} (default: @code{#t})
|
@item @code{dbus?} (default: @code{#t})
|
||||||
Whether to listen for requests on D-Bus.
|
Whether to listen for requests on D-Bus.
|
||||||
|
|
||||||
|
|
|
@ -133,6 +133,7 @@
|
||||||
wpa-supplicant-configuration
|
wpa-supplicant-configuration
|
||||||
wpa-supplicant-configuration?
|
wpa-supplicant-configuration?
|
||||||
wpa-supplicant-configuration-wpa-supplicant
|
wpa-supplicant-configuration-wpa-supplicant
|
||||||
|
wpa-supplicant-configuration-requirement
|
||||||
wpa-supplicant-configuration-pid-file
|
wpa-supplicant-configuration-pid-file
|
||||||
wpa-supplicant-configuration-dbus?
|
wpa-supplicant-configuration-dbus?
|
||||||
wpa-supplicant-configuration-interface
|
wpa-supplicant-configuration-interface
|
||||||
|
@ -1319,6 +1320,8 @@ whatever the thing is supposed to do).")))
|
||||||
wpa-supplicant-configuration?
|
wpa-supplicant-configuration?
|
||||||
(wpa-supplicant wpa-supplicant-configuration-wpa-supplicant ;<package>
|
(wpa-supplicant wpa-supplicant-configuration-wpa-supplicant ;<package>
|
||||||
(default wpa-supplicant))
|
(default wpa-supplicant))
|
||||||
|
(requirement wpa-supplicant-configuration-requirement ;list of symbols
|
||||||
|
(default '(user-processes dbus-system loopback syslogd)))
|
||||||
(pid-file wpa-supplicant-configuration-pid-file ;string
|
(pid-file wpa-supplicant-configuration-pid-file ;string
|
||||||
(default "/var/run/wpa_supplicant.pid"))
|
(default "/var/run/wpa_supplicant.pid"))
|
||||||
(dbus? wpa-supplicant-configuration-dbus? ;Boolean
|
(dbus? wpa-supplicant-configuration-dbus? ;Boolean
|
||||||
|
@ -1332,12 +1335,12 @@ whatever the thing is supposed to do).")))
|
||||||
|
|
||||||
(define wpa-supplicant-shepherd-service
|
(define wpa-supplicant-shepherd-service
|
||||||
(match-lambda
|
(match-lambda
|
||||||
(($ <wpa-supplicant-configuration> wpa-supplicant pid-file dbus? interface
|
(($ <wpa-supplicant-configuration> wpa-supplicant requirement pid-file dbus?
|
||||||
config-file extra-options)
|
interface config-file extra-options)
|
||||||
(list (shepherd-service
|
(list (shepherd-service
|
||||||
(documentation "Run the WPA supplicant daemon")
|
(documentation "Run the WPA supplicant daemon")
|
||||||
(provision '(wpa-supplicant))
|
(provision '(wpa-supplicant))
|
||||||
(requirement '(user-processes dbus-system loopback syslogd))
|
(requirement requirement)
|
||||||
(start #~(make-forkexec-constructor
|
(start #~(make-forkexec-constructor
|
||||||
(list (string-append #$wpa-supplicant
|
(list (string-append #$wpa-supplicant
|
||||||
"/sbin/wpa_supplicant")
|
"/sbin/wpa_supplicant")
|
||||||
|
|
Loading…
Reference in New Issue