Fix rc.preinit.d/52-desktop

ublinux/rc.preinit.d/52-desktop

@@ -88,10 +88,10 @@ setupde(){
         cp -a ${DESKTOP_FILE_PATH}/$1.desktop ${DESKTOP_FILE_PATH}/default.desktop
         sed -i "s/Name=.*/Name=Default Session \(${1}\)/" ${DESKTOP_FILE_PATH}/default.desktop
         sed -i "s/Name\[ru\]=.*/Name\[ru\]=Сеанс по умолчанию \(${1}\)/" ${DESKTOP_FILE_PATH}/default.desktop
-	[[ -d etc/X11/wmsession.d ]] && ln -sf /${DESKTOP_FILE_PATH}/default.desktop etc/X11/wmsession.d/00DEFAULT
-	[[ -d etc/X11/dm/Sessions ]] && ln -sf /${DESKTOP_FILE_PATH}/default.desktop etc/X11/dm/Sessions/00DEFAULT.desktop
-       #[ -d etc/X11/wmsession.d ] && cp -pf /${DESKTOP_FILE_PATH}/default.desktop etc/X11/wmsession.d/00DEFAULT
-       #[ -d etc/X11/dm/Sessions ] && cp -pf /${DESKTOP_FILE_PATH}/default.desktop etc/X11/dm/Sessions/00DEFAULT.desktop
+        #[[ -d ${ROOTFS}/etc/X11/wmsession.d ]] && ln -sf /${DESKTOP_FILE_PATH}/default.desktop ${ROOTFS}/etc/X11/wmsession.d/00DEFAULT
+        #[[ -d ${ROOTFS}/etc/X11/dm/Sessions ]] && ln -sf /${DESKTOP_FILE_PATH}/default.desktop ${ROOTFS}/etc/X11/dm/Sessions/00DEFAULT.desktop
+        #[ -d ${ROOTFS}/etc/X11/wmsession.d ] && cp -pf /${DESKTOP_FILE_PATH}/default.desktop ${ROOTFS}/etc/X11/wmsession.d/00DEFAULT
+        #[ -d ${ROOTFS}/etc/X11/dm/Sessions ] && cp -pf /${DESKTOP_FILE_PATH}/default.desktop ${ROOTFS}/etc/X11/dm/Sessions/00DEFAULT.desktop
 	case $1 in
 	    xfce)
 		# FIX xfce.screensaver add button
@@ -161,10 +161,10 @@ done
 
 # Autodetect Display Environment
 # /usr/share/xsessions/*.desktop for X's sessions and /usr/share/wayland-sessions/*.desktop for Wayland's.
-    [[ -z ${DESKTOP} ]] && for SELECT_DESKTOP in i3 ukui steam lxde lxqt kde4 xfce pantheon mate gnome gnomeshell plasmax11; do
+    [[ -z ${DESKTOP} ]] && for SELECT_DESKTOP in xfce i3 ukui steam lxde lxqt kde4 pantheon mate gnome-flashback-metacity gnome-classic gnome-classic-xorg  gnome gnome-xorg plasmax11; do
 	[[ -f "${ROOTFS}/usr/share/xsessions/${SELECT_DESKTOP}.desktop" ]] && DESKTOP="${SELECT_DESKTOP}"
     done
-    [[ -z ${DESKTOP} ]] && for SELECT_DESKTOP in gnome plasma; do
+    [[ -z ${DESKTOP} ]] && for SELECT_DESKTOP in gnome-classic-wayland gnome-classic gnome-wayland gnome plasma; do
 	[[ -f "${ROOTFS}/usr/share/wayland-sessions/${SELECT_DESKTOP}.desktop" ]] && DESKTOP="${SELECT_DESKTOP}"
     done
     if [[ -n ${DESKTOP} ]]; then

ublinux/templates/ublinux-data.ini

@@ -2044,8 +2044,9 @@ VERSION=
 # Настройка локальной и сетевой автоустановки
 ################################################################################
 ## Язык установщика
-## AUTOINSTALL[installer_lang]=en|ar|fr|de|ru
-#AUTOINSTALL[installer_lang]=en
+## AUTOINSTALL[installer_locale]==<locale>
+##   <locale>   # Основная локаль системы en_US.UTF-8, ar_AR.UTF-8, fr_FR.UTF-8, de_DE.UTF-8, ru_RU.UTF-8
+#AUTOINSTALL[installer_locale]=en_US.UTF-8
 
 ## Источники установки, раздел или каталог с образом системы или файл образа ISO
 ## AUTOINSTALL[source]=<source1>,<source2>,<source..>,...