From c040d22a582c9f8505582966521fc0e0e1c8c4c8 Mon Sep 17 00:00:00 2001
From: crims0n <crims0n@yandex.ru>
Date: Sun, 7 Feb 2021 04:22:05 +0300
Subject: [PATCH] update

---
 linux-live/minioslib                       | 12 ++++++------
 linux-live/modules/02-xubuntu/package.list |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/linux-live/minioslib b/linux-live/minioslib
index 338ab91..14a63bd 100644
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@@ -1686,7 +1686,7 @@ function module_chroot_umount_fs() {
 	if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
 		umount $MODULE_MERGED_DIR/run/resolvconf/resolv.conf >>$OUTPUT 2>&1
 		rm -f $MODULE_MERGED_DIR/run/resolvconf/resolv.conf
-		rmdir -f $MODULE_MERGED_DIR/run/resolvconf
+		rmdir $MODULE_MERGED_DIR/run/resolvconf
 	else
 		umount $MODULE_MERGED_DIR/run >>$OUTPUT 2>&1
 	fi
@@ -1760,10 +1760,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 /preinstall
-	rm -f /install
-	rm -f /packages.list
-	rm -f /postinstall
+	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
 }
 
 function build_modules_chroot() {
@@ -1919,7 +1919,7 @@ function build_modules_live() {
 
 	for MODULE in *; do
 
-		if (ls $PARENT_DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then
+		if [ -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT ]; 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}"
diff --git a/linux-live/modules/02-xubuntu/package.list b/linux-live/modules/02-xubuntu/package.list
index 225e0e5..398b863 100644
--- a/linux-live/modules/02-xubuntu/package.list
+++ b/linux-live/modules/02-xubuntu/package.list
@@ -15,4 +15,5 @@ gparted
 gsmartcontrol
 xfce4-taskmanager
 xfce4-xkb-plugin
-language-pack-gnome-ru
\ No newline at end of file
+language-pack-gnome-ru
+xserver-xorg-input-synaptics
\ No newline at end of file