~ruther/guix-local

ec2406efc7abc07dc21a60d7a1c15bdafc8e233b — Ludovic Courtès 10 years ago e9ba635
vm: Use the 'umount' procedure instead of util-linux's 'umount' command.

* gnu/build/vm.scm (initialize-root-partition, initialize-hard-disk): Use the
  'umount' procedure instead of invoking the 'umount' command.
* gnu/system/vm.scm (qemu-image): Remove UTIL-LINUX from INPUTS.
2 files changed, 4 insertions(+), 4 deletions(-)

M gnu/build/vm.scm
M gnu/system/vm.scm
M gnu/build/vm.scm => gnu/build/vm.scm +3 -3
@@ 1,5 1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 172,7 172,7 @@ volume name."
                                  (string-append "/xchg/" closure)))
              closures)
    (unless copy-closures?
      (system* "umount" target-store)))
      (umount target-store)))

  ;; Add the non-store directories and files.
  (display "populating...\n")


@@ 236,6 236,6 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
  (unless register-closures?
    (reset-timestamps target-directory))

  (zero? (system* "umount" target-directory)))
  (umount target-directory))

;;; vm.scm ends here

M gnu/system/vm.scm => gnu/system/vm.scm +1 -1
@@ 212,7 212,7 @@ the image."
                    (guix build utils))

       (let ((inputs
              '#$(append (list qemu parted grub e2fsprogs util-linux)
              '#$(append (list qemu parted grub e2fsprogs)
                         (map canonical-package
                              (list sed grep coreutils findutils gawk))
                         (if register-closures? (list guix) '())))