futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vm: Use the 'umount' procedure instead of util-linux's 'umount' command.

Browse Source 
* 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.
This commit is contained in:
Ludovic Courtès 2015-07-24 01:17:19 +02:00
parent e9ba6357e3
commit ec2406efc7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/build/vm.scm
View File

@ -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

2
gnu/system/vm.scm
View File

@ -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) '())))