[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: vm: Use the 'umount' procedure instead of util-linux's 'umount' c
From: |
Ludovic Courtès |
Subject: |
04/05: vm: Use the 'umount' procedure instead of util-linux's 'umount' command. |
Date: |
Thu, 23 Jul 2015 23:25:30 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit ec2406efc7abc07dc21a60d7a1c15bdafc8e233b
Author: Ludovic Courtès <address@hidden>
Date: Fri Jul 24 01:17:19 2015 +0200
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.
---
gnu/build/vm.scm | 6 +++---
gnu/system/vm.scm | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 2c53cf5..15c22a3 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;;
;;; 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
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index b293009..eb27ebc 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -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) '())))