From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49505) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHDml-0004K6-5l for guix-patches@gnu.org; Wed, 25 Mar 2020 17:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHDmk-0004fn-6R for guix-patches@gnu.org; Wed, 25 Mar 2020 17:42:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51926) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHDmk-0004fg-32 for guix-patches@gnu.org; Wed, 25 Mar 2020 17:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jHDmk-0000vb-0t for guix-patches@gnu.org; Wed, 25 Mar 2020 17:42:02 -0400 Subject: [bug#40207] [PATCH 2/2] tests: install: Add %test-gui-installed-desktop-os-encrypted. Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200324083626.30650-1-m.othacehe@gmail.com> <20200324083626.30650-2-m.othacehe@gmail.com> <874kueniln.fsf@gnu.org> <87d090nwr7.fsf@gmail.com> Date: Wed, 25 Mar 2020 22:41:11 +0100 In-Reply-To: <87d090nwr7.fsf@gmail.com> (Mathieu Othacehe's message of "Wed, 25 Mar 2020 18:57:00 +0100") Message-ID: <87blokgljc.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Mathieu Othacehe Cc: 40207@debbugs.gnu.org Hi! Mathieu Othacehe skribis: >> What about making a separate OS definition for the desktop installation >> case? We=E2=80=99d move the =E2=80=98os=E2=80=99 variable to the top-le= vel and add an =E2=80=98os=E2=80=99 >> parameter to =E2=80=98guided-installation-test=E2=80=99. >> >> Having two separate OS definitions (one for desktop install, one for >> =E2=80=9Cbare-bones=E2=80=9D install) should be clearer than having a si= ngle definition >> with conditionals. > > I fixed all your remarks. But there's still an issue, the size of the > installation image is guessed badly in "run-install" for > "%test-gui-installed-desktop-os-encrypted" > > (image (system-disk-image > (operating-system-with-gc-roots > os (list target)) > #:disk-image-size 'guess ;guess is too low. > #:file-system-type > installation-disk-image-file-system-type))) > > > applying the dirty snippet below fixes it, but you may have a better idea? > > --- a/gnu/build/vm.scm > +++ b/gnu/build/vm.scm > @@ -233,7 +233,7 @@ deduplicates files common to CLOSURE and the rest of = PREFIX." > "Return the estimated size of a partition that can store the store ite= ms > given by GRAPHS, a list of file names produced by #:references-graphs." > ;; Simply add a 25% overhead. > - (round (* 1.25 (closure-size graphs)))) > + (round (* 1.30 (closure-size graphs)))) Weird, the 25% hack had always worked fine. I don=E2=80=99t have a better idea though. Perhaps it=E2=80=99s better to = pass an explicit size in =E2=80=98run-install=E2=80=99 than to modify the 25% hack = above? Thanks, Ludo=E2=80=99.