switch to less buggy lightdm

[blast] / modules / smb_nis.mk

diff --git a/modules/smb_nis.mk b/modules/smb_nis.mk
index 2771d8257cf1e2e71957ca21c8ec538204cfa772..d11d00b9a14a5416743ce3e9e34c52a1f656b13d 100644 (file)
--- a/modules/smb_nis.mk
+++ b/modules/smb_nis.mk
@@ -1,4 +1,4 @@
-PACKAGES += cifs-utils libpam-mount libpam-script lxdm nis nscd samba-common-bin usermode
+PACKAGES += cifs-utils libpam-mount libpam-script lightdm nis nscd samba-common-bin usermode
 
 ifndef nis_server
   nis_server := nismaster
@@ -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}" >"$@"