SOURCES: pam-namespace-homedir.patch - merged hunks to the same file

[baggins]

Author: baggins                      Date: Fri Sep 14 16:51:00 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged hunks to the same file

---- Files affected:
SOURCES:
   pam-namespace-homedir.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/pam-namespace-homedir.patch
diff -u SOURCES/pam-namespace-homedir.patch:1.1 SOURCES/pam-namespace-homedir.patch:1.2
--- SOURCES/pam-namespace-homedir.patch:1.1	Fri Sep 14 18:36:09 2007
+++ SOURCES/pam-namespace-homedir.patch	Fri Sep 14 18:50:55 2007
@@ -3,12 +3,13 @@
 diff -up Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init
 --- Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.homedir	2007-08-24 10:40:46.000000000 +0200
 +++ Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init	2007-08-24 15:33:52.000000000 +0200
-@@ -1,9 +1,24 @@
+@@ -1,7 +1,24 @@
  #!/bin/sh -p
 -# This is only a boilerplate for the instance initialization script.
- # It receives polydir path as $1, the instance path as $2, 
- # a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
- # and user name in $4.
+-# It receives polydir path as $1 and the instance path as $2.
++# It receives polydir path as $1, the instance path as $2, 
++# a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
++# and user name in $4.
  #
 +# The following section will copy the contents of /etc/skel if this is a
 +# newly created home directory.
@@ -107,16 +108,3 @@
      </para>
  
      <para>
-diff -up Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.ns-init Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init
---- Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init.ns-init	2007-06-18 12:46:47.000000000 +0200
-+++ Linux-PAM-0.99.8.1/modules/pam_namespace/namespace.init	2007-08-06 13:57:56.000000000 +0200
-@@ -1,6 +1,8 @@
- #!/bin/sh -p
- # This is only a boilerplate for the instance initialization script.
--# It receives polydir path as $1 and the instance path as $2.
-+# It receives polydir path as $1, the instance path as $2, 
-+# a flag whether the instance dir was newly created (0 - no, 1 - yes) in $3,
-+# and user name in $4.
- #
- # If you intend to polyinstantiate /tmp and you also want to use the X windows
- # environment, you will have to use this script to bind mount the socket that
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/pam-namespace-homedir.patch?r1=1.1&r2=1.2&f=u