From 6e82863463c641571e852291481e2b64401c2fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 3 Nov 2015 18:08:47 +0100
Subject: [PATCH] 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.
---
gnu-system.am | 2 +-
gnu.scm | 2 +-
gnu/services/base.scm | 2 +-
gnu/services/desktop.scm | 2 +-
gnu/services/networking.scm | 2 +-
gnu/services/ssh.scm | 2 +-
gnu/services/xorg.scm | 2 +-
gnu/system.scm | 2 +-
gnu/system/{linux.scm => pam.scm} | 5 ++---
gnu/system/vm.scm | 2 +-
10 files changed, 11 insertions(+), 12 deletions(-)
rename gnu/system/{linux.scm => pam.scm} (98%)
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 = \
gnu/system/file-systems.scm \
gnu/system/grub.scm \
gnu/system/install.scm \
- gnu/system/linux.scm \
gnu/system/linux-container.scm \
gnu/system/linux-initrd.scm \
gnu/system/locale.scm \
gnu/system/nss.scm \
+ gnu/system/pam.scm \
gnu/system/shadow.scm \
gnu/system/vm.scm \
\
diff --git a/gnu.scm b/gnu.scm
index e3147b39e38..f9a13246c39 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -34,7 +34,7 @@ (define %public-modules
'((gnu system)
(gnu system file-systems)
(gnu system grub) ; 'grub-configuration'
- (gnu system linux) ; 'base-pam-services'
+ (gnu system pam)
(gnu system shadow) ; 'user-account'
(gnu system linux-initrd)
(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 @@ (define-module (gnu services base)
#:use-module (gnu services)
#:use-module (gnu services dmd)
#:use-module (gnu services networking)
+ #:use-module (gnu system pam)
#:use-module (gnu system shadow) ; 'user-account', etc.
- #:use-module (gnu system linux) ; 'pam-service', etc.
#:use-module (gnu system file-systems) ; 'file-system', etc.
#:use-module (gnu packages admin)
#: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 @@ (define-module (gnu services desktop)
#:use-module (gnu services xorg)
#:use-module (gnu services networking)
#:use-module (gnu system shadow)
- #:use-module (gnu system linux) ; unix-pam-service
+ #:use-module (gnu system pam)
#:use-module (gnu packages glib)
#:use-module (gnu packages admin)
#: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 @@ (define-module (gnu services networking)
#:use-module (gnu services dmd)
#:use-module (gnu services dbus)
#:use-module (gnu system shadow)
- #:use-module (gnu system linux) ;PAM
+ #:use-module (gnu system pam)
#:use-module (gnu packages admin)
#:use-module (gnu packages linux)
#: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 @@ (define-module (gnu services ssh)
#:use-module (guix records)
#:use-module (gnu services)
#:use-module (gnu services dmd)
- #:use-module (gnu system linux) ; 'pam-service'
+ #:use-module (gnu system pam)
#:use-module (gnu packages lsh)
#:export (lsh-service))
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 @@ (define-module (gnu services xorg)
#:use-module (gnu artwork)
#:use-module (gnu services)
#:use-module (gnu services dmd)
- #:use-module (gnu system linux) ; 'pam-service'
+ #:use-module (gnu system pam)
#:use-module ((gnu packages base) #:select (canonical-package))
#:use-module (gnu packages guile)
#: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 @@ (define-module (gnu system)
#:use-module (gnu system shadow)
#:use-module (gnu system nss)
#:use-module (gnu system locale)
- #:use-module (gnu system linux)
+ #:use-module (gnu system pam)
#:use-module (gnu system linux-initrd)
#:use-module (gnu system file-systems)
#:use-module (ice-9 match)
diff --git a/gnu/system/linux.scm b/gnu/system/pam.scm
similarity index 98%
rename from gnu/system/linux.scm
rename to gnu/system/pam.scm
index 487d379e651..d8470f02a36 100644
--- a/gnu/system/linux.scm
+++ b/gnu/system/pam.scm
@@ -16,7 +16,7 @@
;;; 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 linux)
+(define-module (gnu system pam)
#:use-module (guix records)
#:use-module (guix derivations)
#:use-module (guix gexp)
@@ -36,8 +36,7 @@ (define-module (gnu system linux)
;;; Commentary:
;;;
-;;; Configuration of Linux-related things, including pluggable authentication
-;;; modules (PAM).
+;;; Configuration of the pluggable authentication modules (PAM).
;;;
;;; Code:
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 @@ (define-module (gnu system vm)
#:use-module (gnu packages admin)
#:use-module (gnu system shadow)
- #:use-module (gnu system linux)
+ #:use-module (gnu system pam)
#:use-module (gnu system linux-initrd)
#:use-module (gnu system grub)
#:use-module (gnu system file-systems)
--
GitLab