From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:38089) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHAHy-0002QX-Qp for guix-patches@gnu.org; Wed, 25 Mar 2020 13:58:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHAHx-0001ot-Pj for guix-patches@gnu.org; Wed, 25 Mar 2020 13:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHAHx-0001oJ-La for guix-patches@gnu.org; Wed, 25 Mar 2020 13:58:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jHAHx-000392-Iw for guix-patches@gnu.org; Wed, 25 Mar 2020 13:58:01 -0400 Subject: [bug#40207] [PATCH 2/2] tests: install: Add %test-gui-installed-desktop-os-encrypted. Resent-Message-ID: References: <20200324083626.30650-1-m.othacehe@gmail.com> <20200324083626.30650-2-m.othacehe@gmail.com> <874kueniln.fsf@gnu.org> From: Mathieu Othacehe In-reply-to: <874kueniln.fsf@gnu.org> Date: Wed, 25 Mar 2020 18:57:00 +0100 Message-ID: <87d090nwr7.fsf@gmail.com> 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 40207@debbugs.gnu.org Hey, > 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-lev= el 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 sin= gle 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" --8<---------------cut here---------------start------------->8--- (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))) --8<---------------cut here---------------end--------------->8--- applying the dirty snippet below fixes it, but you may have a better idea? --8<---------------cut here---------------start------------->8--- --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -233,7 +233,7 @@ deduplicates files common to CLOSURE and the rest of PR= EFIX." "Return the estimated size of a partition that can store the store items 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)))) (define* (initialize-partition-table device partitions --8<---------------cut here---------------end--------------->8--- Thanks, Mathieu