diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-10 23:16:47 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-10 23:16:47 +0200 |
| commit | c5f66d29311031d59424dd470ae6c3a315a79712 (patch) | |
| tree | 3fbce07d128a2bbed64aa0e65010b715c9ae20c9 /guix/scripts/pack.scm | |
| parent | 2f9f792a1e4854bd17a26366a84911656607b4a3 (diff) | |
| download | guix-c5f66d29311031d59424dd470ae6c3a315a79712.tar guix-c5f66d29311031d59424dd470ae6c3a315a79712.tar.gz | |
pack: Fix 'guix pack -f docker'.
Regression introduced in a0f352b30f4869a7af7017b8a5011ac7602dd115.
* guix/scripts/pack.scm (docker-image): Check whether ENTRY-POINT is
true before returning (string-append #$profile ...).
Diffstat (limited to 'guix/scripts/pack.scm')
| -rw-r--r-- | guix/scripts/pack.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 5da23e038b..c90b777222 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -455,8 +455,9 @@ the image." #$profile #:database #+database #:system (or #$target (utsname:machine (uname))) - #:entry-point (string-append #$profile "/" - #$entry-point) + #:entry-point #$(and entry-point + #~(string-append #$profile "/" + #$entry-point)) #:symlinks '#$symlinks #:compressor '#$(compressor-command compressor) #:creation-time (make-time time-utc 0 1)))))) |