Re: 04/06: services: hurd-vm: Avoid circular dependency with (gnu system images hurd).

[Ludovic Courtès]

Hi,

Jan Nieuwenhuizen <janneke@gnu.org> skribis:

> 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.

Oops, my bad; thanks for catching it!

Ludo’.