Many fix

ublinux/default

@@ -161,7 +161,7 @@ CONSOLE_KEYMAP=ru
 CONSOLE_KEYMAP_TOGGLE="grp:lctrl_lshift_toggle"
 
 #/rc.preinit.d/20-services
-SERVICES_ENABLE=dbus-broker,NetworkManager,sshd,systemd-swap,systemd-timesyncd,cups,cockpit.socket,avahi-daemon,avahi-dnsconfd,veyon,smb,nmb,winbind,bluetooth
+SERVICES_ENABLE=dbus-broker,NetworkManager,sshd,swapspace,systemd-timesyncd,cups,cockpit.socket,avahi-daemon,avahi-dnsconfd,smb,nmb,winbind,bluetooth
 
 #/rc.preinit.d/23-publicdir
 # Папка с правами 777 доступная всем локальным пользователям и при разрешении всем из сети

ublinux/functions

@@ -1241,7 +1241,7 @@ show_hotkeys(){
 }
 
 show_info(){
-  . /etc/os-release
+  . /usr/lib/os-release
   FILE_INFO="/tmp/info.txt"
   LIVECDNAME="$NAME"
   UPTIME=$(uptime | awk '{print "time - "$1", up - "$3}').

ublinux/rc.desktop/all/ublinuxupdate

@@ -92,7 +92,7 @@ function dialogupdate()
 export TEXTDOMAINDIR=/usr/share/locale
 export TEXTDOMAIN=ublinux_functions
 echo $PATH | grep -q /usr/lib/ublinux/scripts || PATH=/usr/lib/ublinux/scripts:$PATH
-. /etc/os-release
+. /usr/lib/os-release
 . /usr/lib/ublinux/functions
 . /usr/lib/ublinux/default
 SOURCE=${SYSCONF}/config; [ -f ${SOURCE} ] && . ${SOURCE} 2>/dev/null

ublinux/rc.local.d/91-eula

@@ -13,5 +13,5 @@ debug_mode "$0" "$@"
 
 #. .$SYSCONF/config 2>/dev/null || . $SYSCONF/config 2>/dev/null 
 
-[[ $(cat /etc/os-release | grep "VERSION_CODENAME" | cut -d= -f2) = "ublinux_db" ]] && mv ${EULA_DB} ${EULA}
+[[ $(cat /usr/lib/os-release | grep "VERSION_CODENAME" | cut -d= -f2) = "ublinux_db" ]] && mv ${EULA_DB} ${EULA}
 rm -f ${EULA_DB}

ublinux/rc.post.d/10-brand-backgrounds

@@ -292,7 +292,7 @@ insert_background_icon(){
     [[ ${RESOLUTION} == "" ]] && echo "ERROR: resolution not detect" && exit 1
 
 # Определение редакции ОС
-    [[ -z $2 ]] && edition_os=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d"=" -f2 2>/dev/null) || edition_os=$2
+    [[ -z $2 ]] && edition_os=$(cat /usr/lib/os-release | grep VERSION_CODENAME | cut -d"=" -f2 2>/dev/null) || edition_os=$2
 
     width=
     hight=

ublinux/rc.preinit.d/64-swapspace

@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Initial script for UBLinux
+# This script are launching before starting init from initrd script
+# Current dir allways must be set to root (/)
+# All system path must be relative, except initrd dirs
+
+ENABLED=yes
+[[ ${ENABLED} == "yes" ]] || exit 0
+DEBUGMODE=no
+
+PATH=.:/:/usr/bin:/usr/local/bin:/usr/local/sbin
+
+[[ -d /usr/lib/ublinux ]] && { unset ROOTFS; unset CMD_CHROOT; } || { ROOTFS='.'; CMD_CHROOT='chroot . '; }
+SOURCE=${ROOTFS}/usr/lib/ublinux/functions; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
+SOURCE=${ROOTFS}/usr/lib/ublinux/default; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null || exit 0
+debug_mode "$0" "$@"
+
+SYSCONF="${ROOTFS}${SYSCONF}"
+SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
+
+exec_swapspace(){
+    local PATH_SWAP=
+    if [[ -f ${ROOTFS}/usr/bin/swapspace ]]; then
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/layer-base/3" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/layer-base/2" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/layer-base/1" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/layer-base/0" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/data/from/3" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/data/from/2" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/data/from/1" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        [[ -z ${PATH_SWAP} ]] && { PATH_SWAP="${ROOTFS}/memory/data/from/0" && [[ -d ${PATH_SWAP} && -w ${PATH_SWAP} ]] || PATH_SWAP= ; }
+        if [[ -n ${PATH_SWAP} ]]; then
+            install -dm700 "${PATH_SWAP}/swap"
+            if [[ -f ${ROOTFS}/etc/swapspace.conf ]]; then
+                [[ $(cat ${ROOTFS}/etc/swapspace.conf) =~ (^|$'\n')"swappath=\"${PATH_SWAP}/swap\""($|$'\n') ]] \
+                    || sed "/^swappath=/d;0,/#swappath=/!b;//a\swappath=\"${PATH_SWAP}/swap\"" -i ${ROOTFS}/etc/swapspace.conf
+                [[ $(cat ${ROOTFS}/etc/swapspace.conf) =~ (^|$'\n')"swappath=\"${PATH_SWAP}/swap\""($|$'\n') ]] \
+                    || sed "\$a\swappath=\"${PATH_SWAP}/swap\"" -i ${ROOTFS}/etc/swapspace.conf
+            else
+                echo "swappath=\"${PATH_SWAP}/swap\"" >> ${ROOTFS}/etc/swapspace.conf
+            fi 
+        fi
+    fi
+}
+
+################
+##### MAIN #####
+################
+
+    exec_swapspace $@

ublinux/scripts/grub-functions

@@ -9,7 +9,7 @@ PATH_GRUB="/memory/data/from/0/boot/grub/"
 
 exec_get_all_menuentry(){
 ## Показать все варианты загрузки из grub_*.cfg   grub_*_addon.cfg   grub_*_boothdd.cfg
-    FILE_OSRELEASE="/etc/os-release"
+    FILE_OSRELEASE="/usr/lib/os-release"
     NAME_DISTRIB=$(sed -En "/VARIANT=/{s/VARIANT=\"(.*)\"/\1/p}" ${FILE_OSRELEASE})
     VER_DISTRIB=$(sed -En "/VERSION_ID=/{s/VERSION_ID=(.*)/\1/p}" ${FILE_OSRELEASE})