update

4 years ago · 6bf22ca679
31 changed files with 376 additions and 51 deletions
--- a/linux-live/minioslib.copy
+++ b/linux-live/minioslib.copy
--- a/linux-live/minioslib.test
+++ b/linux-live/minioslib.test
--- a/.unused/nii/03-apps/install
+++ b/.unused/nii/03-apps/install
@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -e          # exit on error
+set -o pipefail # exit on pipeline error
+set -u          # treat unset variable as error
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+# install packages
+if [ -f $SCRIPT_DIR/package.list ]; then
+    sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+        $APT_CMD update >>$OUTPUT 2>&1 &&
+        sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+            $APT_CMD install $APT_OPTIONS \
+            $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1
+fi
+
+cd /root
+#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 >>$OUTPUT 2>&1
+#echo "deb https://download.onlyoffice.com/repo/debian squeeze main" >/etc/apt/sources.list.d/onlyoffice.list >>$OUTPUT 2>&1
+wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - >>$OUTPUT 2>&1
+wget -c https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb >>$OUTPUT 2>&1
+sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+    $APT_CMD update
+#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+#    $APT_CMD install $APT_OPTIONS onlyoffice-desktopeditors
+sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+    $APT_CMD install $APT_OPTIONS /root/google-chrome-stable_current_amd64.deb /root/cts-4.0.0-104.ks1_amd64.deb >>$OUTPUT 2>&1
+
+if [ -d /home/live ]; then
+    mkdir -p /home/live/.cts
+    cp /etc/skel/.cts/settings.conf /home/live/.cts/
+    chmod 755 /home/live/.cts
+    chown live:live /home/live/.cts
+    chmod 644 /home/live/.cts/settings.conf
+    chown live:live /home/live/.cts/settings.conf
+fi
--- a/.unused/nii/03-apps/package.list
+++ b/.unused/nii/03-apps/package.list
@ -0,0 +1,8 @@
+open-vm-tools-desktop
+#firefox
+#firefox-locale-ru
+remmina
+parole
+recordmydesktop
+#compizconfig-settings-manager
+#compiz-plugins
--- a/linux-live/modules/03-apps/postinstall
+++ b/linux-live/modules/03-apps/postinstall
--- a/linux-live/modules/03-apps/rootcopy/etc/cts/registration_number.json
+++ b/linux-live/modules/03-apps/rootcopy/etc/cts/registration_number.json
--- a/linux-live/modules/03-apps/rootcopy/etc/cts/settings-general.json
+++ b/linux-live/modules/03-apps/rootcopy/etc/cts/settings-general.json
--- a/linux-live/modules/03-apps/rootcopy/etc/cts/user_registration_info.json
+++ b/linux-live/modules/03-apps/rootcopy/etc/cts/user_registration_info.json
--- a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/helpers.rc
+++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/helpers.rc
@ -0,0 +1 @@
+WebBrowser=google-chrome
--- a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop
+++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop
@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch FileManager %u
+Icon=system-file-manager
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=inode/directory;x-scheme-handler/trash;
+Name=File Manager
+Name[ru]=Файловый менеджер
+Comment=Browse the file system
+Comment[ru]=Просмотреть файловую систему
+X-XFCE-Source=file:///usr/share/applications/exo-file-manager.desktop
--- a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop
+++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop
@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch WebBrowser %u
+Icon=web-browser
+StartupNotify=true
+Terminal=false
+Categories=Network;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https;
+Name=Web Browser
+Name[ru]=Веб-браузер
+Comment=Browse the web
+Comment[ru]=Смотреть в Интернете
+X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop
+Path=
--- a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop
+++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop
@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch TerminalEmulator
+Icon=utilities-terminal
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+Name=Terminal Emulator
+Name[ru]=Эмулятор терминала
+Comment=Use the command line
+Comment[ru]=Использовать командную строку
+X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop
--- a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
+++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
@ -0,0 +1,68 @@
+favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop
+recent=
+button-title=Applications Menu
+button-icon=MiniOS-white
+button-single-row=false
+show-button-title=false
+show-button-icon=true
+launcher-show-name=true
+launcher-show-description=false
+launcher-show-tooltip=true
+item-icon-size=2
+hover-switch-category=false
+category-show-name=true
+category-icon-size=1
+load-hierarchy=true
+recent-items-max=10
+favorites-in-recent=true
+display-recent-default=false
+position-search-alternate=true
+position-commands-alternate=false
+position-categories-alternate=false
+menu-width=400
+menu-height=500
+menu-opacity=100
+command-settings=xfce4-settings-manager
+show-command-settings=true
+command-lockscreen=xflock4
+show-command-lockscreen=true
+command-switchuser=dm-tool switch-to-greeter
+show-command-switchuser=false
+command-logout=xfce4-session-logout
+show-command-logout=true
+command-menueditor=menulibre
+show-command-menueditor=true
+command-profile=mugshot
+show-command-profile=true
+search-actions=5
+
+[action0]
+name=Man-страницы
+pattern=#
+command=exo-open --launch TerminalEmulator man %s
+regex=false
+
+[action1]
+name=Web-поиск
+pattern=?
+command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
+regex=false
+
+[action2]
+name=Википедия
+pattern=!w
+command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
+regex=false
+
+[action3]
+name=Выполнить в терминале
+pattern=!
+command=exo-open --launch TerminalEmulator %s
+regex=false
+
+[action4]
+name=Открыть URI
+pattern=^(file|http|https):\\/\\/(.*)$
+command=exo-open \\0
+regex=true
+
--- a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="panels" type="uint" value="1">
+    <property name="panel-0" type="empty">
+      <property name="position" type="string" value="p=8;x=1109;y=1275"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="21"/>
+        <value type="int" value="23"/>
+        <value type="int" value="19"/>
+        <value type="int" value="24"/>
+        <value type="int" value="22"/>
+        <value type="int" value="2"/>
+        <value type="int" value="3"/>
+        <value type="int" value="5"/>
+        <value type="int" value="4"/>
+        <value type="int" value="7"/>
+        <value type="int" value="6"/>
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="12"/>
+      </property>
+      <property name="background-style" type="uint" value="0"/>
+      <property name="background-alpha" type="uint" value="60"/>
+      <property name="size" type="uint" value="32"/>
+      <property name="length-adjust" type="bool" value="true"/>
+      <property name="span-monitors" type="bool" value="false"/>
+      <property name="enter-opacity" type="uint" value="100"/>
+      <property name="leave-opacity" type="uint" value="100"/>
+      <property name="mode" type="uint" value="0"/>
+      <property name="autohide-behavior" type="uint" value="0"/>
+      <property name="nrows" type="uint" value="1"/>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="whiskermenu"/>
+    <property name="plugin-2" type="string" value="tasklist">
+      <property name="flat-buttons" type="bool" value="true"/>
+      <property name="show-handle" type="bool" value="false"/>
+      <property name="show-labels" type="bool" value="false"/>
+    </property>
+    <property name="plugin-3" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="true"/>
+    </property>
+    <property name="plugin-4" type="string" value="systray">
+      <property name="show-frame" type="bool" value="false"/>
+      <property name="size-max" type="uint" value="22"/>
+      <property name="names-visible" type="array">
+        <value type="string" value="thunar"/>
+        <value type="string" value="ctsg"/>
+      </property>
+      <property name="names-hidden" type="array">
+        <value type="string" value="network"/>
+        <value type="string" value="xfce4-power-manager"/>
+        <value type="string" value="сеть"/>
+        <value type="string" value="апплет networkmanager"/>
+        <value type="string" value="networkmanager applet"/>
+        <value type="string" value="remmina"/>
+      </property>
+    </property>
+    <property name="plugin-9" type="string" value="pulseaudio">
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+      <property name="enable-mpris" type="bool" value="true"/>
+      <property name="mixer-command" type="string" value="pavucontrol"/>
+      <property name="mpris-players" type="string" value="parole"/>
+      <property name="show-notifications" type="bool" value="true"/>
+    </property>
+    <property name="plugin-10" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="false"/>
+    </property>
+    <property name="plugin-11" type="string" value="clock">
+      <property name="digital-format" type="string" value="%d %b, %H:%M"/>
+    </property>
+    <property name="plugin-12" type="string" value="showdesktop"/>
+    <property name="plugin-19" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16093657651.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-21" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-22" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-23" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16093659533.desktop"/>
+      </property>
+      <property name="show-label" type="bool" value="false"/>
+      <property name="disable-tooltips" type="bool" value="false"/>
+    </property>
+    <property name="plugin-24" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="16093659584.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-5" type="string" value="xkb">
+      <property name="display-scale" type="uint" value="50"/>
+      <property name="display-tooltip-icon" type="bool" value="true"/>
+      <property name="group-policy" type="uint" value="0"/>
+      <property name="display-type" type="uint" value="2"/>
+      <property name="display-name" type="uint" value="1"/>
+    </property>
+    <property name="plugin-7" type="string" value="statusnotifier">
+      <property name="known-items" type="array">
+        <value type="string" value="ctsg"/>
+        <value type="string" value="remmina-icon"/>
+        <value type="string" value="nm-applet"/>
+      </property>
+      <property name="hidden-items" type="array">
+      </property>
+    </property>
+    <property name="plugin-6" type="string" value="power-manager-plugin"/>
+  </property>
+  <property name="configver" type="int" value="2"/>
+</channel>
--- a/linux-live/modules/03-apps/rootcopy/etc/skel/.cts/settings.conf
+++ b/linux-live/modules/03-apps/rootcopy/etc/skel/.cts/settings.conf
--- a/linux-live/modules/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb
+++ b/linux-live/modules/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb
--- a/linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop
+++ b/linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop
--- a/linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop
+++ b/linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop
--- a/linux-live/modules/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png
+++ b/linux-live/modules/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png
--- a/.unused/wg-gen-web.yml
+++ b/.unused/wg-gen-web.yml
@ -0,0 +1,34 @@
+version: "3.6"
+services:
+  wg-gen-web:
+    image: vx3r/wg-gen-web:latest
+    container_name: wg-gen-web
+    restart: unless-stopped
+    expose:
+      - "8080/tcp"
+    environment:
+      - WG_CONF_DIR=/data
+      - WG_INTERFACE_NAME=wg0.conf
+      - SMTP_HOST=mail.crims0n.ru
+      - SMTP_PORT=587
+      - SMTP_USERNAME=no-reply@crims0n.ru
+      - SMTP_PASSWORD=4ys4eUVNcVCuvJ
+      - SMTP_FROM=Wg Gen Web <no-reply@crims0n.ru>
+      - OAUTH2_PROVIDER_NAME=github
+      - OAUTH2_PROVIDER=https://github.com
+      - OAUTH2_CLIENT_ID=1347a6c5a942ca0a52ed
+      - OAUTH2_CLIENT_SECRET=2f1d162b2d8d82bc58f685660e6875d2544d059c
+      - OAUTH2_REDIRECT_URL=http://140.238.172.15:8080
+      - WG_STATS_API=http://10.0.0.2:8182
+    volumes:
+      - /etc/wireguard:/data
+    ports:
+      - 8080:8080
+  wg-json-api:
+    image: james/wg-api:latest
+    container_name: wg-json-api
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    network_mode: "host"
+    command: wg-api --device wg0 --listen 0.0.0.0:8182
--- a/docker/02-build.sh
+++ b/docker/02-build.sh
@ -1,4 +1,4 @@
 #!/bin/bash
