From d93945299d3a510f023764cbe00e7ed8f07f449a Mon Sep 17 00:00:00 2001 From: amid Date: Tue, 23 May 2023 20:42:23 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B2=D1=85?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B5=D1=84?= =?UTF-8?q?=D0=BE=D0=BB=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB=D1=82=D0=BD=D1=8B=D0=BC=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ublinux/rc.preinit.d/51-autologin | 2 +- ublinux/rc.preinit/02-skel-adds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ublinux/rc.preinit.d/51-autologin b/ublinux/rc.preinit.d/51-autologin index 2864087..d9f37f6 100755 --- a/ublinux/rc.preinit.d/51-autologin +++ b/ublinux/rc.preinit.d/51-autologin @@ -21,7 +21,7 @@ SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null PASS_ADMUID=$(grep "^$(grep ":${ADMUID}:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):" ${ROOTFS}/etc/shadow | cut -d: -f2) #" - [[ ${PASS_ADMUID} == ${NOSECUREROOTPASSWD} && ${PASS_ADMUID} == ${DEFAULTPASSWD} ]] && echo "AUTOLOGINUSER=yes" >> ${SYSCONF}/desktop + [[ ${PASS_ADMUID} == ${NOSECUREROOTPASSWD} && ${PASS_ADMUID} == ${DEFAULTPASSWD} ]] && echo "AUTOLOGINUSER=yes" >> ${SYSCONF}/desktop && AUTOLOGINUSER=yes AUTOLOGINUSER_CMDLINE=$(cmdline_value autologin) && [[ -n ${AUTOLOGINUSER_CMDLINE} ]] && AUTOLOGINUSER=${AUTOLOGINUSER_CMDLINE} if [[ -z "${AUTOLOGINUSER}" ]]; then diff --git a/ublinux/rc.preinit/02-skel-adds b/ublinux/rc.preinit/02-skel-adds index bbe59a7..a1ffe38 100755 --- a/ublinux/rc.preinit/02-skel-adds +++ b/ublinux/rc.preinit/02-skel-adds @@ -17,7 +17,7 @@ debug_mode "$0" "$@" INSTALLDESKTOP="ubinstall;ubinstall.cli" echo "${INSTALLDESKTOP}" | tr ',;' \\n | while read i; do if [[ -f usr/share/applications/"${i}".desktop ]]; then - if ! [[ -w /memory/layer-base/0 || -d /mnt/livedata || -w /mnt/livemedia ]] || grep -q "ub.sgnfiles=.*-iso.sgn" /proc/cmdline; then + if ! [[ -w /memory/layer-base/0 || -d /mnt/livedata || -w /mnt/livemedia ]] || grep -q ".*-iso.sgn" <<< $(cmdline_value ub.sgnfiles); then if ! grep -q ^Hidden=true usr/share/applications/"${i}".desktop ; then # DESKTOPNAME=$(chroot . bash -c "xdg-user-dirs-update && xdg-user-dir DESKTOP | cut -d/ -f3") DESKTOPNAME=$(chroot . gettext -d xdg-user-dirs "Desktop")