From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kG5wNgvsGWQciwAASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 18:40:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wEU3NgvsGWT0VQEAauVa8A (envelope-from ) for ; Tue, 21 Mar 2023 18:40:27 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4AE0117B87 for ; Tue, 21 Mar 2023 18:40:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pefxu-0005CO-91; Tue, 21 Mar 2023 13:40:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pefxr-0005Bx-Cp for guix-patches@gnu.org; Tue, 21 Mar 2023 13:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pefxq-0006xF-Li for guix-patches@gnu.org; Tue, 21 Mar 2023 13:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pefxq-0000uv-DD for guix-patches@gnu.org; Tue, 21 Mar 2023 13:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#60442] [PATCH] bootloader: grub: Add support for root on lvm. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 17:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60442 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Michael Rohleder Cc: 60442@debbugs.gnu.org Received: via spool by 60442-submit@debbugs.gnu.org id=B60442.16794203903491 (code B ref 60442); Tue, 21 Mar 2023 17:40:02 +0000 Received: (at 60442) by debbugs.gnu.org; 21 Mar 2023 17:39:50 +0000 Received: from localhost ([127.0.0.1]:60464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pefxe-0000uE-5u for submit@debbugs.gnu.org; Tue, 21 Mar 2023 13:39:50 -0400 Received: from mail-qv1-f41.google.com ([209.85.219.41]:33331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pefxb-0000tw-0V for 60442@debbugs.gnu.org; Tue, 21 Mar 2023 13:39:48 -0400 Received: by mail-qv1-f41.google.com with SMTP id m6so10382376qvq.0 for <60442@debbugs.gnu.org>; Tue, 21 Mar 2023 10:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679420381; h=content-transfer-encoding:mime-version:message-id:date:user-agent :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rzff/jKHK/WloBA7o/mjRsqb87Zu/66ZETJnaaOl4QQ=; b=oREhJAZNPzob332U/YWl5Ih66uuXe+wHPA02cJwxZIp+ypOk8+xiRtU+vjFGZIW1g4 YyvWFQejfdUv+r3sgHDiNy9Qv9U91PJz0AO7frHumko1/ke91O9VvDAssyZeuBqcz450 OLUYZF12M3v1ZDxC0ha65FbSCpFJztgtWS1Y9akV186UrcPRi+/yLi5OQSJEcXQ3MIID kTPozIWnKKxuPDN8kWUdw9VbPef/kvUZ7bOmsXQIqfm0xcOh/LGf9YqAay+1hgFJWy/F DdabYbQZu0fxNDjXp/0u0hGD1o67RY9qWijaaBo6pZwTlbqfOx9dZnpREuPOt5MEa+/A Tq8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679420381; h=content-transfer-encoding:mime-version:message-id:date:user-agent :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Rzff/jKHK/WloBA7o/mjRsqb87Zu/66ZETJnaaOl4QQ=; b=PvA0jfCIEOEjHKRAmYZHE3eHvbFqcTTPNL+S4/7hJBFZgXfC6TaduIsJTt9oEogcSJ GGBbhfbJGFmGpY347GYabDEwXuhVSvrec8uL9I+qIwcKL4lR+poeFQoXyH/EVcam2KD7 24IcqZzJ3naQ0MYHcFmx8QQvGBe0RbDBRG9h9gsw/TRIt7635R6hVb5wSuLqEWHEWw5y gKVt+347Q+OTl1pavQzX55+FTneg868J4VhX6QZNUaFSsAmlCHdyb7UiLUgdL3WcX4VC nHQYq5bIDv8Lc89OSq/6R1XuWTCd0rO2nUnYwfRmJQtES0/CghUrBK5M7ND4e59aG41P 7b7A== X-Gm-Message-State: AO0yUKUEjrVfXmMiArsEp8Rqgm/LgUMesFisXBVVT9zvN1DY+PBsSHk9 aSX/27MmHRRJX7wbQXg0yw6DRwA9fR2c6g== X-Google-Smtp-Source: AK7set/a1qvTdV5kYrEfefBxXdlTpQuL5HJ3P0jqp2/qGby9lpLF6GLIHqM4gXhZBjrHnaJfcgdr4g== X-Received: by 2002:a05:6214:e4c:b0:56e:a3a2:1a1c with SMTP id o12-20020a0562140e4c00b0056ea3a21a1cmr656301qvc.33.1679420380949; Tue, 21 Mar 2023 10:39:40 -0700 (PDT) Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id 11-20020a37060b000000b0071d0f1d01easm3610166qkg.57.2023.03.21.10.39.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 10:39:40 -0700 (PDT) From: Maxim Cournoyer In-Reply-To: <20221231012511.5031-1-mike@rohleder.de> (Michael Rohleder's message of "Sat, 31 Dec 2022 02:25:11 +0100") References: <20221231012511.5031-1-mike@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) Date: Tue, 21 Mar 2023 13:39:38 -0400 Message-ID: <87pm92ngv9.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679420427; a=rsa-sha256; cv=none; b=R5P/cN3GTghhKf97zHoROYx0hgsBvZVrD+V15UdwJp6/yuvZzVA4hxaZQLa47yoxMeEc48 6DE1zAmz3WUNHj28UHvWMLnjOAcWQiDp9aSw2m4q/tNy2wV3wKMiJv1MhL1ZoixunXUWUz cVU6FDPR99L2oKxDRTXR5CGg5sdgEDzYwjQ/VpZeTWC7myfUsvjKc/+UOSR2nVifHt17UU Gxh1ChQfnyix5SVGqgqLz5Ne+6JFkv2M18nifpLeMvLXZT+gQF0/uSE7BbGstaKHA8RUFH 4sxhsx8sDV7sAPoW1gvORmi8ekIy211Gq4uP/8gwOIGnvCAP1at1MpLHdweIBg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=oREhJAZN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679420427; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Qx2RheU2UUqK8W8CvP51D65u8G1A/idH2iLEYiDN7+I=; b=i9TUIjvw9lWs8vfPcAKvL5rMNfY/UijNsFVE6dek7F8TncZ/85Hj/PmdVHTq/JG8d1qeUh qxHj2WgK/A/aewSe+CgRUifQ1DPsMmBccTy1J4qQqZAXJ8Axd7F7GeT2CUJTd4BaZMDGCu O2FfXNB8VIeX6SEEh4u56ry5T8/LeDnSDjKkp3vnE3SQhvITkzHsxh9c7QOY0dDns/+lej nndVA1SpfwDJ5kWVasdiKbVO0XvTo0YZqon1SDHMgd1gTaUaVkHrDbxkwW+qd4RCq8qLr6 3PiHUmzIvjoqLE3dFKMj9vZNC0tcWgfYYNKxTpK7iC9UiYlGqcBGYm+OqlvMxw== X-Migadu-Spam-Score: 5.75 X-Spam-Score: 5.75 X-Migadu-Queue-Id: 4AE0117B87 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=oREhJAZN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn1.migadu.com X-TUID: Arvwfz6hJK6E Hi Michael, Michael Rohleder writes: > This fixes . > > * gnu/bootloader/grub.scm (install-grub) > (install-grub-efi) > (install-grub-efi-removable) > (install-grub-efi32): Add setting GRUB_PRELOAD_MODULES to lvm. > * gnu/tests/install.scm (test-lvm-root-os): New variable. > --- > gnu/bootloader/grub.scm | 9 +++++ > gnu/tests/install.scm | 81 ++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 89 insertions(+), 1 deletion(-) > > diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm > index ecd44e7f3c..1e2d142452 100644 > --- a/gnu/bootloader/grub.scm > +++ b/gnu/bootloader/grub.scm > @@ -9,6 +9,7 @@ > ;;; Copyright =C2=A9 2020 Stefan > ;;; Copyright =C2=A9 2022 Karl Hallsby > ;;; Copyright =C2=A9 2022 Denis 'GNUtoo' Carikli > +;;; Copyright =C2=A9 2022 Michael Rohleder > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -557,6 +558,8 @@ (define install-grub > ;; Tell 'grub-install' that there might be a LUKS-encrypted > ;; /boot or root partition. > (setenv "GRUB_ENABLE_CRYPTODISK" "y") > + ;; Let us boot from lvm > + (setenv "GRUB_PRELOAD_MODULES" "lvm") >=20=20 > ;; Hide potentially confusing messages from the user, such= as > ;; "Installing for i386-pc platform." > @@ -629,6 +632,8 @@ (define install-grub-efi > ;; Tell 'grub-install' that there might be a LUKS-encrypted /b= oot or > ;; root partition. > (setenv "GRUB_ENABLE_CRYPTODISK" "y") > + ;; Let us boot from lvm > + (setenv "GRUB_PRELOAD_MODULES" "lvm") > (invoke/quiet grub-install "--boot-directory" install-dir > "--bootloader-id=3DGuix" > "--efi-directory" target-esp))))) > @@ -652,6 +657,8 @@ (define install-grub-efi-removable > ;; Tell 'grub-install' that there might be a LUKS-encrypted /b= oot or > ;; root partition. > (setenv "GRUB_ENABLE_CRYPTODISK" "y") > + ;; Let us boot from lvm > + (setenv "GRUB_PRELOAD_MODULES" "lvm") > (invoke/quiet grub-install "--boot-directory" install-dir > "--removable" > ;; "--no-nvram" > @@ -675,6 +682,8 @@ (define install-grub-efi32 > ;; Tell 'grub-install' that there might be a LUKS-encrypted /b= oot or > ;; root partition. > (setenv "GRUB_ENABLE_CRYPTODISK" "y") > + ;; Let us boot from lvm > + (setenv "GRUB_PRELOAD_MODULES" "lvm") > (invoke/quiet grub-install "--boot-directory" install-dir > "--bootloader-id=3DGuix" > (cond ((target-x86?) "--target=3Di386-efi") > diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm > index 4e0e274e66..f9d34c1e28 100644 > --- a/gnu/tests/install.scm > +++ b/gnu/tests/install.scm > @@ -5,6 +5,7 @@ > ;;; Copyright =C2=A9 2020 Danny Milosavljevic > ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen > ;;; Copyright =C2=A9 2020, 2021, 2022 Maxim Cournoyer > +;;; Copyright =C2=A9 2022 Michael Rohleder > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -76,6 +77,7 @@ (define-module (gnu tests install) > %test-jfs-root-os > %test-f2fs-root-os > %test-xfs-root-os > + %test-lvm-root-os > %test-lvm-separate-home-os >=20=20 > %test-gui-installed-os > @@ -831,7 +833,6 @@ (define %test-encrypted-root-os > ;;; Separate /home on LVM > ;;; >=20=20 > -;; Since LVM support in guix currently doesn't allow root-on-LVM we use = /home on LVM > (define-os-with-source (%lvm-separate-home-os %lvm-separate-home-os-sour= ce) > (use-modules (gnu) (gnu tests)) >=20=20 > @@ -913,6 +914,84 @@ (define %test-lvm-separate-home-os > `(,@command) "lvm-separate-home-os"))))) >=20=20 > > + > +;;; > +;;; LVM root device. > +;;; > + > +(define-os-with-source (%lvm-root-os %lvm-root-os-source) > + (use-modules (gnu) (gnu tests)) > + > + (operating-system > + (host-name "root-os-on-lvm") > + (timezone "Europe/Paris") > + (locale "en_US.utf8") > + > + (bootloader (bootloader-configuration > + (bootloader grub-bootloader) > + (targets (list "/dev/vdb")))) > + (kernel-arguments '("console=3DttyS0")) > + > + (mapped-devices (list (mapped-device > + (source "vg0") > + (target "vg0-root") > + (type lvm-device-mapping)))) > + (file-systems (cons* (file-system > + (device "/dev/mapper/vg0-root") > + (mount-point "/") > + (type "ext4") > + (dependencies mapped-devices)) > + %base-file-systems)) > + (users %base-user-accounts) > + (services (cons (service marionette-service-type > + (marionette-configuration > + (imported-modules '((gnu services herd) > + (guix combinators))))) > + %base-services)))) > + > +(define %lvm-root-os-installation-script > + "\ > +. /etc/profile > +set -e -x > +guix --version > + > +export GUIX_BUILD_OPTIONS=3D--no-grafts > +parted --script /dev/vdb mklabel gpt \\ > + mkpart primary ext2 1M 3M \\ > + mkpart primary 3M 1.7G \\ > + set 1 boot on \\ > + set 1 bios_grub on > +pvcreate /dev/vdb2 > +vgcreate vg0 /dev/vdb2 > +lvcreate -l 100%FREE -n root vg0 > +vgchange -ay > +mkfs.ext4 -L root-fs /dev/mapper/vg0-root > +mount /dev/mapper/vg0-root /mnt > +herd start cow-store /mnt > +mkdir /mnt/etc > +cp /etc/target-config.scm /mnt/etc/config.scm > +guix system init /mnt/etc/config.scm /mnt --no-substitutes > +sync > +reboot\n") > + > +(define %test-lvm-root-os > + (system-test > + (name "lvm-root-os") > + (description > + "Test functionality of an OS installed with a LVM / partition") > + (value > + (mlet* %store-monad ((image (run-install %lvm-root-os > + %lvm-root-os-source > + #:script > + %lvm-root-os-installation= -script > + #:packages (list lvm2-sta= tic))) > + (command (qemu-command* image > + #:memory-size 512))) > + (run-basic-test %lvm-root-os > + `(,@command) "lvm-root-os"))))) > + > + > + Thanks for this patch. I've applied the change locally, and wanted to see the test fail first, so I've reverted the following: --8<---------------cut here---------------start------------->8--- Unstaged changes (1) modified gnu/bootloader/grub.scm @@ -632,8 +632,6 @@ (define install-grub-efi ;; Tell 'grub-install' that there might be a LUKS-encrypted /boo= t or ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") - ;; Let us boot from lvm - (setenv "GRUB_PRELOAD_MODULES" "lvm") (invoke/quiet grub-install "--boot-directory" install-dir "--bootloader-id=3DGuix" "--efi-directory" target-esp))))) @@ -657,8 +655,6 @@ (define install-grub-efi-removable ;; Tell 'grub-install' that there might be a LUKS-encrypted /boo= t or ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") - ;; Let us boot from lvm - (setenv "GRUB_PRELOAD_MODULES" "lvm") (invoke/quiet grub-install "--boot-directory" install-dir "--removable" ;; "--no-nvram" @@ -682,8 +678,6 @@ (define install-grub-efi32 ;; Tell 'grub-install' that there might be a LUKS-encrypted /boo= t or ;; root partition. (setenv "GRUB_ENABLE_CRYPTODISK" "y") - ;; Let us boot from lvm - (setenv "GRUB_PRELOAD_MODULES" "lvm") (invoke/quiet grub-install "--boot-directory" install-dir "--bootloader-id=3DGuix" (cond ((target-x86?) "--target=3Di386-efi") --8<---------------cut here---------------end--------------->8--- And to my surprise 'make check-system TESTS=3Dlvm-root-os' passed: --8<---------------cut here---------------start------------->8--- %%%% Starting test basic (Writing full log to "/gnu/store/m3rifzddpnc4x47r= 7nhfjkms97nzrc69-lvm-root-os/b) marionette is ready PASS: uname PASS: shepherd socket ready PASS: stdin is /dev/null PASS: shell and user commands PASS: special files PASS: accounts ;;; (services (guix-daemon syslogd mcron console-font-tty3 file-system-/dev= /shm console-font-tty5 file-sy) PASS: shepherd services PASS: libc honors /etc/localtime PASS: /var/log/messages is not world-readable PASS: homes PASS: skeletons in home directories PASS: permissions on /root PASS: ownership and permissions of /var/empty PASS: no extra home directories PASS: login on tty1 PASS: getlogin on tty1 PASS: utmpx entry PASS: wtmp entry PASS: host name resolution PASS: nscd configuration action PASS: nscd invalidate action SKIP: nscd invalidate action, wrong table PASS: host not found PASS: locale PASS: /run/current-system is a GC root PASS: /var/guix/gcroots/profiles is a valid symlink PASS: guix-daemon set-http-proxy action PASS: guix-daemon set-http-proxy action, clear PASS: screendump PASS: screen text # of expected passes 29 # of skipped tests 1 Some deprecated features have been used. Set the environment variable GUILE_WARN_DEPRECATED to "detailed" and rerun the program to get more information. Set it to "no" to suppress this message. successfully built /gnu/store/69naxa7pcjlkn25xz033964z3vgp5c9d-lvm-root-os.= drv /gnu/store/m3rifzddpnc4x47r7nhfjkms97nzrc69-lvm-root-os --8<---------------cut here---------------end--------------->8--- Are you sure this change is really needed? Otherwise why would the test pass even without the change? --=20 Thanks, Maxim