nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: system: Move <file-system-mapping> into (gnu system file-systems). 

* gnu/system/vm.scm (<file-system-mapping>, %store-mapping): Move from here...
* gnu/system/file-systems.scm: ...to here.
* guix/scripts/system.scm: Import (gnu system file-systems).
This commit is contained in:
David Thompson 2015-06-27 10:45:34 -04:00 committed by David Thompson
parent df3ce5c123
commit 9110c2e942
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/system/file-systems.scm
View File

@ -52,7 +52,16 @@
mapped-device-kind mapped-device-kind
mapped-device-kind? mapped-device-kind?
mapped-device-kind-open mapped-device-kind-open
mapped-device-kind-close)) mapped-device-kind-close
<file-system-mapping>
file-system-mapping
file-system-mapping?
file-system-mapping-source
file-system-mapping-target
file-system-mapping-writable?
%store-mapping))
;;; Commentary: ;;; Commentary:
;;; ;;;
@ -199,4 +208,25 @@ file system."
(close mapped-device-kind-close ;source target -> gexp (close mapped-device-kind-close ;source target -> gexp
(default (const #~(const #f))))) (default (const #~(const #f)))))
;;;
;;; Shared file systems, for VMs/containers.
;;;
;; Mapping of host file system SOURCE to mount point TARGET in the guest.
(define-record-type* <file-system-mapping> file-system-mapping
make-file-system-mapping
file-system-mapping?
(source file-system-mapping-source) ;string
(target file-system-mapping-target) ;string
(writable? file-system-mapping-writable? ;Boolean
(default #f)))
(define %store-mapping
;; Mapping of the host's store into the guest.
(file-system-mapping
(source (%store-prefix))
(target (%store-prefix))
(writable? #f)))
;;; file-systems.scm ends here ;;; file-systems.scm ends here

22
gnu/system/vm.scm
View File

@ -58,12 +58,6 @@
qemu-image qemu-image
system-qemu-image system-qemu-image
file-system-mapping
file-system-mapping?
file-system-mapping-source
file-system-mapping-target
file-system-mapping-writable?
system-qemu-image/shared-store system-qemu-image/shared-store
system-qemu-image/shared-store-script system-qemu-image/shared-store-script
system-disk-image)) system-disk-image))
@ -354,22 +348,6 @@ of the GNU system as described by OS."
;;; VMs that share file systems with the host. ;;; VMs that share file systems with the host.
;;; ;;;
;; Mapping of host file system SOURCE to mount point TARGET in the guest.
(define-record-type* <file-system-mapping> file-system-mapping
make-file-system-mapping
file-system-mapping?
(source file-system-mapping-source) ;string
(target file-system-mapping-target) ;string
(writable? file-system-mapping-writable? ;Boolean
(default #f)))
(define %store-mapping
;; Mapping of the host's store into the guest.
(file-system-mapping
(source (%store-prefix))
(target (%store-prefix))
(writable? #f)))
(define (file-system->mount-tag fs) (define (file-system->mount-tag fs)
"Return a 9p mount tag for host file system FS." "Return a 9p mount tag for host file system FS."
;; QEMU mount tags cannot contain slashes and cannot start with '_'. ;; QEMU mount tags cannot contain slashes and cannot start with '_'.

1
guix/scripts/system.scm
View File

@ -30,6 +30,7 @@
#:use-module (guix build utils) #:use-module (guix build utils)
#:use-module (gnu build install) #:use-module (gnu build install)
#:use-module (gnu system) #:use-module (gnu system)
#:use-module (gnu system file-systems)
#:use-module (gnu system vm) #:use-module (gnu system vm)
#:use-module (gnu system grub) #:use-module (gnu system grub)
#:use-module (gnu packages grub) #:use-module (gnu packages grub)