pam: Move configuration from config/ to src/.

diff --git a/lfs/coreutils b/lfs/coreutils
index 9f3a4f27e8b1961d231d525703fae65cc974c271..4f2602885c85dcff20c6decbd74c5b823102be89 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -132,7 +132,7 @@ ifeq "$(STAGE)" "base"
        cp -vf $(DIR_SOURCE)/profile.d/dircolors.sh /etc/profile.d
 
        # PAM
-       cp -vf $(DIR_CONFIG)/pam.d/su{,-l} /etc/pam.d
+       cp -vf $(DIR_SOURCE)/pam.d/su{,-l} /etc/pam.d
 endif
 
        @rm -rf $(DIR_APP)

diff --git a/lfs/freeradius b/lfs/freeradius
index e5530195535ab0f5ce6d4a9ed3157d4dfad35362..266eabbd1a2c13af55bec10f8146a1239c76dd8a 100644 (file)
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -112,7 +112,7 @@ $(OBJECT): $(objects)
        rm -rf /usr/lib/freeradius/*.la /usr/lib/freeradius/rlm_perl-$(PKG_VER).so
 
        # PAM
-       cp -vf $(DIR_CONFIG)/pam.d/$(PKG_NAME) /etc/pam.d/
+       cp -vf $(DIR_SOURCE)/pam.d/$(PKG_NAME) /etc/pam.d/
 
        # Logrotate
        cp -vf $(DIR_SRC)/src/logrotate/$(PKG_NAME) /etc/logrotate.d/

diff --git a/lfs/pam b/lfs/pam
index 97e6189e803d1af4828362df115cdf763592bea5..3ad91004ccc183c7e2ef15ab8751d9736f72c790 100644 (file)
--- a/lfs/pam
+++ b/lfs/pam
@@ -108,10 +108,10 @@ $(OBJECT): $(objects)
        useradd -D -b /home
        sed -i 's/yes/no/' /etc/default/useradd
        install -v -m644 $(DIR_CONFIG)/pam/pam_env.conf /etc/security/pam_env.conf
-       cp -vf $(DIR_CONFIG)/pam/{login.defs,securetty} /etc
+       cp -vf $(DIR_SOURCE)/pam/{login.defs,securetty} /etc
 
        install -v -d -m755 /etc/pam.d
-       cp -vf $(DIR_CONFIG)/pam.d/{other,system-auth} /etc/pam.d/
+       cp -vf $(DIR_SOURCE)/pam.d/{other,system-auth} /etc/pam.d/
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/ppp b/lfs/ppp
index 13cbd23cbe48a3d975a6fb11db42d333248d44da..c5ba41cdf1bee8643771ace9cd13af891534aa66 100644 (file)
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -136,7 +136,7 @@ $(OBJECT): $(objects)
        ln -svf secrets /etc/ppp/pap-secrets
        ln -svf secrets /etc/ppp/chap-secrets
 
-       cp -vf $(DIR_CONFIG)/pam.d/$(PKG_NAME) /etc/pam.d/
+       cp -vf $(DIR_SOURCE)/pam.d/$(PKG_NAME) /etc/pam.d/
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/screen b/lfs/screen
index 3d36dfb0057a5fb2ac9c3b59c9c5f05a11c783aa..7c6f4de3b7956127def22032b0f09834ce39833d 100644 (file)
--- a/lfs/screen
+++ b/lfs/screen
@@ -91,6 +91,6 @@ $(OBJECT): $(objects)
        cd $(DIR_APP) && make $(PARALLELISMFLAGS)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && install -m 644 etc/etcscreenrc /etc/screenrc
-       cp -vf $(DIR_CONFIG)/pam.d/$(PKG_NAME) /etc/pam.d/
+       cp -vf $(DIR_SOURCE)/pam.d/$(PKG_NAME) /etc/pam.d/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng
index 0c195f4f2896dfed0bf9a5ccd020e98ded5f1a8a..aea7ab36dcc46456a16baf931c6cdfc874932405 100644 (file)
--- a/lfs/util-linux-ng
+++ b/lfs/util-linux-ng
@@ -130,7 +130,7 @@ $(OBJECT): $(objects)
                /usr/share/man/man*/{fsck,mkfs}.{bfs,minix}*
 
        # PAM
