From debbugs-submit-bounces@debbugs.gnu.org Thu Aug 29 04:03:02 2019 Received: (at 36876) by debbugs.gnu.org; 29 Aug 2019 08:03:02 +0000 Received: from localhost ([127.0.0.1]:51551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i3FOX-0005FM-OO for submit@debbugs.gnu.org; Thu, 29 Aug 2019 04:03:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i3FOW-0005Ez-8E for 36876@debbugs.gnu.org; Thu, 29 Aug 2019 04:03:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1i3FOP-0002za-1m; Thu, 29 Aug 2019 04:02:53 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=60710 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1i3FON-0005RP-V3; Thu, 29 Aug 2019 04:02:52 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) Subject: Re: bug#36876: guix system delete-generations removes custom boot menu entries References: <20190731094857.28829b11@gmail.com> <8736ifzjfe.fsf@sdf.lonestar.org> <87sgps6p6c.fsf@gnu.org> <87lfvdpaey.fsf@sdf.lonestar.org> <87r255dl5g.fsf@gnu.org> Date: Thu, 29 Aug 2019 10:02:49 +0200 In-Reply-To: <87r255dl5g.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Wed, 28 Aug 2019 23:39:55 +0200") Message-ID: <877e6wl7py.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 36876 Cc: 36876@debbugs.gnu.org, Jesse Gibbons , Danny Milosavljevic X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi there! Ludovic Court=C3=A8s skribis: > The attached patches should fix this. I=E2=80=99ve successfully deleted a > generation on my system. :-) I don=E2=80=99t have extra menu entries tho= ugh, so > it=E2=80=99d be great if you could give it a try. So I tried it on my laptop: I added a dummy menu entry, reconfigured, rebooted, then ran =E2=80=9Cguix system delete-generations N=E2=80=9D, and = I confirm that it preserves the extra menu entry. There was a typo though: > --- a/gnu/system.scm > +++ b/gnu/system.scm > @@ -116,6 +116,7 @@ > boot-parameters-label > boot-parameters-root-device > boot-parameters-bootloader-name > + boot-parameters-bootloader-menu-entries > boot-parameters-store-device > boot-parameters-store-mount-point > boot-parameters-kernel > @@ -251,6 +252,8 @@ directly by the user." > ;; OS's root file system, so it might be a device path like "/dev/sda3= ". > (root-device boot-parameters-root-device) > (bootloader-name boot-parameters-bootloader-name) > + (bootloader-menu-entries ;list of > + boot-parameters-bootloader-menu-entries) > (store-device boot-parameters-store-device) > (store-mount-point boot-parameters-store-mount-point) > (kernel boot-parameters-kernel) > @@ -297,6 +300,11 @@ file system labels." > ((_ args) args) > (#f 'grub))) ; for compatibility reasons. >=20=20 > + (bootloader-menu-entries > + (match (assq 'bootloader-menu-entries rest) > + ((_ . entries) (map sexp->menu-entry entries)) ^ There shouldn=E2=80=99t be a dot here. I=E2=80=99ll go ahead and push these patches (with this correction) if ther= e are no objections. Thanks, Ludo=E2=80=99.