"pelzflorian (Florian Pelz)" <pelzflor...@pelzflorian.de> skribis:
> Ludovic Courtès <l...@gnu.org> writes: >> So my guess is that things will be much better if we swap these two >> lines. > > This was helpful, but not enough. Sorry, I think I wasn’t thinking at full speed. There needs to be zero daemons running while we copy the database. So the real fix is more like this:
diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 044f79372b..9a6bbad122 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -213,10 +213,13 @@ (define (assert-exit x) (set! ret (run-command install-command #:tty? #t))) (lambda () - ;; Restart guix-daemon so that it does no keep the MNT namespace + ;; Stop guix-daemon so that it does no keep the MNT namespace ;; alive. - (restart-service 'guix-daemon) + (stop-service 'guix-daemon) + + ;; Restore the database and restart it. (copy-file saved-database database-file) + (start-service 'guix-daemon) ;; Finally umount the cow-store and exit the container. (unmount-cow-store (%installer-target-dir) backing-directory)
>> ./pre-inst-env guix system image -t iso9660 --label=Guix \ >> gnu/system/install.scm > > Additionally, I had to do “GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=y > make update-guix-package”. Or else the installer was using a Guix that > did not have the lines swapped. Hmm this is surprising because we’re already using (current-guix) in (gnu installer). > Also before I did the GPG authorization dance (my x86 machine isn’t > worth getting my actual commiter GPG keys, so I make sure its dummy GPG > key is in the keyring branch, .guix-authorizations file, that > guix/channels.scm’s default guix channel points to the url > /home/florian/src/guix and to the commit with the new authorization). > Then I guix pulled. So that building the installer succeeds. I did > *not* use ./pre-inst-env. Ah yes, apologies. You should be able to disable authentication with this:
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 5a09b1fcf8..374b187d8c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -625,6 +625,7 @@ (define-public current-guix-package (inherit guix) (source source) (build-system channel-build-system) + (arguments '(#:authenticate? #f)) (inputs '()) (native-inputs '()) (propagated-inputs '())))
Thanks a lot for patiently testing, this is very helpful! Ludo’.