aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-04-17 17:53:20 +0200
committerLudovic Courtès <ludo@gnu.org>2016-04-18 01:24:06 +0200
commit060d62a740fc1932a3be505534feff099b59ac9f (patch)
tree1b085f9a0f2c7581365f2ce79fe4fa24657d1d16
parentfac34dfe2a576907bf9f612d8ed8f4e9dee826be (diff)
downloadguix-060d62a740fc1932a3be505534feff099b59ac9f.tar
guix-060d62a740fc1932a3be505534feff099b59ac9f.tar.gz
system: Add (gnu system mapped-devices).
* gnu/system/file-systems.scm (<mapped-device>, <mapped-device-type>): Move to... * gnu/system/mapped-devices.scm: ... here. New file. * gnu/system.scm, gnu/services/base.scm, gnu/system/linux-initrd.scm: Use it. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. * gnu.scm (%public-modules): Add it.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu.scm3
-rw-r--r--gnu/services/base.scm1
-rw-r--r--gnu/system.scm1
-rw-r--r--gnu/system/file-systems.scm31
-rw-r--r--gnu/system/linux-initrd.scm1
-rw-r--r--gnu/system/mapped-devices.scm53
7 files changed, 59 insertions, 32 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 2ec0000f2a..2b4c71d11f 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -383,6 +383,7 @@ GNU_SYSTEM_MODULES = \
gnu/system/linux-container.scm \
gnu/system/linux-initrd.scm \
gnu/system/locale.scm \
+ gnu/system/mapped-devices.scm \
gnu/system/nss.scm \
gnu/system/pam.scm \
gnu/system/shadow.scm \
diff --git a/gnu.scm b/gnu.scm
index f9a13246c3..932e4cdd58 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015 Joshua S. Grant <jgrant@parenthetical.io>
;;;
;;; This file is part of GNU Guix.
@@ -32,6 +32,7 @@
(begin
(define %public-modules
'((gnu system)
+ (gnu system mapped-devices)
(gnu system file-systems)
(gnu system grub) ; 'grub-configuration'
(gnu system pam)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index a3585cc5a3..6884101fd7 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -27,6 +27,7 @@
#:use-module (gnu system pam)
#:use-module (gnu system shadow) ; 'user-account', etc.
#:use-module (gnu system file-systems) ; 'file-system', etc.
+ #:use-module (gnu system mapped-devices)
#:use-module (gnu packages admin)
#:use-module ((gnu packages linux)
#:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
diff --git a/gnu/system.scm b/gnu/system.scm
index a4259fb61b..a52881180d 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -54,6 +54,7 @@
#:use-module (gnu system pam)
#:use-module (gnu system linux-initrd)
#:use-module (gnu system file-systems)
+ #:use-module (gnu system mapped-devices)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index d0726d2b61..7e8c4489dd 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -54,17 +54,6 @@
%base-file-systems
%container-file-systems
- mapped-device
- mapped-device?
- mapped-device-source
- mapped-device-target
- mapped-device-type
-
- mapped-device-kind
- mapped-device-kind?
- mapped-device-kind-open
- mapped-device-kind-close
-
<file-system-mapping>
file-system-mapping
file-system-mapping?
@@ -293,26 +282,6 @@ initrd code."
(create-mount-point? #t)
(check? #f))))
-
-
-;;;
-;;; Mapped devices, for Linux's device-mapper.
-;;;
-
-(define-record-type* <mapped-device> mapped-device
- make-mapped-device
- mapped-device?
- (source mapped-device-source) ;string
- (target mapped-device-target) ;string
- (type mapped-device-type)) ;<mapped-device-kind>
-
-(define-record-type* <mapped-device-type> mapped-device-kind
- make-mapped-device-kind
- mapped-device-kind?
- (open mapped-device-kind-open) ;source target -> gexp
- (close mapped-device-kind-close ;source target -> gexp
- (default (const #~(const #f)))))
-
;;;
;;; Shared file systems, for VMs/containers.
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index 8ca74104fb..aa9fbf6fe9 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -32,6 +32,7 @@
#:use-module ((gnu packages make-bootstrap)
#:select (%guile-static-stripped))
#:use-module (gnu system file-systems)
+ #:use-module (gnu system mapped-devices)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)
#:use-module (srfi srfi-1)
diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm
new file mode 100644
index 0000000000..81afb91f86
--- /dev/null
+++ b/gnu/system/mapped-devices.scm
@@ -0,0 +1,53 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu system mapped-devices)
+ #:use-module (guix records)
+ #:export (mapped-device
+ mapped-device?
+ mapped-device-source
+ mapped-device-target
+ mapped-device-type
+
+ mapped-device-kind
+ mapped-device-kind?
+ mapped-device-kind-open
+ mapped-device-kind-close))
+
+;;; Commentary:
+;;;
+;;; This module supports "device mapping", a concept implemented by Linux's
+;;; device-mapper.
+;;;
+;;; Code:
+
+(define-record-type* <mapped-device> mapped-device
+ make-mapped-device
+ mapped-device?
+ (source mapped-device-source) ;string
+ (target mapped-device-target) ;string
+ (type mapped-device-type)) ;<mapped-device-kind>
+
+(define-record-type* <mapped-device-type> mapped-device-kind
+ make-mapped-device-kind
+ mapped-device-kind?
+ (open mapped-device-kind-open) ;source target -> gexp
+ (close mapped-device-kind-close ;source target -> gexp
+ (default (const #~(const #f)))))
+
+;;; mapped-devices.scm ends here