-#docker run --rm -it --privileged -v /build:/build local/mlc
+docker run --rm -it --privileged -v /build:/build local/mlc
 #docker run -it --name mlc --privileged -v /build:/build local/mlc
-docker run -d --name mlc --privileged -v /build:/build local/mlc
+#docker run -d --name mlc --privileged -v /build:/build local/mlc
--- a/linux-live/buildconfig
+++ b/linux-live/buildconfig
@ -31,4 +31,7 @@ APT_OPTIONS="-y" #--no-install-recommends"
 #LIVE_TYPE="casper"
 LIVE_TYPE="livekit"

+UNION_BUILD_TYPE="overlayfs"
+#UNION_BUILD_TYPE="aufs"
+
 INSTALL_OPTIONAL="1"
--- a/linux-live/config
+++ b/linux-live/config
@ -33,7 +33,7 @@ DISTRIBUTION_VARIANT="minbase"
 DISTRIBUTION_URL="http://ru.archive.ubuntu.com/ubuntu"

 #
-COMP_TYPE="lz4"
+COMP_TYPE="xz"

 # Kernel file, will be copied to your Live Kit
 # Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@ -1037,7 +1037,8 @@ function build_iso() {

 	E="EFI/boot/efiboot.img -no-emul-boot"

-	VER="$SYSTEMNAME $VER"
+	#VER="$SYSTEMNAME $VER"
+	VER="$SYSTEMNAME"

 	if [ REMOVE_OLD_ISO = "1" ]; then
 		rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-*.iso >>$OUTPUT 2>&1
