summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-11-03 18:08:47 +0100
committerLudovic Courtès <ludo@gnu.org>2015-11-03 18:11:45 +0100
commit6e82863463c641571e852291481e2b64401c2fe2 (patch)
tree9deeba90a72e3d931e85d46e875409ab0a900db1
parent1c52181f33ec6c2b91f1361f7251769dd29c6ef2 (diff)
system: Rename (gnu system linux) to (gnu system pam).
* gnu/system/linux.scm: Rename to... * gnu/system/pam.scm: ... this. * gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu.scm, gnu/services/base.scm, gnu/services/desktop.scm, gnu/services/networking.scm, gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system.scm, gnu/system/vm.scm: Likewise.
-rw-r--r--gnu-system.am2
-rw-r--r--gnu.scm2
-rw-r--r--gnu/services/base.scm2
-rw-r--r--gnu/services/desktop.scm2
-rw-r--r--gnu/services/networking.scm2
-rw-r--r--gnu/services/ssh.scm2
-rw-r--r--gnu/services/xorg.scm2
-rw-r--r--gnu/system.scm2
-rw-r--r--gnu/system/pam.scm (renamed from gnu/system/linux.scm)5
-rw-r--r--gnu/system/vm.scm2
10 files changed, 11 insertions, 12 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 36e7b6e9378..c5b87cc6f48 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -359,11 +359,11 @@ GNU_SYSTEM_MODULES = \
359 gnu/system/file-systems.scm \ 359 gnu/system/file-systems.scm \
360 gnu/system/grub.scm \ 360 gnu/system/grub.scm \
361 gnu/system/install.scm \ 361 gnu/system/install.scm \
362 gnu/system/linux.scm \
363 gnu/system/linux-container.scm \ 362 gnu/system/linux-container.scm \
364 gnu/system/linux-initrd.scm \ 363 gnu/system/linux-initrd.scm \
365 gnu/system/locale.scm \ 364 gnu/system/locale.scm \
366 gnu/system/nss.scm \ 365 gnu/system/nss.scm \
366 gnu/system/pam.scm \
367 gnu/system/shadow.scm \ 367 gnu/system/shadow.scm \
368 gnu/system/vm.scm \ 368 gnu/system/vm.scm \
369 \ 369 \
diff --git a/gnu.scm b/gnu.scm
index e3147b39e38..f9a13246c39 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -34,7 +34,7 @@
34 '((gnu system) 34 '((gnu system)
35 (gnu system file-systems) 35 (gnu system file-systems)
36 (gnu system grub) ; 'grub-configuration' 36 (gnu system grub) ; 'grub-configuration'
37 (gnu system linux) ; 'base-pam-services' 37 (gnu system pam)
38 (gnu system shadow) ; 'user-account' 38 (gnu system shadow) ; 'user-account'
39 (gnu system linux-initrd) 39 (gnu system linux-initrd)
40 (gnu system nss) 40 (gnu system nss)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 9d495565ad8..61654104636 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -23,8 +23,8 @@
23 #:use-module (gnu services) 23 #:use-module (gnu services)
24 #:use-module (gnu services dmd) 24 #:use-module (gnu services dmd)
25 #:use-module (gnu services networking) 25 #:use-module (gnu services networking)
26 #:use-module (gnu system pam)
26 #:use-module (gnu system shadow) ; 'user-account', etc. 27 #:use-module (gnu system shadow) ; 'user-account', etc.
27 #:use-module (gnu system linux) ; 'pam-service', etc.
28 #:use-module (gnu system file-systems) ; 'file-system', etc. 28 #:use-module (gnu system file-systems) ; 'file-system', etc.
29 #:use-module (gnu packages admin) 29 #:use-module (gnu packages admin)
30 #:use-module ((gnu packages linux) 30 #:use-module ((gnu packages linux)
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 19867646974..0b4ed56d05d 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -27,7 +27,7 @@
27 #:use-module (gnu services xorg) 27 #:use-module (gnu services xorg)
28 #:use-module (gnu services networking) 28 #:use-module (gnu services networking)
29 #:use-module (gnu system shadow) 29 #:use-module (gnu system shadow)
30 #:use-module (gnu system linux) ; unix-pam-service 30 #:use-module (gnu system pam)
31 #:use-module (gnu packages glib) 31 #:use-module (gnu packages glib)
32 #:use-module (gnu packages admin) 32 #:use-module (gnu packages admin)
33 #:use-module (gnu packages freedesktop) 33 #:use-module (gnu packages freedesktop)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 8f67976b239..a09714447ea 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -22,7 +22,7 @@
22 #:use-module (gnu services dmd) 22 #:use-module (gnu services dmd)
23 #:use-module (gnu services dbus) 23 #:use-module (gnu services dbus)
24 #:use-module (gnu system shadow) 24 #:use-module (gnu system shadow)
25 #:use-module (gnu system linux) ;PAM 25 #:use-module (gnu system pam)
26 #:use-module (gnu packages admin) 26 #:use-module (gnu packages admin)
27 #:use-module (gnu packages linux) 27 #:use-module (gnu packages linux)
28 #:use-module (gnu packages tor) 28 #:use-module (gnu packages tor)
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index d3a6cfb33ac..18556d2cc5f 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -21,7 +21,7 @@
21 #:use-module (guix records) 21 #:use-module (guix records)
22 #:use-module (gnu services) 22 #:use-module (gnu services)
23 #:use-module (gnu services dmd) 23 #:use-module (gnu services dmd)
24 #:use-module (gnu system linux) ; 'pam-service' 24 #:use-module (gnu system pam)
25 #:use-module (gnu packages lsh) 25 #:use-module (gnu packages lsh)
26 #:export (lsh-service)) 26 #:export (lsh-service))
27 27
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index f4bc8245f5b..dc2625d39b7 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -21,7 +21,7 @@
21 #:use-module (gnu artwork) 21 #:use-module (gnu artwork)
22 #:use-module (gnu services) 22 #:use-module (gnu services)
23 #:use-module (gnu services dmd) 23 #:use-module (gnu services dmd)
24 #:use-module (gnu system linux) ; 'pam-service' 24 #:use-module (gnu system pam)
25 #:use-module ((gnu packages base) #:select (canonical-package)) 25 #:use-module ((gnu packages base) #:select (canonical-package))
26 #:use-module (gnu packages guile) 26 #:use-module (gnu packages guile)
27 #:use-module (gnu packages xorg) 27 #:use-module (gnu packages xorg)
diff --git a/gnu/system.scm b/gnu/system.scm
index 85a596ddb98..be6b1ac2c15 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -50,7 +50,7 @@
50 #:use-module (gnu system shadow) 50 #:use-module (gnu system shadow)
51 #:use-module (gnu system nss) 51 #:use-module (gnu system nss)
52 #:use-module (gnu system locale) 52 #:use-module (gnu system locale)
53 #:use-module (gnu system linux) 53 #:use-module (gnu system pam)
54 #:use-module (gnu system linux-initrd) 54 #:use-module (gnu system linux-initrd)
55 #:use-module (gnu system file-systems) 55 #:use-module (gnu system file-systems)
56 #:use-module (ice-9 match) 56 #:use-module (ice-9 match)
diff --git a/gnu/system/linux.scm b/gnu/system/pam.scm
index 487d379e651..d8470f02a36 100644
--- a/gnu/system/linux.scm
+++ b/gnu/system/pam.scm
@@ -16,7 +16,7 @@
16;;; You should have received a copy of the GNU General Public License 16;;; You should have received a copy of the GNU General Public License
17;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. 17;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
18 18
19(define-module (gnu system linux) 19(define-module (gnu system pam)
20 #:use-module (guix records) 20 #:use-module (guix records)
21 #:use-module (guix derivations) 21 #:use-module (guix derivations)
22 #:use-module (guix gexp) 22 #:use-module (guix gexp)
@@ -36,8 +36,7 @@
36 36
37;;; Commentary: 37;;; Commentary:
38;;; 38;;;
39;;; Configuration of Linux-related things, including pluggable authentication 39;;; Configuration of the pluggable authentication modules (PAM).
40;;; modules (PAM).
41;;; 40;;;
42;;; Code: 41;;; Code:
43 42
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index dfb69960678..96ff27f90bb 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -43,7 +43,7 @@
43 #:use-module (gnu packages admin) 43 #:use-module (gnu packages admin)
44 44
45 #:use-module (gnu system shadow) 45 #:use-module (gnu system shadow)
46 #:use-module (gnu system linux) 46 #:use-module (gnu system pam)
47 #:use-module (gnu system linux-initrd) 47 #:use-module (gnu system linux-initrd)
48 #:use-module (gnu system grub) 48 #:use-module (gnu system grub)
49 #:use-module (gnu system file-systems) 49 #:use-module (gnu system file-systems)