[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#37750] Fixup: Documentation
From: |
Tim Gesthuizen |
Subject: |
[bug#37750] Fixup: Documentation |
Date: |
Mon, 14 Oct 2019 19:57:29 +0200 |
User-agent: |
mu4e 1.2.0; emacs 26.3 |
Of course there is also documentation for the new parameter which I
missed to send.
You find an updated patch attached.
Sorry for the hassle,
Tim.
>From 544ae60c79134be980d6ee0430deb6abe4cad8ca Mon Sep 17 00:00:00 2001
From: Tim Gesthuizen <address@hidden>
Date: Thu, 10 Oct 2019 18:38:36 +0200
Subject: [PATCH] gnu: Add baud-rate parameter to inputattach-service
* gnu/services/desktop.scm (inputattach-configuration): Add baud-rate field.
(inputattach-shepherd-service): Add baud-rate to parameters when specified.
* doc/guix.texi (Miscellaneous Services): [inputattach Service] Document
baud-rate parameter.
---
doc/guix.texi | 4 ++++
gnu/services/desktop.scm | 32 ++++++++++++++++++++------------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 6703c2756c..e53a708df2 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -24549,6 +24549,10 @@ The type of device to connect to. Run
@command{inputattach --help}, from the
@item @code{device} (default: @code{"/dev/ttyS0"})
The device file to connect to the device.
+@item @code{baud-rate} (default: @code{#f})
+Baud rate to use for the serial connection.
+Should be a number or @code{#f}.
+
@item @code{log-file} (default: @code{#f})
If true, this must be the name of a file to log messages to.
@end table
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index a32756e040..35320bdde2 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -1021,23 +1021,31 @@ as expected.")))
(default "wacom"))
(device inputattach-configuration-device
(default "/dev/ttyS0"))
+ (baud-rate inputattach-configuration-baud-rate
+ (default #f))
(log-file inputattach-configuration-log-file
(default #f)))
(define inputattach-shepherd-service
(match-lambda
- (($ <inputattach-configuration> type device log-file)
- (list (shepherd-service
- (provision '(inputattach))
- (requirement '(udev))
- (documentation "inputattach daemon")
- (start #~(make-forkexec-constructor
- (list (string-append #$inputattach
- "/bin/inputattach")
- (string-append "--" #$type)
- #$device)
- #:log-file #$log-file))
- (stop #~(make-kill-destructor)))))))
+ (($ <inputattach-configuration> type device baud-rate log-file)
+ (let ((args (append (if baud-rate
+ (if (number? baud-rate)
+ (list "--baud-rate" (number->string
baud-rate))
+ (error "Expected baud-rate to be a number or
#f" baud-rate))
+ '())
+ (list (string-append "--" type)
+ device))))
+ (list (shepherd-service
+ (provision '(inputattach))
+ (requirement '(udev))
+ (documentation "inputattach daemon")
+ (start #~(make-forkexec-constructor
+ (cons (string-append #$inputattach
+ "/bin/inputattach")
+ (quote #$args))
+ #:log-file #$log-file))
+ (stop #~(make-kill-destructor))))))))
(define inputattach-service-type
(service-type
--
2.23.0