Tweak documentation for pam_console (#31877).

(Portage version: 2.0.51.19)

3 files changed, 31 insertions, 10 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index bfc959f63007..96ffa6a3b701 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.84 2005/07/07 19:46:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.85 2005/07/08 07:47:56 greg_g Exp $
+
+  08 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> files/README.pam_console,
+  pam-0.78-r2.ebuild:
+  Tweak documentation for pam_console (#31877).
 
   07 Jul 2005; Markus Rothe <corsair@gentoo.org> pam-0.78-r2.ebuild:
   Stable on ppc64
diff --git a/sys-libs/pam/files/README.pam_console b/sys-libs/pam/files/README.pam_console
index 129f9aef9a3b..66f80c83c950 100644
--- a/sys-libs/pam/files/README.pam_console
+++ b/sys-libs/pam/files/README.pam_console
@@ -25,14 +25,22 @@ have to be members of the audio group to access audio devices).
 However, Gentoo gives you the possibility to enable pam_console, you just have
 to follow these advices:
 
-1) In /etc/pam.d/login, add the following line:
+1) Make sure you compiled sys-libs/pam with USE="pam_console", otherwise the
+   pam_console module will not be built.
 
-  session    optional     /lib/security/pam_console.so
+2) In /etc/pam.d/login, add the following line:
+
+  session    optional     pam_console.so
 
    Thus, pam_console will apply permissions from /etc/security/console.perms
-   when you log in.
+   when you log in in text consoles.
+   Do the same with /etc/pam.d/xdm if you login through xdm, with /etc/pam.d/kde
+   if you login through kdm, and so on.
+
+   Alternatively (but not recommended), you can add the line above to
+   /etc/pam.d/system-auth so that pam_console will be enabled everywhere.
    
-2) If you're using devfs, add the following lines in /etc/devfsd.conf:
+3) If you're using devfs, add the following lines in /etc/devfsd.conf:
 
   REGISTER  .*  CFUNCTION /lib/security/pam_console_apply_devfsd.so\
                     pam_console_apply_single $devpath
@@ -40,12 +48,12 @@ to follow these advices:
    In this way, permissions from /etc/security/console.perms will be applied
    also to those devices that are created dynamically.
 
-3) If you're using udev, create a file in /etc/dev.d/default/ ending with
+4) If you're using udev, create a file in /etc/dev.d/default/ ending with
    '.dev', for instance /etc/dev.d/default/pam_console.dev, containing the
    following lines:
 
-   #!/bin/sh
-   exec /sbin/pam_console_apply
+  #!/bin/sh
+  exec /sbin/pam_console_apply
  
    and make it executable:
 
@@ -54,5 +62,7 @@ to follow these advices:
    In this way, pam_console will reevaluate permissions from
    /etc/security/console.perms each time a device is dynamically created.
 
-4) Tweak /etc/security/console.perms to your own needs.
+   Another possible way to obtain the same result is to use the RUN key
+   in udev rules (see the udev documentation for more info).
 
+5) Tweak /etc/security/console.perms to your own needs.
diff --git a/sys-libs/pam/pam-0.78-r2.ebuild b/sys-libs/pam/pam-0.78-r2.ebuild
index 102d222e2eb4..c8c9b0fcc071 100644
--- a/sys-libs/pam/pam-0.78-r2.ebuild
+++ b/sys-libs/pam/pam-0.78-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r2.ebuild,v 1.19 2005/07/07 22:05:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r2.ebuild,v 1.20 2005/07/08 07:47:56 greg_g Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -378,4 +378,11 @@ pkg_postinst() {
 			rm -f ${ROOT}/etc/pam.d/system-auth.new
 		fi
 	fi
+
+	if use pam_console; then
+		echo
+		einfo "If you want to enable the pam_console module, please follow"
+		einfo "the instructions in /usr/share/doc/${PF}/README.pam_console."
+		echo
+	fi
 }