diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-12-05 20:52:58 +0100
committerLudovic Courtès <ludo@gnu.org>2016-12-05 20:54:59 +0100
commit9328eafbf590938d2b7c4b8c6476a8664fa052b7 (patch)
tree40ed40b44da561e47ea5f1ff3e7ac8d8b5d07039
parenta79fbd5d1d59a0cbc998a8133177ddcc9b073b94 (diff)
downloadguix-9328eafbf590938d2b7c4b8c6476a8664fa052b7.tar.gz
guix-9328eafbf590938d2b7c4b8c6476a8664fa052b7.zip
services: file-system: Make sure fsck.* commands are in $PATH.
Fixes a regression introduced in bf7ef1bb848db0977b54ea012789adc68751c68a, whereby the fsck.* commands would not be found. * gnu/services/base.scm (file-system-shepherd-service): Call calls to 'setenv'.
-rw-r--r--gnu/services/base.scm22
1 files changed, 18 insertions, 4 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 2b3d3f8548..ea1ab63d1b 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -269,10 +269,24 @@ FILE-SYSTEM."
#$(if create?
#~(mkdir-p #$target)
#t)
- (mount-file-system
- `(#$device #$title #$target #$type #$flags #$options
- #$check?) #:root "/")
- #t))
+
+ (let (($PATH (getenv "PATH")))
+ ;; Make sure fsck.ext2 & co. can be found.
+ (dynamic-wind
+ (lambda ()
+ (setenv "PATH"
+ (string-append
+ #$e2fsprogs "/sbin:"
+ "/run/current-system/profile/sbin:"
+ $PATH)))
+ (lambda ()
+ (mount-file-system
+ `(#$device #$title #$target #$type #$flags
+ #$options #$check?)
+ #:root "/"))
+ (lambda ()
+ (setenv "PATH" $PATH)))
+ #t)))
(stop #~(lambda args
;; Normally there are no processes left at this point, so
;; TARGET can be safely unmounted.
n='3' class='logmsg'> * gnu/packages/astronomy.scm (python-specutils): Update to 1.14.0. Change-Id: Ied7078bc28d7b995574fb228797f1d046ea52feb 2024-04-30gnu: python-casa-formats-io: Update to 0.3.0.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-casa-formats-io): Update to 0.3.0. Change-Id: I3f8ca4c981ac31cc955d374b4e4735e53af4c868 2024-04-30gnu: python-roman-datamodels: Update to 0.19.1.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-roman-datamodels): Update to 0.19.1. [propagated-inputs]: Remove python-asdf-standard. Change-Id: I30e2adef137bb95f37dd7651ebf8c5e6f9e6155f 2024-04-30gnu: python-regions: Update to 0.9.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-regions): Update to 0.9. [arguments] <#:phases>: Add 'create-setup.py phase, rename 'prepare-test-environment to 'build-extensions to reflect purpose. [native-inputs]: Remove python-cython; add python-cython-3. Change-Id: Ia634f93336eb7658c4eaeeb7ddb6539c2e0adee3 2024-04-30gnu: python-rad: Update to 0.19.2.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-rad): Update to 0.19.2. Change-Id: I4de8e8228f6d7ae1ae28cac726fcce5f2058f928 2024-04-30gnu: python-astroplan: Update to 0.10.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-astroplan): Update to 0.10. Change-Id: I80a988262e417f8a5501d02db5e16a93b5d037b4 2024-04-30gnu: python-sunpy: Update to 5.1.2.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-sunpy): Update to 5.1.2. Change-Id: I275445d688dfb3c3c3da18a37d7d21d79814f8ef 2024-04-30gnu: python-skyfield: Enable tests.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-skyfield): Enable tests. [source]: Swap to git checkout containing test data. [build-system]: Swap to pyproject-build-system. [native-inputs]: Add python-assay and python-pandas. Change-Id: Ia4604ab2e44860dcf1294688639d3c54881f8d8c 2024-04-30gnu: Add python-assay.Sharlatan Hellseher * gnu/packages/python-check.scm (python-assay): New variable. Change-Id: I0ec910d8c37000ff08119a33e3f42af2269fa494 2024-04-30gnu: python-bayesicfitting: Update to 3.2.1.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-bayesicfitting): Update to 3.2.1. Change-Id: I97bfc44920a3e8f7c2040088f284a38e0a66aa88 2024-04-30gnu: python-bayesicfitting: Refresh package style.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-bayesicfitting): Adjust indentation. [build-system]: Swap to pyproject-build-system. [arguments] <#:test-flags>: Add them. <#:phases>: Use test flags in 'check phase. Change-Id: Iffc8591199bbaf2a0da95b6b22476e34121dbe79 2024-04-30gnu: python-gatspy: Refresh package style.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-gatspy): Adjust indentetion. [arguments]: Use #~ qutation style. <#:test-flags>: Activate tests for supersmoother. [propagated-inputs]: Add python-supersmoother. Change-Id: Ibbaae0f87693f5f4aa6e3f92d567881ad58dbfba 2024-04-30gnu: python-ginga: Set HOME for sanity check.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-ginga) [arguments] <#:phases>: Add 'set-home phase. Change-Id: I7fc9b043ae8ac465645215dabc9d8643b8e08fe2 2024-04-30gnu: python-ginga: Update to 5.0.1.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-ginga): Update to 5.0.1. [arguments] <#:phases>: Add 'relax-requirements phase. [propagated-inputs]: Add opencv, python-exif-read python-packaging, python-pyyaml, and python-tomli. [native-inputs]: Add python-pytest-astropy-header. Change-Id: I314bbd9a037b134a03f5a4a174ab878e9523e4b6 2024-04-30gnu: python-tweakwcs: Update to 0.8.7.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-tweakwcs): Update to 0.8.7. Change-Id: I2ef8f29839a99ec3b40efc34a61f57bc32216c8e 2024-04-30gnu: python-tweakwcs: Adjust indentation.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-tweakwcs): Adjust indentation. Change-Id: Ic8c79addbd0253c2364382e6a0e632945eafb05a 2024-04-30gnu: python-synphot: Update to 1.4.0.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-synphot): Update to 1.4.0. Change-Id: I070381de76cfe1bf057d1c8032d2145d5c346fa2 2024-04-30gnu: python-synphot: Add custom check phase.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-synphot): [arguments] <#:phases>: Remove 'prepare-test-environment phase; add custom 'check phase. Change-Id: I9cb6d65c226a555ccd62a3a6c08d00868a66f109 2024-04-30gnu: python-stsci-image: Refresh package style.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-stsci-image): Adjust indentation. [description]: Fix grammar. Change-Id: I1f4bf751720a3be324644bf417104e36510c62a6 2024-04-30gnu: python-stsci-imagestats: Update to 1.8.2.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-stsci-imagestats): Update to 1.8.2. Change-Id: I13bb6eab789a8aa365f6bf0f0f892d8a17e3cc66 2024-04-30gnu: python-stdatamodels: Update to 1.10.1.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-stdatamodels): Update to 1.10.1. Change-Id: Ib1626de00fbd060212b125c3a52e116aa126727e 2024-04-30gnu: python-stcal: Update to 1.7.0.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-stcal): Update to 1.7.0. [native-inputs]: Remove python-pytest-openfiles. Change-Id: Ib33bb72ff73fcf569a2519b3353260461b63c143 2024-04-30gnu: python-jwst: Update to 1.14.0.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-jwst): Update to 1.14.0. [propagated-inputs]: Remove python-asdf-transform-schemas; add python-importlib-metadata, python-packaging, python-pysiaf, and python-synphot. Change-Id: I0310e0680457a7851d07fa14406edf079000fcd5 2024-04-30gnu: python-astropy-healpix: Update to 1.0.3.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-astropy-healpix): Update to 1.0.3. Change-Id: Iffc1d537bd8b3ec10fbb5ddb7c2fd6251813ccde 2024-04-30gnu: python-astropy: Update to 6.0.1.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-astropy): Update to 6.0.1. [arguments]: <#:test-flags>: Enable recently failing tests; disable some new one. [propagated-inputs]: Add python-matplotlib and python-scipy. [native-inputs]: Remove python-matplotlib and python-scipy; add python-threadpoolctl. Change-Id: Iaa48c84565d11c944444ecd1fd77291f4b3c8c3c 2024-04-30gnu: python-astropy: Symplify package.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-astropy): Simplify package. [build-system]: Swap to pyproject-build-system. [arguments] <#:phases>: Merge 'prepare-test-environment into custom 'check phase and move test arguments to <#:test-arguments>. Change-Id: I80098c3eb4e9d95ef2c651d5416196165be3f7c0 2024-04-30gnu: python-astropy-iers-data: Update to 0.2024.4.15.2.45.49.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-astropy-iers-data): Update to 0.2024.4.15.2.45.49. Change-Id: Iaf902a0f506f149682868d0df0710d400b21f7e6 2024-04-30gnu: python-asdf-astropy: Update to 0.6.1.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-asdf-astropy): Update to 0.6.1. Change-Id: I06f00006fcba1d0e385e6bc3f82f7a85403d94a9 2024-04-30gnu: python-asdf: Update to 3.2.0.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-asdf): Update to 3.2.0. [arguments] <#:phases>: Replace 'fix-tests-setup with 'patch-pyprojectct-toml phase and add one more substitution rule. [propagated-inputs]: Remove python-asdf-unit-schemas. Change-Id: I9e7a0282ed0a9eb82a20988762792e10ae33496b 2024-04-30gnu: Add python-supersmoother.Sharlatan Hellseher * gnu/packages/python-science.scm (python-supersmoother): New variable. Change-Id: I8fb43d746757014e3b773c07458b777b893adb4a 2024-04-30gnu: Add python-pysiaf.Sharlatan Hellseher * gnu/packages/astronomy.scm (python-pysiaf): New variable. Change-Id: Ide732d666bccad885ed3e8c78d62df7e74524b9a 2024-04-30gnu: python-exif-read: Update to 3.0.0.Sharlatan Hellseher * gnu/packages/python-xyz.scm (python-exif-read): Update to 3.0.0. Change-Id: I19e0a19041aa943a9f3ecf262077328d52ef4d1d 2024-04-30gnu: parfive: Update to 2.1.0.Sharlatan Hellseher * gnu/packages/python-web.scm (parfive): Update to 2.1.0. Change-Id: I6207150e012c03943d4553854123831d1bba3e55 2024-04-30gnu: python-pytest-socket: Update to 0.7.0.Sharlatan Hellseher * gnu/packages/python-check.scm (python-pytest-socket): Update to 0.7.0. Change-Id: I879064eba2f4d93d2e2b519ebdf613685d5b5df9 2024-04-30gnu: libxisf: Update to 0.2.12.Sharlatan Hellseher * gnu/packages/astronomy.scm (libxisf): Update to 0.2.12. Change-Id: Ide88155581b317cdb74683f49d2ec8b87c6bc5de 2024-04-30gnu: indi-2.0: Update to 2.0.7.Sharlatan Hellseher * gnu/packages/astronomy.scm (indi-2.0): Update to 2.0.7. Change-Id: Ia134449cc18a0c70dcba962b0ea51e2341d34e98 2024-04-30gnu: stellarium: Update to 24.1.Sharlatan Hellseher * gnu/packages/astronomy.scm (stellarium): Update to 24.1. Change-Id: I53dea0e03a3b7c4d78b4946a2bbc9a13f9fbec6f 2024-04-30gnu: cfitsio: Update to 4.4.0.Sharlatan Hellseher * gnu/packages/astronomy.scm (cfitsio): Update to 4.4.0. Change-Id: Iac79d04b1cfb59038578939266bc4b948fb3c908 2024-04-30gnu: Add emacs-atomic-chrome.Nicolas Goaziou * gnu/packages/emacs-xyz.scm (emacs-atomic-chrome): New variable. Change-Id: Ib67551731a22fc576b9e01176b49a6b30ce22465 2024-04-30gnu: emacs-wttrin: Update to 0.2.4.Nicolas Goaziou * gnu/packages/emacs-xyz.scm (emacs-wttrin): Update to 0.2.4. [source]<origin>: Switch to an active upstream repository. Change-Id: I8ef5eb8f53f3a546ea489fa0109f2ec4d025062c 2024-04-30gnu: emacs-visual-fill-column: Update to 2.6.3.Nicolas Goaziou * gnu/packages/emacs-xyz.scm (emacs-visual-fill-column): Update to 2.6.3. Change-Id: Ibd82e7c80008d355f2193461cd060f76080e3836