* [bug#29468] [PATCH 0/2] Fix some functionality in gnome-disks.
@ 2017-11-27 8:38 Christopher Baines
2017-11-27 8:48 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Christopher Baines
0 siblings, 1 reply; 7+ messages in thread
From: Christopher Baines @ 2017-11-27 8:38 UTC (permalink / raw)
To: 29468
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
These patches fix the ability to remove partitions using gnome-disks,
and the ability to create encrypted volumes.
Christopher Baines (2):
services: desktop: Create /var/run/udisks2 for the udisks service.
gnu: Patch udisks to directly reference cryptsetup and parted.
gnu/packages/freedesktop.scm | 14 +++++++++++---
gnu/services/desktop.scm | 11 +++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service.
2017-11-27 8:38 [bug#29468] [PATCH 0/2] Fix some functionality in gnome-disks Christopher Baines
@ 2017-11-27 8:48 ` Christopher Baines
2017-11-27 8:48 ` [bug#29468] [PATCH 2/2] gnu: Patch udisks to directly reference cryptsetup and parted Christopher Baines
2017-11-27 14:08 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Ludovic Courtès
0 siblings, 2 replies; 7+ messages in thread
From: Christopher Baines @ 2017-11-27 8:48 UTC (permalink / raw)
To: 29468
* gnu/services/desktop.scm (%udisks-activation): New variable.
(udisks-service-type)[extensions]: Extend the activation service type with
%udisks-activation.
---
gnu/services/desktop.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 4b5100c27..ec33e1d5e 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -507,6 +507,15 @@ site} for more information."
(udisks udisks-configuration-udisks
(default udisks)))
+(define %udisks-activation
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+
+ (let ((run-dir "/var/run/udisks2"))
+ (mkdir-p run-dir)
+ (chmod run-dir #o700)))))
+
(define udisks-service-type
(let ((udisks-package (lambda (config)
(list (udisks-configuration-udisks config)))))
@@ -518,6 +527,8 @@ site} for more information."
udisks-package)
(service-extension udev-service-type
udisks-package)
+ (service-extension activation-service-type
+ (const %udisks-activation))
;; Profile 'udisksctl' & co. in the system profile.
(service-extension profile-service-type
--
2.14.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#29468] [PATCH 2/2] gnu: Patch udisks to directly reference cryptsetup and parted.
2017-11-27 8:48 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Christopher Baines
@ 2017-11-27 8:48 ` Christopher Baines
2017-11-27 14:09 ` Ludovic Courtès
2017-11-27 14:08 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Ludovic Courtès
1 sibling, 1 reply; 7+ messages in thread
From: Christopher Baines @ 2017-11-27 8:48 UTC (permalink / raw)
To: 29468
This fixes some functionality in gnome-disks, which uses udisks. Adding
cryptsetup enables creating partitions using LUKS, and adding parted enables
editing the partition tables through the disks application.
* gnu/packages/freedesktop.scm (udisks)[inputs]: Add cryptsetup and parted.
(arguments): Rename set-mount-file-name phase, and add cryptsetup and
parted.
---
gnu/packages/freedesktop.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index cac1f67c5..b0f711440 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -40,7 +40,9 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages cryptsetup)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages disk)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gettext)
@@ -613,7 +615,9 @@ Analysis and Reporting Technology) functionality.")
("libatasmart" ,libatasmart)
("libgudev" ,libgudev)
("polkit" ,polkit)
- ("util-linux" ,util-linux)))
+ ("util-linux" ,util-linux)
+ ("cryptsetup" ,cryptsetup)
+ ("parted" ,parted)))
(outputs '("out"
"doc")) ;5 MiB of gtk-doc HTML
(arguments
@@ -653,14 +657,18 @@ Analysis and Reporting Technology) functionality.")
"girdir = $(datadir)/gir-1.0\n")
(("typelibsdir = .*")
"typelibsdir = $(libdir)/girepository-1.0\n"))))
- (add-after 'install 'set-mount-file-name
+ (add-after 'install 'wrap-udisksd
(lambda* (#:key outputs inputs #:allow-other-keys)
;; Tell 'udisksd' where to find the 'mount' command.
(let ((out (assoc-ref outputs "out"))
- (utils (assoc-ref inputs "util-linux")))
+ (utils (assoc-ref inputs "util-linux"))
+ (cryptsetup (assoc-ref inputs "cryptsetup"))
+ (parted (assoc-ref inputs "parted")))
(wrap-program (string-append out "/libexec/udisks2/udisksd")
`("PATH" ":" prefix
(,(string-append utils "/bin") ;for 'mount'
+ ,(string-append cryptsetup "/sbin")
+ ,(string-append parted "/sbin")
"/run/current-system/profile/bin"
"/run/current-system/profile/sbin")))
#t))))))
--
2.14.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service.
2017-11-27 8:48 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Christopher Baines
2017-11-27 8:48 ` [bug#29468] [PATCH 2/2] gnu: Patch udisks to directly reference cryptsetup and parted Christopher Baines
@ 2017-11-27 14:08 ` Ludovic Courtès
2017-11-27 19:29 ` Christopher Baines
1 sibling, 1 reply; 7+ messages in thread
From: Ludovic Courtès @ 2017-11-27 14:08 UTC (permalink / raw)
To: Christopher Baines; +Cc: 29468
Christopher Baines <mail@cbaines.net> skribis:
> * gnu/services/desktop.scm (%udisks-activation): New variable.
> (udisks-service-type)[extensions]: Extend the activation service type with
> %udisks-activation.
What was the effect of lacking /var/run/udisks2? Perhaps add a comment
explaining what it’s used for.
If it fixes something, fine with me! :-)
Ludo’.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#29468] [PATCH 2/2] gnu: Patch udisks to directly reference cryptsetup and parted.
2017-11-27 8:48 ` [bug#29468] [PATCH 2/2] gnu: Patch udisks to directly reference cryptsetup and parted Christopher Baines
@ 2017-11-27 14:09 ` Ludovic Courtès
2017-11-27 19:47 ` bug#29468: " Christopher Baines
0 siblings, 1 reply; 7+ messages in thread
From: Ludovic Courtès @ 2017-11-27 14:09 UTC (permalink / raw)
To: Christopher Baines; +Cc: 29468
Christopher Baines <mail@cbaines.net> skribis:
> This fixes some functionality in gnome-disks, which uses udisks. Adding
> cryptsetup enables creating partitions using LUKS, and adding parted enables
> editing the partition tables through the disks application.
>
> * gnu/packages/freedesktop.scm (udisks)[inputs]: Add cryptsetup and parted.
> (arguments): Rename set-mount-file-name phase, and add cryptsetup and
> parted.
I think the explanation above should be a comment, but otherwise LGTM.
Thanks for fixing it!
Ludo’.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service.
2017-11-27 14:08 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Ludovic Courtès
@ 2017-11-27 19:29 ` Christopher Baines
0 siblings, 0 replies; 7+ messages in thread
From: Christopher Baines @ 2017-11-27 19:29 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 29468
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
Ludovic Courtès writes:
> Christopher Baines <mail@cbaines.net> skribis:
>
>> * gnu/services/desktop.scm (%udisks-activation): New variable.
>> (udisks-service-type)[extensions]: Extend the activation service type with
>> %udisks-activation.
>
> What was the effect of lacking /var/run/udisks2? Perhaps add a comment
> explaining what it’s used for.
>
> If it fixes something, fine with me! :-)
Not quite sure, I don't know anything about udisks. I did write down the
error I got though...
Cannot create directory /var/run/udisks2/block-format-tos-A9rUrL
No such file or directory:
I've had a quick look, but haven't found anything documenting this
requirement.
I'll go ahead and push this, hopefully it can be clarified in the
future.
Thanks for reviewing,
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#29468: [PATCH 2/2] gnu: Patch udisks to directly reference cryptsetup and parted.
2017-11-27 14:09 ` Ludovic Courtès
@ 2017-11-27 19:47 ` Christopher Baines
0 siblings, 0 replies; 7+ messages in thread
From: Christopher Baines @ 2017-11-27 19:47 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 29468-done
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
Ludovic Courtès writes:
> Christopher Baines <mail@cbaines.net> skribis:
>
>> This fixes some functionality in gnome-disks, which uses udisks. Adding
>> cryptsetup enables creating partitions using LUKS, and adding parted enables
>> editing the partition tables through the disks application.
>>
>> * gnu/packages/freedesktop.scm (udisks)[inputs]: Add cryptsetup and parted.
>> (arguments): Rename set-mount-file-name phase, and add cryptsetup and
>> parted.
>
> I think the explanation above should be a comment, but otherwise LGTM.
>
> Thanks for fixing it!
No problem, I've added a couple of comments and pushed.
Thanks for reviewing :)
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-11-27 19:48 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-27 8:38 [bug#29468] [PATCH 0/2] Fix some functionality in gnome-disks Christopher Baines
2017-11-27 8:48 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Christopher Baines
2017-11-27 8:48 ` [bug#29468] [PATCH 2/2] gnu: Patch udisks to directly reference cryptsetup and parted Christopher Baines
2017-11-27 14:09 ` Ludovic Courtès
2017-11-27 19:47 ` bug#29468: " Christopher Baines
2017-11-27 14:08 ` [bug#29468] [PATCH 1/2] services: desktop: Create /var/run/udisks2 for the udisks service Ludovic Courtès
2017-11-27 19:29 ` Christopher Baines
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.