summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/shadow
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/shadow')
-rw-r--r--meta/recipes-extended/shadow/shadow-securetty_4.6.bb2
-rw-r--r--meta/recipes-extended/shadow/shadow.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
index fe51ea1874..85c04b6af1 100644
--- a/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
+++ b/meta/recipes-extended/shadow/shadow-securetty_4.6.bb
@@ -17,7 +17,7 @@ do_install () {
17 # Ensure we add a suitable securetty file to the package that has 17 # Ensure we add a suitable securetty file to the package that has
18 # most common embedded TTYs defined. 18 # most common embedded TTYs defined.
19 install -d ${D}${sysconfdir} 19 install -d ${D}${sysconfdir}
20 install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty 20 install -m 0400 ${S}/securetty ${D}${sysconfdir}/securetty
21 if [ ! -z "${SERIAL_CONSOLES}" ]; then 21 if [ ! -z "${SERIAL_CONSOLES}" ]; then
22 # Our SERIAL_CONSOLES contains a baud rate and sometimes extra 22 # Our SERIAL_CONSOLES contains a baud rate and sometimes extra
23 # options as well. The following pearl :) takes that and converts 23 # options as well. The following pearl :) takes that and converts
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index c15715fc77..25930b64c1 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -111,7 +111,7 @@ do_install() {
111 sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs 111 sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs
112 112
113 install -d ${D}${sysconfdir}/default 113 install -d ${D}${sysconfdir}/default
114 install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default 114 install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default
115} 115}
116 116
117do_install:append() { 117do_install:append() {
@@ -121,11 +121,11 @@ do_install:append() {
121 install -m 0775 -d ${D}${localstatedir}/spool/mail 121 install -m 0775 -d ${D}${localstatedir}/spool/mail
122 chown root:mail ${D}${localstatedir}/spool/mail 122 chown root:mail ${D}${localstatedir}/spool/mail
123 123
124 if [ -e ${WORKDIR}/pam.d ]; then 124 if [ -e ${UNPACKDIR}/pam.d ]; then
125 install -d ${D}${sysconfdir}/pam.d/ 125 install -d ${D}${sysconfdir}/pam.d/
126 install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ 126 install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
127 # Remove defaults that are not used when supporting PAM. 127 # Remove defaults that are not used when supporting PAM.
128 sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs 128 sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs
129 fi 129 fi
130 130
131 install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} 131 install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}