[PATCH] doc: fix typo in screen-locker-service swaylock example

  • Done
  • quality assurance status badge
Details
3 participants
  • Arvid Krein
  • Josselin Poiret
  • pelzflorian (Florian Pelz)
Owner
unassigned
Submitted by
Arvid Krein
Severity
normal
A
A
Arvid Krein wrote on 6 Jun 2023 11:08
(address . guix-patches@gnu.org)
3f44e97d-6bfc-eafc-9672-af15ca29cca7@zedat.fu-berlin.de
Hello Guix,

I think there is a small typo one of the examples for the
screen-locker-service-type. The second example is for a
screen-locker-service that uses swaylock but still uses the xlockmore
executable. I think the following patch would fix that.


Greetings,

Arvid

---
 doc/guix.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index 8df5cc411c..638ab1ed6e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -22577,7 +22577,7 @@ X Window
 (service screen-locker-service-type
          (screen-locker-configuration
            (name "swaylock")
-           (program (file-append xlockmore "/bin/xlock"))
+           (program (file-append swaylock "/bin/swaylock"))
            (using-pam? #t)
            (using-setuid? #f)))
 @end lisp

base-commit: e3cd3f03202c48cd8d777f4769b4e31fea8dcd60
--
2.40.1
A
A
Arvid Krein wrote on 6 Jun 2023 13:59
(address . 63922@debbugs.gnu.org)(name . Arvid Krein)(address . arvid@krein.moe)
8438054a6bbe7670e7f8ecb9451b2b29d558d206.1686052718.git.arvidkrein@zedat.fu-berlin.de
From: Arvid Krein <arvid@krein.moe>

Greetings,
Arvid

---
doc/guix.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (17 lines)
diff --git a/doc/guix.texi b/doc/guix.texi
index 8df5cc411c..638ab1ed6e 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -22577,7 +22577,7 @@ X Window
(service screen-locker-service-type
(screen-locker-configuration
(name "swaylock")
- (program (file-append xlockmore "/bin/xlock"))
+ (program (file-append swaylock "/bin/swaylock"))
(using-pam? #t)
(using-setuid? #f)))
@end lisp

base-commit: e3cd3f03202c48cd8d777f4769b4e31fea8dcd60
--
2.40.1
P
P
pelzflorian (Florian Pelz) wrote on 7 Jul 2023 12:35
(name . Arvid Krein)(address . arvidkrein@zedat.fu-berlin.de)
878rbsggam.fsf@pelzflorian.de
Arvid Krein <arvidkrein@zedat.fu-berlin.de> writes:
Toggle quote (14 lines)
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 8df5cc411c..638ab1ed6e 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -22577,7 +22577,7 @@ X Window
> (service screen-locker-service-type
> (screen-locker-configuration
> (name "swaylock")
> - (program (file-append xlockmore "/bin/xlock"))
> + (program (file-append swaylock "/bin/swaylock"))
> (using-pam? #t)
> (using-setuid? #f)))
> @end lisp

Thank you Arvid for your patch. Thing is, it seems what is specified in
`program' actually does not matter, only the `name' field matters when
using-pam? is true. I’m not going to work on this; perhaps someone
using screen lockers will decide what needs repairing.

Regards,
Florian
J
J
Josselin Poiret wrote on 7 Jul 2023 21:52
(name . Arvid Krein)(address . arvid@krein.moe)
878rbr7b3s.fsf@jpoiret.xyz
Hi Arvid,

Arvid Krein <arvidkrein@zedat.fu-berlin.de> writes:

Toggle quote (9 lines)
> From: Arvid Krein <arvid@krein.moe>
>
> Greetings,
> Arvid
>
> ---
> doc/guix.texi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Pushed as 5b6e9b2463f94ae41121e379515c756a6eed9b7f, thanks!

Best,
--
Josselin Poiret
-----BEGIN PGP SIGNATURE-----

iQHEBAEBCgAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmSobQcQHGRldkBqcG9p
cmV0Lnh5egAKCRBQXkC5FhcaiselDACn7BQSC7TFM7d8DIQYcwwF714dC6Ku/v4t
UjumEab7HL3N6/Ir+thfk2mLnYfL9hiy8BRdjDjg9T5fRne/j3YCIivOvAsP44Lp
m/9KHjC4OtBRoMWi8gmxgna33NLKDQ22TJNRagPJl4CSM5qkgnn8QFOrikLnz6/A
VmyGiifWOW9P9p79MBfZrE8EMl+sDQey9iZk3hJL+DX2RmTUXbNKqryHPf+rfOmr
+nmt7Bo2yZVJLDyGqr7AsrOcizl6Cc5ty+8/HYtjVU0ZhhqLfEKM4jXctNwmBtxe
iUMKbl3EbYMfGKPB3q0SacW4SZzKuJ65eKxc6bd1tYgKalZDgQYOzq4g3WZ1TTrC
HlOkcvmpwwqHQH2TY8WTlIWPeci9X+oudN6l2+j3u0iFn6DH2qUb2o0R6xIx38sT
CkURTNzOLzWKwd2ssl5jkMU7NdrHp1jmJ/imgJF0iOv9J8pFwtmFZwq2Rw8MW+1D
UPhyByxhxC7h4pe7X6TgLClAzvpfJy0=
=6e4r
-----END PGP SIGNATURE-----

P
P
pelzflorian (Florian Pelz) wrote on 13 Jul 2023 18:12
close 63922
(address . control@debbugs.gnu.org)
874jm73i5d.fsf@pelzflorian.de
close 63922
thanks
?