On Thu, Apr 16, 2015 at 02:47:52PM +0200, Ludovic Courtès wrote:
Tomáš Čech <sleep_wal...@gnu.org> skribis:On Wed, Apr 15, 2015 at 02:32:14PM +0200, Ludovic Courtès wrote:[...]Sorry I’m not really familiar with LVM.It's implemented using device mapper but instead of mapping one block device to another you map one block device to whole group (like playground where you can do anything).What do you mean by “whole group”? A tree under /dev/mapper?
From device node POV it generates /dev/<volume_group_name>/<logical_volume_name> and it also creates /dev/mapper/<volume_group_name>-<logical_volume_name> and /dev/dm-<number>. From block device perspective it adds another level of "partitioning" to "physical volume" partitions. You gather block devices (can be partitions, disks, anything), create volume group to join the space into one entity and then create logical volumes without caring where it really is. Logical volumes are useful for resizing, adding and removing filesystems - it has always the same device node.
Technically, if LVM volumes are mapped devices, the best would be to define a <mapped-device-kind> structure for them, as discussed on IRC (like ‘luks-device-mapping’ in (gnu system).)I didn't like the idea first because it felt confusing and unatural. Words like `mapping' and `source' and `target' are misleading. But from programming POV it seems to be the easisest approach in the end.I would think the terms are pretty descriptive, esp. when looking at the corresponding section of the manual, but I’m biased. ;-)
I meant in LVM context of course.
Now, my understanding of your message is not so much that the terms are misleading, but rather that the abstraction is bogus (which appears to be the case based on what you say.)On the other hand problem starts with need-for-boot?. Device mapped device will be activated during the boot (which is desirable for LVM) only if there is filesystem which uses such device and has `need-for-boot?' set to #t.Right. I was hesitant about this approach actually, see 9cb426b8.
Ah, OK, I didn't updated since I started to work on LVM.
I needed to tweak operating-system-boot-mapped-devices to not filter mappings of the new type at all. Now it seems to generate initrd capable of booting root filesystem from LVM :)Nice! Could you post your working version of the patch, just to make things more concrete?
I attach patch to this mail.
The thing is that this design is not nice. I always admired Scheme's power in expressing things naturally. mapped-device interface is for mapping 1 block device to 1 block device which will contain 1 filesystem.Understood. This has nothing to do with Scheme, really. :-)Design I'm thinking about would follow file-system structure. For device property (I'm not sure if this is proper word in Scheme for item of record type) to define functions like `partition' (disk, number), `mapped-device' (source, target, type), `logical-volume' (group, volume) and whatever would be needed further. You could then express your mount in more powerful way like: (partition "sda" 1) (mapped-device (partition "sda" 2) "encrypted_swap" luks-mapping-type) (logical-volume "system_group" "root") (mapped-device (logical-volume "some_group" "some_volume") "encrypted data" luks-mapping-type) etc.I see. Looks good! Does the volume some_group/some_volume have an associated /dev node or tree? What does it look like?
Yes, it does, I described above.
Really a detail, but I think "/dev/sda2" or (partition "/dev/sda2") is enough; no need to abstract it, IMO, since device node name is up to the user.
Well, I faced situations where such freedom of expression would be handy, but there were rare. sda says that it is the first found scsi device in the system but it doesn't say anything about accessibility of the device (`local-disk' should be introduced as well I think).
Of course, it would lead to more complicated code to handle such configuration, but it would definitely feel more natural. When other block device type (like iSCSI) would be required, just another function (or whatever it is) would be implemented.Anything special about iSCSI? I would expect iSCSI partitions/disks to just have block devices as usual, no?
Yes, but when you have root filesystem on iSCSI, you need to perform other actions to make that block device available as with device mapping or LVM... (You need to configure and establish connection to iSCSI target.) Ad the progress - current state of the patch is that it should work for filesystems mounted from initrd. And is ugly. As I understand the problem, created device nodes are missing after switch-root and it seems it tried to mount filesystems before starting eudev. I'll have a look on that again after some sleep. Thank you for your comments. S_W
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index caec80f..18d1f06 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -1638,6 +1638,33 @@ mapper. Kernel components are part of Linux-libre.")
;; Command-line tools are GPLv2.
(license (list gpl2 lgpl2.1))))
+(define-public lvm2/static
+ (package
+ (name "lvm2-static")
+ (version (package-version lvm2))
+ (build-system trivial-build-system)
+ (source #f)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let ((source (string-append (assoc-ref %build-inputs "lvm2")
"/sbin"))
+ (bin (string-append (assoc-ref %outputs "out") "/sbin")))
+ (mkdir-p bin)
+ (for-each (lambda (file)
+ (copy-file (string-append source "/" file)
+ (string-append bin "/" file)))
+ '("lvm.static" "dmsetup.static"))))))
+
+ (native-inputs `(("lvm2" ,lvm2 "static")))
+ (synopsis "Statically-linked commands from lvm2")
+ (description
+ "This package provides statically-linked binaries dmsetup and lvm taken
+from lvm2 package. It is meant to be used in initrds.")
+ (home-page (package-home-page lvm2))
+ (license (package-license lvm2))))
+
(define-public wireless-tools
(package
(name "wireless-tools")
diff --git a/gnu/system.scm b/gnu/system.scm
index 6cf12df..7c1e67c 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -41,6 +41,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages firmware)
#:autoload (gnu packages cryptsetup) (cryptsetup)
+ #:autoload (gnu packages linux) (lvm2/static)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services base)
@@ -86,7 +87,9 @@
%base-packages
%base-firmware
- luks-device-mapping))
+ luks-device-mapping
+ lvm-mapping
+ lvm-mapping-used?))
;;; Commentary:
;;;
@@ -208,6 +211,27 @@ file."
(open open-luks-device)
(close close-luks-device)))
+(define (logical-volume-group-activate source target)
+ #~(zero? (system* (string-append #$lvm2/static "/sbin/lvm.static")
+ "vgchange" "--activate" "y" #$target)))
+
+(define (logical-volume-group-deactivate source target)
+ #~(zero? (system* (string-append #$lvm2/static "/sbin/lvm.static")
+ "vgchange" "--activate" "n" #$target)))
+
+(define (lvm-mapping-used? devices)
+ (not
+ (null? (filter
+ (lambda (md)
+ (eq? (mapped-device-type md)
+ lvm-mapping))
+ devices))))
+
+(define lvm-mapping
+ (mapped-device-kind
+ (open logical-volume-group-activate)
+ (close logical-volume-group-deactivate)))
+
(define (other-file-system-services os)
"Return file system services for the file systems of OS that are not marked
as 'needed-for-boot'."
@@ -267,7 +291,10 @@ from the initrd."
(file-systems (operating-system-file-systems os)))
(filter (lambda (md)
(let ((user (mapped-device-user md file-systems)))
- (and user (file-system-needed-for-boot? user))))
+ (or
+ (and user (file-system-needed-for-boot? user))
+ (and (eq? (mapped-device-type md)
+ lvm-mapping)))))
devices)))
(define (device-mapping-services os)
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 83685ad..fc8bbd3 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -25,6 +25,7 @@
#:select (%store-prefix))
#:use-module ((guix derivations)
#:select (derivation->output-path))
+ #:use-module (gnu system)
#:use-module (gnu packages cpio)
#:use-module (gnu packages compression)
#:use-module (gnu packages linux)
@@ -212,6 +213,9 @@ loaded at boot time in the order in which they appear."
file-systems)
(list e2fsck/static)
'())
+ ,@(if (lvm-mapping-used? mapped-devices)
+ (list lvm2/static)
+ '())
,@(if volatile-root?
(list unionfs-fuse/static)
'())))
@@ -241,7 +245,19 @@ loaded at boot time in the order in which they appear."
(boot-system #:mounts '#$(map file-system->spec file-systems)
#:pre-mount (lambda ()
- (and #$@device-mapping-commands))
+ (and #$@device-mapping-commands
+ ;; If we activated any volume group,
we
+ ;; need to ensure that device nodes
are
+ ;; created. Add code here to call it
+ ;; once for all activations.
+ #$(when (lvm-mapping-used?
mapped-devices)
+ #~(zero?
+ (system* (string-append
+ #$lvm2/static
+ "/sbin/lvm.static")
+ "vgscan"
+ "--mknodes")))))
+
#:linux-modules '#$linux-modules
#:linux-module-directory '#$kodir
#:qemu-guest-networking? #$qemu-networking?
pgpg77YA8tmI1.pgp
Description: PGP signature