@ -1610,19 +1611,36 @@ function module_chroot_mount_fs() {

 	module_check_mounted

-	MODULES_LIST=""
-	MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT)
-	for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
-		MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
-		mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
-		mount ${MODULES[$i]} $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
-		MODULES_LIST=$MODULES_LIST":""$MODULES_DIR/lower/$MODULE_LOWER_DIR-lower"
-	done
-	MODULES_LIST=${MODULES_LIST:1}
+	if [ $UNION_BUILD_TYPE = "overlayfs" ]; then
+		MODULES_LIST=""
+		MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT)
+		for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
+			MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
+			mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
+			mount ${MODULES[$i]} $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
+			MODULES_LIST=$MODULES_LIST":""$MODULES_DIR/lower/$MODULE_LOWER_DIR-lower"
+		done
+		MODULES_LIST=${MODULES_LIST:1}
+
+		mkdir -p $MODULE_UPPER_DIR $MODULE_WORK_DIR $MODULE_MERGED_DIR
+
+		mount -t overlay overlay -o lowerdir=$MODULES_LIST,upperdir=$MODULE_UPPER_DIR,workdir=$MODULE_WORK_DIR $MODULE_MERGED_DIR
+	elif [ $UNION_BUILD_TYPE = "aufs" ]; then
+		MODULES_LIST=""
+		MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT)
+		for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
+			MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
+			mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
+			mount ${MODULES[$i]} $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
+			MODULES_LIST=$MODULES_LIST":""$MODULES_DIR/lower/$MODULE_LOWER_DIR-lower""=ro"
+		done
+		MODULES_LIST=${MODULES_LIST:1}

