02/02: gnu: util-linux: Fix file name of 'umount' in 'eject'.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 7e5124976b0bc19cf26ef7376ea041b25b7fbd35
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jul 14 14:00:46 2015 +0200

    gnu: util-linux: Fix file name of 'umount' in 'eject'.
    
    Fixes <http://bugs.gnu.org/21010>.
    Reported by Alex Sassmannshausen <address@hidden>.
    
    * gnu/packages/linux.scm (util-linux)[arguments]: Add 
'set-umount-file-name'.
---
 gnu/packages/linux.scm |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index f27b828..c5d0553 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -419,6 +419,15 @@ providing the system administrator with some help in 
common tasks.")
                                               "/etc/bash_completion.d"))
        #:phases (modify-phases %standard-phases
                   (add-before
+                   'build 'set-umount-file-name
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     ;; Tell 'eject' the right file name of 'umount'.
+                     (let ((out (assoc-ref outputs "out")))
+                       (substitute* "sys-utils/eject.c"
+                         (("\"/bin/umount\"")
+                          (string-append "\"" out "/bin/umount\"")))
+                       #t)))
+                  (add-before
                    'check 'pre-check
                    (lambda* (#:key inputs outputs #:allow-other-keys)
                      (let ((out (assoc-ref outputs "out"))