Dropped second pass of pam.

diff --git a/lfs/pam b/lfs/pam
index 53253b423e8adf7abe31bfd1a88da5b2adb47d01..dfdc0061bfcc5575e20d40dd906f76b1b6760e2d 100644 (file)
--- a/lfs/pam
+++ b/lfs/pam
@@ -37,7 +37,7 @@ DEBUG      = no
 
 DEPS       = cracklib
 
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS)
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -66,7 +66,6 @@ $(OBJECT): $(objects)
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)        
 
-ifeq "$(PASS)" "1"
        cd $(DIR_APP) && \
                ./configure \
                        $(CONFIGURE_ARCH) \
@@ -91,16 +90,13 @@ ifeq "$(PASS)" "1"
               rm -v /lib/$${LINK}; \
           done; \
        fi
-endif
 
-ifeq "$(PASS)" "2"
        useradd -D -b /home
        sed -i 's/yes/no/' /etc/default/useradd
        install -v -m644 $(DIR_CONFIG)/pam/login.defs /etc/login.defs
        install -v -m644 $(DIR_CONFIG)/pam/pam_env.conf /etc/security/pam_env.conf
        install -v -d -m755 /etc/pam.d
-       cp -vf $(DIR_CONFIG)/pam.d/* /etc/pam.d/
-endif
+       cp -vf $(DIR_CONFIG)/pam.d/{other,system-auth} /etc/pam.d/
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 4ab36ca03f4242365b24503c2d8fa7841a202214..ef21b37e305aaf1be2513ac761ddb7841e78a902 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -244,9 +244,8 @@ ipfire_build() {
        ipfire_make libgcrypt
        ipfire_make libksba
        ipfire_make cracklib
-       ipfire_make pam                                 PASS=1
+       ipfire_make pam
        ipfire_make shadow-pam
-       ipfire_make pam                                 PASS=2
        ipfire_make slang
        ipfire_make newt
        ipfire_make cyrus-sasl