-	mkdir -p $MODULE_UPPER_DIR $MODULE_WORK_DIR $MODULE_MERGED_DIR
+		mkdir -p $MODULE_UPPER_DIR $MODULE_WORK_DIR $MODULE_MERGED_DIR

-	mount -t overlay overlay -o lowerdir=$MODULES_LIST,upperdir=$MODULE_UPPER_DIR,workdir=$MODULE_WORK_DIR $MODULE_MERGED_DIR
+		mount -t aufs -o br:$MODULE_UPPER_DIR=rw:$MODULES_LIST aufs $MODULE_MERGED_DIR
+		#echo "mount -t aufs -o br:$MODULE_UPPER_DIR=rw:$MODULES_LIST aufs $MODULE_MERGED_DIR"
+	fi

 	if [ ! -d $MODULE_MERGED_DIR/dev ]; then
 		mkdir -p $MODULE_MERGED_DIR/dev
@ -1728,7 +1746,7 @@ function module_cleanup() {
 }

 function module_chroot_finish_up() {
-	current_process
+	echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."

 	# truncate machine id (why??)
 	chroot $MODULE_MERGED_DIR /bin/bash -x <<EOF
@ -1740,7 +1758,10 @@ EOF
    rm /sbin/initctl >>$OUTPUT 2>&1
    dpkg-divert --rename --remove /sbin/initctl >>$OUTPUT 2>&1
 EOF
+}

