[SM-Commit] GIT changes to master grimoire by Eric Sandall (af3ab129ad8820318e62a39e63754cae765ea29b)

Eric Sandall scm at sourcemage.org
Thu Jul 3 20:12:48 EDT 2008


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 utils/schroot/HISTORY   |    3 +++
 utils/schroot/PRE_BUILD |   10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit af3ab129ad8820318e62a39e63754cae765ea29b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    schroot: Fix pam.d/schroot for the default Linux PAM setup, not Debian's

diff --git a/utils/schroot/HISTORY b/utils/schroot/HISTORY
index 2262033..5b905a9 100644
--- a/utils/schroot/HISTORY
+++ b/utils/schroot/HISTORY
@@ -1,3 +1,6 @@
+2008-07-03 Eric Sandall <sandalle at sourcemage.org>
+	* PRE_BUILD: Fix pam.d/schroot for the default Linux PAM setup, not Debian's
+
 2008-04-13 Ethan Grammatikidis <eekee57 at fastmail.fm>
 	* DEPENDS: Added linux-pam
 
diff --git a/utils/schroot/PRE_BUILD b/utils/schroot/PRE_BUILD
index 7150588..730cc31 100755
--- a/utils/schroot/PRE_BUILD
+++ b/utils/schroot/PRE_BUILD
@@ -2,4 +2,12 @@ default_pre_build                                 &&
 cd  $SOURCE_DIRECTORY                             &&
 patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch         &&
 patch -p0 < $SCRIPT_DIRECTORY/locale.patch        &&
-patch -p1 < $SCRIPT_DIRECTORY/schroot.conf.patch
+patch -p1 < $SCRIPT_DIRECTORY/schroot.conf.patch  &&
+
+sedit  's:@include:#&:g'  $SOURCE_DIRECTORY/bin/schroot/pam/schroot  &&
+cat << EOF >> $SOURCE_DIRECTORY/bin/schroot/pam/schroot
+auth            sufficient      pam_rootok.so
+auth		required	pam_unix.so
+account		required	pam_unix.so
+session		required	pam_unix.so
+EOF



More information about the SM-Commit mailing list