diff options
| -rw-r--r-- | guix/scripts/environment.scm | 16 | ||||
| -rw-r--r-- | guix/scripts/shell.scm | 18 | ||||
| -rw-r--r-- | tests/guix-environment-container.sh | 4 |
3 files changed, 20 insertions, 18 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index cf99760859..afe255fa4a 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -121,9 +121,6 @@ shell'." --expose=SPEC for containers, expose read-only host file system according to SPEC")) (display (G_ " - -F, --emulate-fhs for containers, emulate the Filesystem Hierarchy - Standard (FHS)")) - (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (display (G_ " --bootstrap use bootstrap binaries to build the environment"))) @@ -260,9 +257,6 @@ use '--preserve' instead~%")) (alist-cons 'file-system-mapping (specification->file-system-mapping arg #f) result))) - (option '(#\F "emulate-fhs") #f #f - (lambda (opt name arg result) - (alist-cons 'emulate-fhs? #t result))) (option '(#\r "root") #t #f (lambda (opt name arg result) (alist-cons 'gc-root arg result))) @@ -1030,15 +1024,7 @@ command-line option processing with 'parse-command-line'." (with-store/maybe store (with-status-verbosity (assoc-ref opts 'verbosity) (define manifest-from-opts - (options/resolve-packages - store - ;; For an FHS-container, add the (hidden) package glibc-for-fhs - ;; which uses the global cache at /etc/ld.so.cache. - (if emulate-fhs? - (alist-cons 'expression - '(ad-hoc-package "(@@ (gnu packages base) glibc-for-fhs)") - opts) - opts))) + (options/resolve-packages store opts)) (define manifest (if profile diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm index c115a00320..a2836629ad 100644 --- a/guix/scripts/shell.scm +++ b/guix/scripts/shell.scm @@ -68,6 +68,9 @@ interactive shell in that environment.\n")) --rebuild-cache rebuild cached environment, if any")) (display (G_ " --export-manifest print a manifest for the given options")) + (display (G_ " + -F, --emulate-fhs for containers, emulate the Filesystem Hierarchy + Standard (FHS)")) (show-environment-options-help) (newline) @@ -136,7 +139,20 @@ interactive shell in that environment.\n")) (alist-cons 'explicit-loading? #t result))) (option '("rebuild-cache") #f #f (lambda (opt name arg result) - (alist-cons 'rebuild-cache? #t result)))) + (alist-cons 'rebuild-cache? #t result))) + + (option '(#\F "emulate-fhs") #f #f + (lambda (opt name arg result) + (let ((result + ;; For an FHS-container, add the (hidden) + ;; package glibc-for-fhs which uses the global + ;; cache at /etc/ld.so.cache. + (alist-cons + 'expression + '(ad-hoc-package + "(@@ (gnu packages base) glibc-for-fhs)") + result))) + (alist-cons 'emulate-fhs? #t result))))) (filter-map (lambda (opt) (and (not (any (lambda (name) (member name to-remove)) diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh index 898c57f41b..f233c3fcc0 100644 --- a/tests/guix-environment-container.sh +++ b/tests/guix-environment-container.sh @@ -217,7 +217,7 @@ fi # Test that the container has FHS specific files/directories. Note that /bin # exists in a non-FHS container as it will contain sh, a symlink to the bash # package, so we don't test for it. -guix environment -C --emulate-fhs --ad-hoc --bootstrap guile-bootstrap \ +guix shell -C --emulate-fhs --bootstrap guile-bootstrap \ -- guile -c '(exit (and (file-exists? "/etc/ld.so.cache") (file-exists? "/lib") (file-exists? "/sbin") @@ -229,5 +229,5 @@ guix environment -C --emulate-fhs --ad-hoc --bootstrap guile-bootstrap \ (file-exists? "/usr/share")))' # Test that the ld cache was generated and can be successfully read. -guix environment -C --emulate-fhs --ad-hoc --bootstrap guile-bootstrap \ +guix shell -CF --bootstrap guile-bootstrap \ -- guile -c '(execlp "ldconfig" "ldconfig" "-p")' |