diff --git a/ublinux/rc.preinit.d/60-lightdm-xdmcp b/ublinux/rc.preinit.d/60-lightdm-xdmcp index 42d0be2..b86bc7e 100755 --- a/ublinux/rc.preinit.d/60-lightdm-xdmcp +++ b/ublinux/rc.preinit.d/60-lightdm-xdmcp @@ -35,22 +35,13 @@ SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null declare -A LIGHTDM_XDMCP - if [[ ${LIGHTDM_XDMCP} == @(""|"disable"|"no") ]]; then - #PASS_ADMUID=$(grep "^$(grep ":${ADMUID}:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):" ${ROOTFS}/etc/shadow | cut -d: -f2) #" - #UID_MIN=$(grep "^UID_MIN" ${ROOTFS}/etc/login.defs | cut -d' ' -f2) - #UID_MIN=$(read -d '' < "${ROOTFS}/etc/login.defs"; [[ "${REPLY}" =~ [^#[^:space:]]*UID_MIN[[:space:]]+([[:digit:]]+) ]]; echo -n "${BASH_REMATCH[1]}") - UID_MIN=$([[ $(cat "${ROOTFS}/etc/login.defs") =~ [^#[^:space:]]*UID_MIN[[:space:]]+([[:digit:]]+) ]]; echo -n "${BASH_REMATCH[1]}") - MORE_ONE_USER=$(awk -F':' -v USER_MIN=${UID_MIN} '$3 > USER_MIN && $1 != "nobody" { print $1}' ${ROOTFS}/etc/passwd) - # Если в системе всего один пользователь и FIRSTSATART, то автологин - [[ -z ${MORE_ONE_USER} && -n ${FIRSTSTART} ]] && AUTOLOGINUSER=yes - fi - FILE_LIGHTDM_CONF="${ROOTFS}/etc/lightdm/lightdm.conf" FILE_LIGHTDM_XDMCP_CONF="${ROOTFS}/etc/lightdm/lightdm.conf.d/99-xdmcp-ubconfig.conf" if [[ ${LIGHTDM_XDMCP} == @(""|"disable"|"no") ]]; then rm -f "${FILE_LIGHTDM_XDMCP_CONF}" else + [[ -d ${ROOTFS}/etc/lightdm/${FILE_LIGHTDM_XDMCP_CONF%/*} ]] || mkdir -p ${FILE_LIGHTDM_XDMCP_CONF%/*} cat <<-EOF | sed 's/^\s*\t*//' > "${FILE_LIGHTDM_XDMCP_CONF}" [XDMCPServer] enabled=true