X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fsmb_nis.mk;h=a51a68ed97e06e4a6793a42f0f3bdbd783c45fd1;hb=2146b2def855f86e8e1e39d0c17d447961fc742d;hp=2771d8257cf1e2e71957ca21c8ec538204cfa772;hpb=e4b8a57190572c28482380fc49fd6ff4dc9b108a;p=blast diff --git a/modules/smb_nis.mk b/modules/smb_nis.mk index 2771d82..a51a68e 100644 --- a/modules/smb_nis.mk +++ b/modules/smb_nis.mk @@ -48,7 +48,7 @@ _smb_nis: ${CFGROOT}/opt/pam_script/pam_script_passwd ${CFGROOT}/etc/security/pa _smb_nis: ${CFGROOT}/etc/yp.conf ${CFGROOT}/etc/defaultdomain _smb_nis: ${CFGROOT} - sed -Ei 's;^(passwd:|group:|shadow:|gshadow:) *;\1 nis ;' $${CFGROOT}/etc/nsswitch.conf + sed -Ei 's;^(passwd:|group:|shadow:|gshadow:).*$$;\1 files nis;' $${CFGROOT}/etc/nsswitch.conf sed -Ei '/pam_(script|mount).so/d' $${CFGROOT}/etc/pam.d/common-* printf '\nauth optional pam_mount.so\n' >>$${CFGROOT}/etc/pam.d/common-auth printf '\nsession optional pam_mount.so\n' >>$${CFGROOT}/etc/pam.d/common-session @@ -66,4 +66,4 @@ ${CFGROOT}/etc/yp.conf: ${CFGROOT} .FORCE printf 'ypserver %s\n' "${nis_server}" >"$@" ${CFGROOT}/etc/defaultdomain: ${CFGROOT} .FORCE - printf '.%s\n' "${nis_domain}" >"$@" + printf '%s\n' "${nis_domain}" >"$@"