[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#41541: merge wip-hurd-vm
From: |
Ludovic Courtès |
Subject: |
bug#41541: merge wip-hurd-vm |
Date: |
Fri, 05 Jun 2020 18:08:00 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) |
Hi,
Jan Nieuwenhuizen <janneke@gnu.org> skribis:
> So, after digesting your message here I took the next step: grep for
> _HURD_STARTUP and change it there, like so
>
> diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
> index 421783eb80..8c73ea8430 100644
> --- a/gnu/packages/hurd.scm
> +++ b/gnu/packages/hurd.scm
> @@ -428,9 +428,10 @@ exec ${system}/rc \"$@\"
> "startup/startup.c")
> (("/hurd/")
> (string-append out "/hurd/")))
> - (substitute* "hurd/paths.h"
> - (("_HURD_STARTUP\t")
> - (string-append "_HURD_STARTUP\t\"" out "\" ")))
> + (substitute* '("libdiskfs/boot-start.c"
> + "libdiskfs/opts-std-startup.c")
> + (("_HURD_STARTUP")
> + (string-append "\"" out "/hurd/startup\"")))
Perfect! Perhaps we can add a comment explaining that this is needed
for the first boot, when the /hurd symlink doesn’t exist yet.
> This also works, and so I figure we're fine now. I'm resetting
> wip-hurd-vm and, like Mathieu suggested will prepare to send send a
> patch series here for the unreviewed subset of patches.
Thank you!
Ludo’.
- bug#41541: merge wip-hurd-vm, (continued)
- bug#41541: merge wip-hurd-vm, Mathieu Othacehe, 2020/06/02
- bug#41541: merge wip-hurd-vm, Jan Nieuwenhuizen, 2020/06/02
- bug#41541: merge wip-hurd-vm, Ludovic Courtès, 2020/06/02
- bug#41541: merge wip-hurd-vm, Jan Nieuwenhuizen, 2020/06/02
- bug#41541: merge wip-hurd-vm, Ludovic Courtès, 2020/06/03
- bug#41541: merge wip-hurd-vm, Jan Nieuwenhuizen, 2020/06/03
- bug#41541: merge wip-hurd-vm, Mathieu Othacehe, 2020/06/03
- bug#41541: merge wip-hurd-vm, Jan Nieuwenhuizen, 2020/06/03
- bug#41541: merge wip-hurd-vm, Ludovic Courtès, 2020/06/04
- bug#41541: merge wip-hurd-vm, Jan Nieuwenhuizen, 2020/06/04
- bug#41541: merge wip-hurd-vm,
Ludovic Courtès <=
- bug#41541: merge wip-hurd-vm, Jan Nieuwenhuizen, 2020/06/05