[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#30572] [PATCH 3/7] system: Allow customization of the initrd's Guil
From: |
Chris Marusich |
Subject: |
[bug#30572] [PATCH 3/7] system: Allow customization of the initrd's Guile. |
Date: |
Thu, 22 Feb 2018 13:10:33 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Chris Marusich <address@hidden> writes:
> +<<<<<<< HEAD
> #:volatile-root? '#$volatile-root?
> #:on-error '#$on-error)))
> #:name "raw-initrd"))
> +=======
> + #:volatile-root? '#$volatile-root?)))
> + #:name "raw-initrd"
> + #:guile guile))
> +>>>>>>> system: Allow customization of the initrd's Guile.
>
> ...
>
> +<<<<<<< HEAD
> #:on-error on-error))
> +=======
> + #:guile guile))
> +>>>>>>> system: Allow customization of the initrd's Guile.
This is obviously not correct. I accidentally forgot to resolve these
conflicts when rebasing my branch onto origin/master. Please disregard
patch 3/7 in favor of the attached patch, which resolves the conflicts.
I've verified (for sure, this time!) that this patch series builds
successfully after it has been applied. Sorry for the additional churn!
--
Chris
0003-system-Allow-customization-of-the-initrd-s-Guile.patch
Description: Text Data
signature.asc
Description: PGP signature
- [bug#30572] [PATCH 5/7] docker: Allow the addition of extra files into the image., (continued)
[bug#30572] [PATCH 4/7] docker: Allow the use of a custom temporary directory., Chris Marusich, 2018/02/22
[bug#30572] [PATCH 3/7] system: Allow customization of the initrd's Guile., Chris Marusich, 2018/02/22
- [bug#30572] [PATCH 3/7] system: Allow customization of the initrd's Guile.,
Chris Marusich <=
[bug#30572] [PATCH 7/7] tests: Add tests for "guix system disk-image" et al., Chris Marusich, 2018/02/22
[bug#30572] [PATCH 6/7] system: Add "guix system docker-image" command., Chris Marusich, 2018/02/22
[bug#30572] [PATCH 1/7] tests: Add tests for "guix pack"., Ludovic Courtès, 2018/02/27