+function module_chroot_cleanup() {
+	echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
 	# clean up useless stuff
 	rm -rf $MODULE_UPPER_DIR/boot $MODULE_UPPER_DIR/dev $MODULE_UPPER_DIR/proc $MODULE_UPPER_DIR/sys $MODULE_UPPER_DIR/rmp $MODULE_UPPER_DIR/run
 	rm -f $MODULE_UPPER_DIR/root/.bash_history >>$OUTPUT 2>&1
@ -1760,10 +1781,10 @@ EOF
 	rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*InRelease >>$OUTPUT 2>&1
 	rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.* >>$OUTPUT 2>&1
 	rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1
-	rm -f $MODULE_UPPER_DIR/preinstall
-	rm -f $MODULE_UPPER_DIR/install
-	rm -f $MODULE_UPPER_DIR/packages.list
-	rm -f $MODULE_UPPER_DIR/postinstall
+	rm -f $MODULE_UPPER_DIR/preinstall >>$OUTPUT 2>&1
+	rm -f $MODULE_UPPER_DIR/install >>$OUTPUT 2>&1
+	rm -f $MODULE_UPPER_DIR/package.list >>$OUTPUT 2>&1
+	rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
 }

 function build_modules_chroot() {
@ -1892,6 +1913,8 @@ function build_modules_chroot() {

 			module_chroot_umount_fs

+			module_chroot_cleanup
+
 			if [ ! -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT ]; then
 				build_modules_live
 			fi
@ -1919,7 +1942,7 @@ function build_modules_live() {

 	for MODULE in *; do

-		if [ -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT ]; then
+		if (ls $PARENT_DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then
 			echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
 			echo -e "Please remove ${MAGENTA}$PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}."
 			echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
--- a/linux-live/modules/02-xubuntu/postinstall
+++ b/linux-live/modules/02-xubuntu/postinstall
@ -32,6 +32,10 @@ EOF
    dpkg-reconfigure -f noninteractive network-manager
 fi

+if [ -f /usr/lib/udev/rules.d/90-slax-automount.rules ]; then
+    rm /usr/lib/udev/rules.d/90-slax-automount.rules
+fi
+
 if [ -f /usr/share/xfce4/backdrops/xubuntu-wallpaper.png ]; then
    rm /usr/share/xfce4/backdrops/xubuntu-wallpaper.png
 fi
--- a/linux-live/modules/03-apps/install
+++ b/linux-live/modules/03-apps/install
@ -14,24 +14,3 @@ if [ -f $SCRIPT_DIR/package.list ]; then
            $APT_CMD install $APT_OPTIONS \
            $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1
 fi
-
-cd /root
-#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 >>$OUTPUT 2>&1
-#echo "deb https://download.onlyoffice.com/repo/debian squeeze main" >/etc/apt/sources.list.d/onlyoffice.list >>$OUTPUT 2>&1
-wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - >>$OUTPUT 2>&1
-wget -c https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb >>$OUTPUT 2>&1
-sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-    $APT_CMD update
-#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-#    $APT_CMD install $APT_OPTIONS onlyoffice-desktopeditors
-sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-    $APT_CMD install $APT_OPTIONS /root/google-chrome-stable_current_amd64.deb /root/cts-4.0.0-104.ks1_amd64.deb >>$OUTPUT 2>&1
-
-if [ -d /home/live ]; then
-    mkdir -p /home/live/.cts
-    cp /etc/skel/.cts/settings.conf /home/live/.cts/
-    chmod 755 /home/live/.cts
-    chown live:live /home/live/.cts
-    chmod 644 /home/live/.cts/settings.conf
-    chown live:live /home/live/.cts/settings.conf
-fi
--- a/linux-live/modules/03-apps/package.list
+++ b/linux-live/modules/03-apps/package.list
@ -1,8 +1,8 @@
 open-vm-tools-desktop
-#firefox
-#firefox-locale-ru
+firefox
+firefox-locale-ru
 remmina
 parole
 recordmydesktop
-compizconfig-settings-manager
-compiz-plugins
+#compizconfig-settings-manager
+#compiz-plugins
--- a/linux-live/modules/04-drivers/postinstall
+++ b/linux-live/modules/04-drivers/postinstall
@ -6,5 +6,5 @@ set -u          # treat unset variable as error

 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"

-sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
-    $APT_CMD remove linux-headers-generic-hwe-20.04 $APT_OPTIONS >>$OUTPUT 2>&1
+#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+    #$APT_CMD remove linux-headers-generic-hwe-20.04 $APT_OPTIONS >>$OUTPUT 2>&1
--- a/linux-live/rootcopy-casper/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
+++ b/linux-live/rootcopy-casper/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
@ -1,4 +1,4 @@
-favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop
+favorites=ubiquity.desktop
 recent=
 button-title=Applications Menu
 button-icon=MiniOS-white
--- a/linux-live/rootcopy-livekit/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
+++ b/linux-live/rootcopy-livekit/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
@ -1,4 +1,4 @@
-favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop
+favorites=ubiquity.desktop
 recent=
 button-title=Applications Menu
 button-icon=MiniOS-white
--- a/linux-live/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
+++ b/linux-live/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
@ -1,4 +1,4 @@
-favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop
+favorites=ubiquity.desktop
 recent=
 button-title=Applications Menu
 button-icon=MiniOS-white