unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Jan Nieuwenhuizen <janneke@gnu.org>
To: "Ludovic Courtès " <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: 04/06: services: hurd-vm: Avoid circular dependency with (gnu system images hurd).
Date: Sat, 09 Jan 2021 11:53:01 +0100	[thread overview]
Message-ID: <87turqwfea.fsf@gnu.org> (raw)
In-Reply-To: <20201207114953.D97D220CEB@vcs0.savannah.gnu.org> (guix-commits@gnu.org's message of "Mon, 7 Dec 2020 06:49:53 -0500 (EST)")

Hi!

On current master, the disk-size setting on a childhurd has no effect,
leaving very little disk space to do development.

I am suspecting this commit

> commit 859b362f81598830d7ff276b96a8724aee3c4db7
> Author: Ludovic Courtès <ludo@gnu.org>
> AuthorDate: Mon Dec 7 12:38:25 2020 +0100
>
>     services: hurd-vm: Avoid circular dependency with (gnu system images hurd).
>     
>     * gnu/services/virtualization.scm (hurd-vm-disk-image): Use
>     'lookup-image-type-by-name' instead of referring to 'hurd-disk-image'
>     from (gnu system images hurd).
> ---
>  gnu/services/virtualization.scm | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
> index eaf0bbd..f435630 100644
> --- a/gnu/services/virtualization.scm
> +++ b/gnu/services/virtualization.scm

[..]

> @@ -913,14 +912,12 @@ that will be listening to receive secret keys on port 1004, TCP."
>  (define (hurd-vm-disk-image config)
>    "Return a disk-image for the Hurd according to CONFIG.  The secret-service
>  is added to the OS specified in CONFIG."
> -  (let ((os (secret-service-operating-system (hurd-vm-configuration-os config)))
> -        (disk-size (hurd-vm-configuration-disk-size config)))
> -    (system-image
> -     (image
> -      (inherit hurd-disk-image)
> -      (format 'compressed-qcow2)
> -      (size disk-size)
> -      (operating-system os)))))

This system-image included (size disk-size), and here

> +  (let* ((os        (secret-service-operating-system
> +                     (hurd-vm-configuration-os config)))
> +         (disk-size (hurd-vm-configuration-disk-size config))
> +         (type      (lookup-image-type-by-name 'hurd-qcow2))
> +         (os->image (image-type-constructor type)))
> +    (system-image (os->image os))))

disk-size goes unused.

Greetings,
Janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com


       reply	other threads:[~2021-01-09 10:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20201207114951.24738.95603@vcs0.savannah.gnu.org>
     [not found] ` <20201207114953.D97D220CEB@vcs0.savannah.gnu.org>
2021-01-09 10:53   ` Jan Nieuwenhuizen [this message]
2021-01-14 22:08     ` 04/06: services: hurd-vm: Avoid circular dependency with (gnu system images hurd) Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87turqwfea.fsf@gnu.org \
    --to=janneke@gnu.org \
    --cc=guix-devel@gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).