[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: system: Rename (gnu system linux) to (gnu system pam).
|
From: |
Ludovic Courtès |
|
Subject: |
02/02: system: Rename (gnu system linux) to (gnu system pam). |
|
Date: |
Tue, 03 Nov 2015 17:12:07 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 6e82863463c641571e852291481e2b64401c2fe2
Author: Ludovic Courtès <address@hidden>
Date: Tue Nov 3 18:08:47 2015 +0100
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(-)
diff --git a/gnu-system.am b/gnu-system.am
index 36e7b6e..c5b87cc 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 e3147b3..f9a1324 100644
--- a/gnu.scm
+++ b/gnu.scm
@@ -34,7 +34,7 @@
'((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 9d49556..6165410 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -23,8 +23,8 @@
#: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 1986764..0b4ed56 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -27,7 +27,7 @@
#: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 8f67976..a097144 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -22,7 +22,7 @@
#: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 d3a6cfb..18556d2 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -21,7 +21,7 @@
#: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 f4bc824..dc2625d 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -21,7 +21,7 @@
#: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 85a596d..be6b1ac 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -50,7 +50,7 @@
#: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 487d379..d8470f0 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 @@
;;; 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 dfb6996..96ff27f 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -43,7 +43,7 @@
#: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)