From e6d3eb76f60ea5342f6a362de7ad3c3f33da6018 Mon Sep 17 00:00:00 2001
From: amid <it@ubmail.ru>
Date: Tue, 23 May 2023 19:25:47 +0600
Subject: [PATCH] Bump version to 2.18

---
 VERSION.md                            | 2 +-
 ublinux/os-config                     | 2 +-
 ublinux/rc.preinit.d/51-autologin     | 4 +++-
 ublinux/templates/ublinux-data.ini    | 2 +-
 ublinux/templates/ublinux-data_ru.ini | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/VERSION.md b/VERSION.md
index d9ff89e..2b21b91 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-VERSION 2.17
+VERSION 2.18
diff --git a/ublinux/os-config b/ublinux/os-config
index 9d34be7..505a5c3 100644
--- a/ublinux/os-config
+++ b/ublinux/os-config
@@ -119,7 +119,7 @@ DEFAULTROOTPASSWD='$6$E7stRhRS8fCKk7UU$Qoqw62AUaUa5uLIc2KC7WV3MUThhrR8kjXtCODmnK
 DEFAULTUSER=superadmin
 DEFAULTGROUP=users
 USERGROUPS=nobody,scanner,power,audio,lp,optical,storage,video,sambashare,vboxusers,libvirt
-NOSECUREROOTPASSWD=$DEFAULTROOTPASSWD
+NOSECUREROOTPASSWD=${DEFAULTROOTPASSWD}
 ADMGROUPS=wheel,vboxsf,disk
 ADMUID=1000
 ADDADM=yes
diff --git a/ublinux/rc.preinit.d/51-autologin b/ublinux/rc.preinit.d/51-autologin
index da799ba..2864087 100755
--- a/ublinux/rc.preinit.d/51-autologin
+++ b/ublinux/rc.preinit.d/51-autologin
@@ -20,8 +20,10 @@ SYSCONF="${ROOTFS}/${SYSCONF}"
 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
     AUTOLOGINUSER_CMDLINE=$(cmdline_value autologin) && [[ -n ${AUTOLOGINUSER_CMDLINE} ]] && AUTOLOGINUSER=${AUTOLOGINUSER_CMDLINE}
-
+    
     if [[ -z "${AUTOLOGINUSER}" ]]; then
 	unset AUTOLOGINUSER
 	[[ -f ${ROOTFS}/etc/X11/gdm/custom.conf ]] && sed -i "s/^AutomaticLogin=.*//g" ${ROOTFS}/etc/X11/gdm/custom.conf
diff --git a/ublinux/templates/ublinux-data.ini b/ublinux/templates/ublinux-data.ini
index 3db9a31..2ac3cb7 100644
--- a/ublinux/templates/ublinux-data.ini
+++ b/ublinux/templates/ublinux-data.ini
@@ -30,7 +30,7 @@
 [/etc/ublinux/config]
 ## Config verison
 ## Версия конфигурации
-VERSION=2.17
+VERSION=2.18
 
 ## Additional boot parameters
 ## Дополнительные параметры загрузки, только для управления модулями
diff --git a/ublinux/templates/ublinux-data_ru.ini b/ublinux/templates/ublinux-data_ru.ini
index 3db9a31..2ac3cb7 100644
--- a/ublinux/templates/ublinux-data_ru.ini
+++ b/ublinux/templates/ublinux-data_ru.ini
@@ -30,7 +30,7 @@
 [/etc/ublinux/config]
 ## Config verison
 ## Версия конфигурации
-VERSION=2.17
+VERSION=2.18
 
 ## Additional boot parameters
 ## Дополнительные параметры загрузки, только для управления модулями