-       cp -vf $(DIR_CONFIG)/pam.d/login /etc/pam.d/
+       cp -vf $(DIR_SOURCE)/pam.d/login /etc/pam.d/
 
        chmod -v -s /bin/mount
        setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep /bin/mount

diff --git a/lfs/vsftpd b/lfs/vsftpd
index 8b929bd574c36dbb45f876b614b8322bb37da171..9e61f2b368c2b2f98676e1d8662e6f7013fd0b6e 100644 (file)
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -109,7 +109,7 @@ $(OBJECT): $(objects)
        # Install config
        -mkdir -pv /etc/$(PKG_NAME)
        cp -vf $(DIR_SOURCE)/$(PKG_NAME)/$(PKG_NAME).{conf,user_list} /etc/$(PKG_NAME)
-       cp -vf $(DIR_CONFIG)/pam.d/$(PKG_NAME) /etc/pam.d/
+       cp -vf $(DIR_SOURCE)/pam.d/$(PKG_NAME) /etc/pam.d/
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/config/pam.d/chage b/src/pam.d/chage
similarity index 100%
rename from config/pam.d/chage
rename to src/pam.d/chage

diff --git a/config/pam.d/freeradius-server b/src/pam.d/freeradius-server
similarity index 100%
rename from config/pam.d/freeradius-server
rename to src/pam.d/freeradius-server

diff --git a/config/pam.d/ftp b/src/pam.d/ftp
similarity index 100%
rename from config/pam.d/ftp
rename to src/pam.d/ftp

diff --git a/config/pam.d/imap b/src/pam.d/imap
similarity index 100%
rename from config/pam.d/imap
rename to src/pam.d/imap

diff --git a/config/pam.d/login b/src/pam.d/login
similarity index 100%
rename from config/pam.d/login
rename to src/pam.d/login

diff --git a/config/pam.d/other b/src/pam.d/other
similarity index 100%
rename from config/pam.d/other
rename to src/pam.d/other

diff --git a/config/pam.d/passwd b/src/pam.d/passwd
similarity index 100%
rename from config/pam.d/passwd
rename to src/pam.d/passwd

diff --git a/config/pam.d/pop b/src/pam.d/pop
similarity index 100%
rename from config/pam.d/pop
rename to src/pam.d/pop

diff --git a/config/pam.d/ppp b/src/pam.d/ppp
similarity index 100%
rename from config/pam.d/ppp
rename to src/pam.d/ppp

diff --git a/config/pam.d/screen b/src/pam.d/screen
similarity index 100%
rename from config/pam.d/screen
rename to src/pam.d/screen

diff --git a/config/pam.d/sieve b/src/pam.d/sieve
similarity index 100%
rename from config/pam.d/sieve
rename to src/pam.d/sieve

diff --git a/config/pam.d/smtp b/src/pam.d/smtp
similarity index 100%
rename from config/pam.d/smtp
rename to src/pam.d/smtp

diff --git a/config/pam.d/su b/src/pam.d/su
similarity index 100%
rename from config/pam.d/su
rename to src/pam.d/su

diff --git a/config/pam.d/su-l b/src/pam.d/su-l
similarity index 100%
rename from config/pam.d/su-l
rename to src/pam.d/su-l

diff --git a/config/pam.d/system-auth b/src/pam.d/system-auth
similarity index 100%
rename from config/pam.d/system-auth
rename to src/pam.d/system-auth

diff --git a/config/pam.d/vsftpd b/src/pam.d/vsftpd
similarity index 100%
rename from config/pam.d/vsftpd
rename to src/pam.d/vsftpd

diff --git a/config/pam/login.defs b/src/pam/login.defs
similarity index 100%
rename from config/pam/login.defs
rename to src/pam/login.defs

diff --git a/config/pam/pam_env.conf b/src/pam/pam_env.conf
similarity index 100%
rename from config/pam/pam_env.conf
rename to src/pam/pam_env.conf

diff --git a/config/pam/securetty b/src/pam/securetty
similarity index 100%
rename from config/pam/securetty
rename to src/pam/securetty