diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/adjtime b/linux-live/basesystem/01-core/rootcopy/etc/adjtime
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/adjtime
rename to linux-live/basesystem/01-core/rootcopy/etc/adjtime
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/apt/apt.conf.d/000Slax b/linux-live/basesystem/01-core/rootcopy/etc/apt/apt.conf.d/000Slax
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/apt/apt.conf.d/000Slax
rename to linux-live/basesystem/01-core/rootcopy/etc/apt/apt.conf.d/000Slax
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/hostname b/linux-live/basesystem/01-core/rootcopy/etc/hostname
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/hostname
rename to linux-live/basesystem/01-core/rootcopy/etc/hostname
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/hosts b/linux-live/basesystem/01-core/rootcopy/etc/hosts
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/hosts
rename to linux-live/basesystem/01-core/rootcopy/etc/hosts
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/issue b/linux-live/basesystem/01-core/rootcopy/etc/issue
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/issue
rename to linux-live/basesystem/01-core/rootcopy/etc/issue
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/localtime b/linux-live/basesystem/01-core/rootcopy/etc/localtime
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/localtime
rename to linux-live/basesystem/01-core/rootcopy/etc/localtime
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/motd b/linux-live/basesystem/01-core/rootcopy/etc/motd
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/motd
rename to linux-live/basesystem/01-core/rootcopy/etc/motd
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/profile b/linux-live/basesystem/01-core/rootcopy/etc/profile
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/profile
rename to linux-live/basesystem/01-core/rootcopy/etc/profile
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/skel/.bashrc b/linux-live/basesystem/01-core/rootcopy/etc/skel/.bashrc
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/skel/.bashrc
rename to linux-live/basesystem/01-core/rootcopy/etc/skel/.bashrc
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/ssh/sshd_config.d/90-minios.conf b/linux-live/basesystem/01-core/rootcopy/etc/ssh/sshd_config.d/90-minios.conf
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/ssh/sshd_config.d/90-minios.conf
rename to linux-live/basesystem/01-core/rootcopy/etc/ssh/sshd_config.d/90-minios.conf
diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/timezone b/linux-live/basesystem/01-core/rootcopy/etc/timezone
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/etc/timezone
rename to linux-live/basesystem/01-core/rootcopy/etc/timezone
diff --git a/linux-live/basesystem/01-core/rootcopy-install/home/live/.bashrc b/linux-live/basesystem/01-core/rootcopy/home/live/.bashrc
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/home/live/.bashrc
rename to linux-live/basesystem/01-core/rootcopy/home/live/.bashrc
diff --git a/linux-live/basesystem/01-core/rootcopy-install/root/.bashrc b/linux-live/basesystem/01-core/rootcopy/root/.bashrc
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/root/.bashrc
rename to linux-live/basesystem/01-core/rootcopy/root/.bashrc
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/dir2sb b/linux-live/basesystem/01-core/rootcopy/usr/bin/dir2sb
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/dir2sb
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/dir2sb
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso b/linux-live/basesystem/01-core/rootcopy/usr/bin/genminiosiso
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/genminiosiso
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/pxe b/linux-live/basesystem/01-core/rootcopy/usr/bin/pxe
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/pxe
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/pxe
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/rmsbdir b/linux-live/basesystem/01-core/rootcopy/usr/bin/rmsbdir
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/rmsbdir
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/rmsbdir
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/savechanges b/linux-live/basesystem/01-core/rootcopy/usr/bin/savechanges
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/savechanges
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/savechanges
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb b/linux-live/basesystem/01-core/rootcopy/usr/bin/sb
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/sb
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb2dir b/linux-live/basesystem/01-core/rootcopy/usr/bin/sb2dir
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/sb2dir
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/sb2dir
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/slax b/linux-live/basesystem/01-core/rootcopy/usr/bin/slax
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/bin/slax
rename to linux-live/basesystem/01-core/rootcopy/usr/bin/slax
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/apparmor.service b/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/apparmor.service
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/apparmor.service
rename to linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/apparmor.service
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/getty@.service b/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/getty@.service
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/getty@.service
rename to linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/getty@.service
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/ssh.service b/linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/lib/systemd/system/ssh.service
rename to linux-live/basesystem/01-core/rootcopy/usr/lib/systemd/system/ssh.service
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/lib/udev/rules.d/90-slax-automount.rules b/linux-live/basesystem/01-core/rootcopy/usr/lib/udev/rules.d/90-slax-automount.rules
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/lib/udev/rules.d/90-slax-automount.rules
rename to linux-live/basesystem/01-core/rootcopy/usr/lib/udev/rules.d/90-slax-automount.rules
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/sbin/gtk-bookmarks-update b/linux-live/basesystem/01-core/rootcopy/usr/sbin/gtk-bookmarks-update
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/sbin/gtk-bookmarks-update
rename to linux-live/basesystem/01-core/rootcopy/usr/sbin/gtk-bookmarks-update
diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/sbin/slax-automount b/linux-live/basesystem/01-core/rootcopy/usr/sbin/slax-automount
similarity index 100%
rename from linux-live/basesystem/01-core/rootcopy-install/usr/sbin/slax-automount
rename to linux-live/basesystem/01-core/rootcopy/usr/sbin/slax-automount
diff --git a/linux-live/buildconfig b/linux-live/buildconfig
index 0081111..cdf1294 100644
--- a/linux-live/buildconfig
+++ b/linux-live/buildconfig
@@ -4,10 +4,10 @@
DISTRIBUTION_TYPE="debian"
#
-DISTRIBUTION="bullseye"
+DISTRIBUTION="buster"
#
-DISTRIBUTION_ARCH="amd64"
+DISTRIBUTION_ARCH="i386"
# Used when building Ubuntu
DISTRIBUTION_VARIANT="minbase"
@@ -16,7 +16,7 @@ DISTRIBUTION_VARIANT="minbase"
DISTRIBUTION_URL="http://ftp.ru.debian.org/debian/"
#
-PACKAGE_VARIANT="minimal"
+PACKAGE_VARIANT="standard"
#
LOGPATH="/var/log"
diff --git a/linux-live/config b/linux-live/config
index 62a0d7b..45ba53f 100644
--- a/linux-live/config
+++ b/linux-live/config
@@ -1,8 +1,8 @@
#!/bin/bash
-# This is a config file for MiniOS-Live build script and Linux Live Kit boot script.
-# You shouldn't need to change anything expect PACKAGE_VARIANT OUTPUT COMP_TYPE
+# This is a config file for Linux Live Kit build script.
+# You shouldn't need to change anything expect LIVEKITNAME
-# Live Kit Name. Defaults to 'minios';
+# Live Kit Name. Defaults to 'linux';
# This will be the name of the directory created on your CD/USB, which
# will contain everything including boot files and such.
# For example, Slax changes it to 'slax'
@@ -14,73 +14,6 @@
# and you're done.
LIVEKITNAME="minios"
-#
-DISTRIBUTION_TYPE="debian"
-
-#
-DISTRIBUTION="bullseye"
-
-#
-DISTRIBUTION_ARCH="amd64"
-
-# Used when building Ubuntu
-DISTRIBUTION_VARIANT="minbase"
-
-#
-DISTRIBUTION_URL="http://ftp.ru.debian.org/debian/"
-
-#
-PACKAGE_VARIANT="minimal"
-
-#
-LOGPATH="/var/log"
-
-# default is output to log. you can use OUTPUT="/dev/stdout" if you want to route events to standard output.
-#OUTPUT="$LOGPATH/$LIVEKITNAME.log"
-OUTPUT="/dev/stdout"
-#OUTPUT="/dev/null"
-
-# if = "1", creates a second iso with a constant filename
-# если ="1", создаёт второй iso с постоянным именем файла
-BUILD_TEST_ISO="1"
-
-# удаляет старые файлы iso для данного типа сборки
-REMOVE_OLD_ISO="0"
-
-# if = "1", creates a copy of minios-live in chroot /opt
-# если ="1", создаёт копию minios-live в chroot /opt
-DEV_SYSTEM="0"
-
-# if ="1", creates backup in parent folder
-# если ="1", создаёт резервную копию в родительской папке
-CREATE_BACKUP="0"
-
-DEBIAN_FRONTEND_TYPE="noninteractive"
-#DEBIAN_FRONTEND_TYPE="dialog"
-#DEBIAN_FRONTEND_TYPE="text"
-
-APT_CMD="apt-get"
-
-APT_OPTIONS="-y"
-APT_OPTIONS2="--no-install-recommends"
-
-#LIVE_TYPE="casper"
-LIVE_TYPE="livekit"
-
-#BOOT_TYPE="minios"
-BOOT_TYPE="slax"
-
-UNION_BUILD_TYPE="overlayfs"
-#UNION_BUILD_TYPE="aufs"
-
-INSTALL_OPTIONAL="1"
-
-# Used when assigned to the ISO name when building Minios-Live
-SYSTEMNAME="MiniOS"
-
-#
-SYSTEMVER="2021"
-
#
COMP_TYPE="xz"
diff --git a/linux-live/minioslib b/linux-live/minioslib
index 6eb0e3d..39883de 100644
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@@ -672,6 +672,8 @@ function build_live() {
check_build_dir
+ #(cd /linux-live/rootcopy && cp --parents -afr * /)
+
chroot $BUILD_DIR mount none -t proc /proc
chroot $BUILD_DIR /linux-live/initrfs
chroot $BUILD_DIR umount /proc
@@ -688,7 +690,7 @@ function build_live() {
mv $BUILD_DIR/boot/initrfs.img $PARENT_DIR/image/$LIVEKITNAME/boot/initrfs.img
cp -r $SCRIPT_DIR/linux-live/bootfiles/* $PARENT_DIR/image/$LIVEKITNAME
-
+
if [ $PACKAGE_VARIANT = "minimal" ]; then
sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $PARENT_DIR/image/$LIVEKITNAME/boot/syslinux.cfg
sed -i 's/minios.flags= /minios.flags=automount /g' $PARENT_DIR/image/$LIVEKITNAME/boot/syslinux.cfg
@@ -838,7 +840,6 @@ function chroot_build_cleanup() {
rm -f /install2 >>$OUTPUT 2>&1
rm -f /cleanup >>$OUTPUT 2>&1
rm -f /$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
- rm -f /preseed.txt >>$OUTPUT 2>&1
rm -f /postinstall >>$OUTPUT 2>&1
rm -rf /rootcopy >>$OUTPUT 2>&1
rm -rf /patches >>$OUTPUT 2>&1
@@ -879,11 +880,11 @@ function chroot_build_cleanup() {
rm -Rf /usr/share/fluxbox/nls/??* >>$OUTPUT 2>&1
rm -Rf /usr/share/gnome/help >>$OUTPUT 2>&1
- #rm -Rf /usr/share/locale/?? >>$OUTPUT 2>&1
- #rm -Rf /usr/share/locale/??_* >>$OUTPUT 2>&1
- #rm -Rf /usr/share/locale/??@* >>$OUTPUT 2>&1
- #rm -Rf /usr/share/locale/??? >>$OUTPUT 2>&1
- #rm -Rf /usr/share/i18n/locales/*_* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/locale/?? >>$OUTPUT 2>&1
+ rm -Rf /usr/share/locale/??_* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/locale/??@* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/locale/??? >>$OUTPUT 2>&1
+ rm -Rf /usr/share/i18n/locales/*_* >>$OUTPUT 2>&1
rm -Rf /usr/share/man/?? >>$OUTPUT 2>&1
rm -Rf /usr/share/man/*_* >>$OUTPUT 2>&1
@@ -986,8 +987,8 @@ function main_pkg_list() {
PACKAGE_VARIANT=$PACKAGE_VARIANT \
/linux-live/basesystem/01-core/preinstall
fi
- : ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy-install)" != "" ]; then
- (cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /)
+ : ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy)" != "" ]; then
+ (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /)
fi'
if [ -f /linux-live/basesystem/01-core/install ]; then
chmod +x /linux-live/basesystem/01-core/install
@@ -1059,7 +1060,7 @@ function chroot_configure() {
#addgroup live live >>$OUTPUT 2>&1
usermod -a -G sudo live
- (cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /)
+ (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /)
chown live:live /home/live
chown -R live:live /home/live
@@ -1479,9 +1480,8 @@ function module_chroot_cleanup() {
rm -f $MODULE_UPPER_DIR/install2
rm -f $MODULE_UPPER_DIR/cleanup
rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list
- rm -f $MODULE_UPPER_DIR/preseed.txt
rm -f $MODULE_UPPER_DIR/postinstall
- rm -rf $MODULE_UPPER_DIR/rootcopy-install
+ rm -rf $MODULE_UPPER_DIR/rootcopy
else
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
@@ -1506,9 +1506,8 @@ function module_chroot_cleanup() {
rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/preseed.txt >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
- rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1
+ rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1
fi
}
@@ -1527,9 +1526,8 @@ function module_build_cleanup() {
rm -f $MODULE_UPPER_DIR/install2
rm -f $MODULE_UPPER_DIR/cleanup
rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list
- rm -f $MODULE_UPPER_DIR/preseed.txt
rm -f $MODULE_UPPER_DIR/postinstall
- rm -rf $MODULE_UPPER_DIR/rootcopy-install
+ rm -rf $MODULE_UPPER_DIR/rootcopy
rm -rf $MODULE_UPPER_DIR/patches
rm -f $MODULE_UPPER_DIR/etc/fstab
@@ -1568,11 +1566,11 @@ function module_build_cleanup() {
rm -Rf $MODULE_UPPER_DIR/usr/share/fluxbox/nls/??*
rm -Rf $MODULE_UPPER_DIR/usr/share/gnome/help
- #rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??
- #rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_*
- #rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@*
- #rm -Rf $MODULE_UPPER_DIR/usr/share/locale/???
- #rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/???
+ rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_*
rm -Rf $MODULE_UPPER_DIR/usr/share/man/??
rm -Rf $MODULE_UPPER_DIR/usr/share/man/*_*
@@ -1622,9 +1620,8 @@ function module_build_cleanup() {
rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/preseed.txt >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
- rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1
+ rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1
rm -rf $MODULE_UPPER_DIR/patches >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/etc/fstab >>$OUTPUT 2>&1
@@ -1770,24 +1767,24 @@ function build_modules() {
# copy files
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then
- (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
else
- if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
- (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
fi
else
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then
- mkdir $MODULE_MERGED_DIR/rootcopy-install
- (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then
+ mkdir $MODULE_MERGED_DIR/rootcopy
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/)
fi
else
- if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
- mkdir $MODULE_MERGED_DIR/rootcopy-install
- (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then
+ mkdir $MODULE_MERGED_DIR/rootcopy
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/)
fi
fi
fi
@@ -1802,9 +1799,6 @@ function build_modules() {
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
fi
- if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/preseed.txt ]; then
- cp $SCRIPT_DIR/linux-live/modules/$MODULE/preseed.txt $MODULE_MERGED_DIR/preseed.txt
- fi
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot $MODULE_MERGED_DIR /usr/bin/env \
OUTPUT=$OUTPUT \
@@ -1964,6 +1958,8 @@ function build_modules() {
module_chroot_finish_up
+ module_chroot_umount_fs
+
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
module_build_cleanup
fi
@@ -1988,8 +1984,6 @@ function build_modules() {
fi
fi
- module_chroot_umount_fs
-
fi
done
}
@@ -2000,6 +1994,7 @@ function build_modules() {
# =================================================================
function build_modules_live() {
current_process
+ echo "here 2"
if [ $CONTAINER_TYPE = "1" ]; then
if [ ! -f /.minios-live ]; then
setup_host
diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.Xresources b/linux-live/modules/02-xorg/rootcopy/etc/skel/.Xresources
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.Xresources
rename to linux-live/modules/02-xorg/rootcopy/etc/skel/.Xresources
diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackbox-menu b/linux-live/modules/02-xorg/rootcopy/etc/skel/.blackbox-menu
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackbox-menu
rename to linux-live/modules/02-xorg/rootcopy/etc/skel/.blackbox-menu
diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackboxrc b/linux-live/modules/02-xorg/rootcopy/etc/skel/.blackboxrc
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackboxrc
rename to linux-live/modules/02-xorg/rootcopy/etc/skel/.blackboxrc
diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/02-xorg/rootcopy/etc/skel/.xinitrc
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.xinitrc
rename to linux-live/modules/02-xorg/rootcopy/etc/skel/.xinitrc
diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service b/linux-live/modules/02-xorg/rootcopy/etc/systemd/system/display-manager.service
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service
rename to linux-live/modules/02-xorg/rootcopy/etc/systemd/system/display-manager.service
diff --git a/linux-live/modules/02-xorg/rootcopy-install/home/live/.Xresources b/linux-live/modules/02-xorg/rootcopy/home/live/.Xresources
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/home/live/.Xresources
rename to linux-live/modules/02-xorg/rootcopy/home/live/.Xresources
diff --git a/linux-live/modules/02-xorg/rootcopy-install/home/live/.blackbox-menu b/linux-live/modules/02-xorg/rootcopy/home/live/.blackbox-menu
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/home/live/.blackbox-menu
rename to linux-live/modules/02-xorg/rootcopy/home/live/.blackbox-menu
diff --git a/linux-live/modules/02-xorg/rootcopy-install/home/live/.blackboxrc b/linux-live/modules/02-xorg/rootcopy/home/live/.blackboxrc
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/home/live/.blackboxrc
rename to linux-live/modules/02-xorg/rootcopy/home/live/.blackboxrc
diff --git a/linux-live/modules/02-xorg/rootcopy-install/home/live/.xinitrc b/linux-live/modules/02-xorg/rootcopy/home/live/.xinitrc
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/home/live/.xinitrc
rename to linux-live/modules/02-xorg/rootcopy/home/live/.xinitrc
diff --git a/linux-live/modules/02-xorg/rootcopy-install/root/.Xresources b/linux-live/modules/02-xorg/rootcopy/root/.Xresources
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/root/.Xresources
rename to linux-live/modules/02-xorg/rootcopy/root/.Xresources
diff --git a/linux-live/modules/02-xorg/rootcopy-install/root/.blackbox-menu b/linux-live/modules/02-xorg/rootcopy/root/.blackbox-menu
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/root/.blackbox-menu
rename to linux-live/modules/02-xorg/rootcopy/root/.blackbox-menu
diff --git a/linux-live/modules/02-xorg/rootcopy-install/root/.blackboxrc b/linux-live/modules/02-xorg/rootcopy/root/.blackboxrc
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/root/.blackboxrc
rename to linux-live/modules/02-xorg/rootcopy/root/.blackboxrc
diff --git a/linux-live/modules/02-xorg/rootcopy-install/root/.xinitrc b/linux-live/modules/02-xorg/rootcopy/root/.xinitrc
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/root/.xinitrc
rename to linux-live/modules/02-xorg/rootcopy/root/.xinitrc
diff --git a/linux-live/modules/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service b/linux-live/modules/02-xorg/rootcopy/usr/lib/systemd/system/xorg.service
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service
rename to linux-live/modules/02-xorg/rootcopy/usr/lib/systemd/system/xorg.service
diff --git a/linux-live/modules/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax b/linux-live/modules/02-xorg/rootcopy/usr/share/blackbox/styles/Slax
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax
rename to linux-live/modules/02-xorg/rootcopy/usr/share/blackbox/styles/Slax
diff --git a/linux-live/modules/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/02-xorg/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm
similarity index 100%
rename from linux-live/modules/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm
rename to linux-live/modules/02-xorg/rootcopy/usr/share/icons/locolor/16x16/apps/xterm.xbm
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm b/linux-live/modules/03-xfce-desktop/rootcopy/etc/default/nodm
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/default/nodm
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xarchiver/xarchiverrc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xarchiver/xarchiverrc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/battery-10.rc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/battery-10.rc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xinitrc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xinitrc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xsession
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession
rename to linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.xsession
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/Default/Preferences b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/Default/Preferences
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/Default/Preferences
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/Default/Preferences
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/First Run b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/First Run
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/First Run
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/chromium/First Run
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xarchiver/xarchiverrc b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xarchiver/xarchiverrc
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/battery-10.rc b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/battery-10.rc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/battery-10.rc
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/battery-10.rc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/whiskermenu-1.rc
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xinitrc b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xinitrc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xinitrc
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xinitrc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xsession b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xsession
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/home/live/.xsession
rename to linux-live/modules/03-xfce-desktop/rootcopy/home/live/.xsession
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xarchiver/xarchiverrc b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xarchiver/xarchiverrc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xarchiver/xarchiverrc
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xarchiver/xarchiverrc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/battery-10.rc b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/battery-10.rc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/battery-10.rc
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/battery-10.rc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-4/FileManager.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-4/FileManager.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-4/FileManager.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xinitrc b/linux-live/modules/03-xfce-desktop/rootcopy/root/.xinitrc
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xinitrc
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.xinitrc
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xsession b/linux-live/modules/03-xfce-desktop/rootcopy/root/.xsession
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/root/.xsession
rename to linux-live/modules/03-xfce-desktop/rootcopy/root/.xsession
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg b/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/backgrounds/MiniOS-wallpaper.svg
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg
rename to linux-live/modules/03-xfce-desktop/rootcopy/usr/share/backgrounds/MiniOS-wallpaper.svg
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg b/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/pixmaps/MiniOS-white.svg
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg
rename to linux-live/modules/03-xfce-desktop/rootcopy/usr/share/pixmaps/MiniOS-white.svg
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png b/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/background.png
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png
rename to linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/background.png
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png b/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/panel.png
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png
rename to linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/panel.png
diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme b/linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/slim.theme
similarity index 100%
rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme
rename to linux-live/modules/03-xfce-desktop/rootcopy/usr/share/slim/themes/minios/slim.theme
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop b/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/autostart/volumeicon.desktop
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop
rename to linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/autostart/volumeicon.desktop
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon b/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/volumeicon/volumeicon
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon
rename to linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/volumeicon/volumeicon
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm b/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/accels.scm
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm
rename to linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/accels.scm
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc b/linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/terminalrc
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc
rename to linux-live/modules/04-xfce-apps/rootcopy/etc/skel/.config/xfce4/terminal/terminalrc
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/autostart/volumeicon.desktop b/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/autostart/volumeicon.desktop
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/autostart/volumeicon.desktop
rename to linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/autostart/volumeicon.desktop
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/volumeicon/volumeicon b/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/volumeicon/volumeicon
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/volumeicon/volumeicon
rename to linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/volumeicon/volumeicon
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/accels.scm b/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/accels.scm
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/accels.scm
rename to linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/accels.scm
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/terminalrc b/linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/terminalrc
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/terminalrc
rename to linux-live/modules/04-xfce-apps/rootcopy/home/live/.config/xfce4/terminal/terminalrc
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/autostart/volumeicon.desktop b/linux-live/modules/04-xfce-apps/rootcopy/root/.config/autostart/volumeicon.desktop
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/autostart/volumeicon.desktop
rename to linux-live/modules/04-xfce-apps/rootcopy/root/.config/autostart/volumeicon.desktop
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/volumeicon/volumeicon b/linux-live/modules/04-xfce-apps/rootcopy/root/.config/volumeicon/volumeicon
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/volumeicon/volumeicon
rename to linux-live/modules/04-xfce-apps/rootcopy/root/.config/volumeicon/volumeicon
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/accels.scm b/linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/accels.scm
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/accels.scm
rename to linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/accels.scm
diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/terminalrc b/linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/terminalrc
similarity index 100%
rename from linux-live/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/terminalrc
rename to linux-live/modules/04-xfce-apps/rootcopy/root/.config/xfce4/terminal/terminalrc
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-documents.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-documents.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-download.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-download.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-music.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-music.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-pictures.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-pictures.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-publicshare.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-publicshare.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-remote.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-remote.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-saved-search.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-saved-search.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-templates.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-templates.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-videos.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder-videos.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/folder.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-bookmarks.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-bookmarks.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-desktop.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-desktop.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-home.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/16x16/places/user-home.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-documents.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-documents.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-download.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-download.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-music.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-music.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-pictures.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-pictures.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-publicshare.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-publicshare.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-remote.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-remote.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-saved-search.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-saved-search.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-templates.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-templates.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-videos.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder-videos.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/folder.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-bookmarks.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-bookmarks.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-desktop.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-desktop.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-home.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/22x22/places/user-home.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-documents.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-documents.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-download.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-download.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-music.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-music.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-pictures.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-pictures.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-publicshare.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-publicshare.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-remote.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-remote.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-saved-search.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-saved-search.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-templates.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-templates.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-videos.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder-videos.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/folder.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-bookmarks.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-bookmarks.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-desktop.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-desktop.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-home.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/24x24/places/user-home.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-documents.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-documents.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-download.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-download.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-music.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-music.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-pictures.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-pictures.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-publicshare.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-publicshare.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-remote.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-remote.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-saved-search.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-saved-search.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-templates.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-templates.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-videos.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder-videos.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/folder.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-bookmarks.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-bookmarks.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-desktop.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-desktop.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-home.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/32x32/places/user-home.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-documents.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-documents.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-documents.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-download.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-download.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-download.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-music.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-music.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-music.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-pictures.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-pictures.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-pictures.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-publicshare.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-publicshare.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-publicshare.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-remote.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-remote.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-remote.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-saved-search.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-saved-search.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-saved-search.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-templates.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-templates.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-templates.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-videos.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-videos.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder-videos.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/folder.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-bookmarks.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-bookmarks.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-bookmarks.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-desktop.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-desktop.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-desktop.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-home.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-home.png
new file mode 100644
index 0000000..154bb9e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/gnome/48x48/places/user-home.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/calculator.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/calculator.png
new file mode 100644
index 0000000..70a03aa
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/calculator.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/editor.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/editor.png
new file mode 100644
index 0000000..bfc6460
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/editor.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png
new file mode 100644
index 0000000..33f9b0a
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/128x128/apps/system-file-manager.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png
new file mode 100644
index 0000000..32d82e5
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/16x16/apps/system-file-manager.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png
new file mode 100644
index 0000000..1a94a20
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/24x24/apps/system-file-manager.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png
new file mode 100644
index 0000000..c211019
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/32x32/apps/system-file-manager.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png
new file mode 100644
index 0000000..8b45025
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/48x48/apps/system-file-manager.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/calculator.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/calculator.png
new file mode 100644
index 0000000..768b352
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/calculator.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png
new file mode 100644
index 0000000..4d7c2c7
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/medit.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/medit.png
new file mode 100644
index 0000000..d7689e0
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/medit.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png
new file mode 100644
index 0000000..aca5c1e
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/system-file-manager.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png
new file mode 100644
index 0000000..f3b5041
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png differ
diff --git a/linux-live/modules/04-xfce-apps/rootcopy/usr/share/pixmaps/qalculate.png b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/pixmaps/qalculate.png
new file mode 100644
index 0000000..274d1fa
Binary files /dev/null and b/linux-live/modules/04-xfce-apps/rootcopy/usr/share/pixmaps/qalculate.png differ
diff --git a/linux-live/modules/06-langpack-ru/install b/linux-live/modules/06-langpack-ru/install
deleted file mode 100644
index 4d0c715..0000000
--- a/linux-live/modules/06-langpack-ru/install
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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")")"
-
-#export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true
-
-debconf-set-selections preseed.txt
-
-# install packages
-if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.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 $APT_OPTIONS2 \
- $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
-
-dpkg-reconfigure locales >>$OUTPUT 2>&1
-dpkg-reconfigure keyboard-configuration >>$OUTPUT 2>&1
-dpkg-reconfigure tzdata >>$OUTPUT 2>&1
\ No newline at end of file
diff --git a/linux-live/modules/06-langpack-ru/minimal.list b/linux-live/modules/06-langpack-ru/minimal.list
deleted file mode 100644
index 9a43ff6..0000000
--- a/linux-live/modules/06-langpack-ru/minimal.list
+++ /dev/null
@@ -1 +0,0 @@
-locales
\ No newline at end of file
diff --git a/linux-live/modules/06-langpack-ru/postinstall b/linux-live/modules/06-langpack-ru/postinstall
deleted file mode 100644
index a407c94..0000000
--- a/linux-live/modules/06-langpack-ru/postinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
diff --git a/linux-live/modules/06-langpack-ru/preseed.txt b/linux-live/modules/06-langpack-ru/preseed.txt
deleted file mode 100644
index 2a07996..0000000
--- a/linux-live/modules/06-langpack-ru/preseed.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# Keep the current keyboard layout in the configuration file?
-keyboard-configuration keyboard-configuration/unsupported_config_layout boolean true
-# Time zone:
-tzdata tzdata/Zones/Europe select Moscow
-# Keyboard layout:
-keyboard-configuration keyboard-configuration/variant select Russian
-# Default locale for the system environment:
-locales locales/default_environment_locale select ru_RU.UTF-8
-# Method for toggling between national and Latin mode:
-keyboard-configuration keyboard-configuration/toggle select Alt+Shift
-# Method for temporarily toggling between national and Latin input:
-keyboard-configuration keyboard-configuration/switch select No temporary switch
-# Locales to be generated:
-locales locales/locales_to_be_generated multiselect ru_RU.UTF-8 UTF-8
-# Keep default keyboard layout ()?
-keyboard-configuration keyboard-configuration/unsupported_layout boolean true
-# Use Control+Alt+Backspace to terminate the X server?
-keyboard-configuration keyboard-configuration/ctrl_alt_bksp boolean false
-# Keep default keyboard options ()?
-keyboard-configuration keyboard-configuration/unsupported_options boolean true
-# for internal use
-keyboard-configuration keyboard-configuration/layoutcode string us,ru
-# for internal use
-keyboard-configuration keyboard-configuration/store_defaults_in_debconf_db boolean true
-# Geographic area:
-#tzdata tzdata/Areas select Europe
-# Keyboard model:
-keyboard-configuration keyboard-configuration/model select Generic 105-key PC (intl.)
-# for internal use
-keyboard-configuration keyboard-configuration/optionscode string grp:alt_shift_toggle,grp_led:scroll
-# Key to function as AltGr:
-keyboard-configuration keyboard-configuration/altgr select The default for the keyboard layout
-# Keymap to use:
-keyboard-configuration keyboard-configuration/xkb-keymap select us
-# Compose key:
-keyboard-configuration keyboard-configuration/compose select No compose key
-# Keep current keyboard options in the configuration file?
-keyboard-configuration keyboard-configuration/unsupported_config_options boolean true
-# Country of origin for the keyboard:
-keyboard-configuration keyboard-configuration/layout select Russian
-# for internal use
-keyboard-configuration keyboard-configuration/modelcode string pc105
\ No newline at end of file
diff --git a/linux-live/modules/06-langpack-ru/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml b/linux-live/modules/06-langpack-ru/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
deleted file mode 100644
index dd94eae..0000000
--- a/linux-live/modules/06-langpack-ru/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/linux-live/modules/06-langpack-ru/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml b/linux-live/modules/06-langpack-ru/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
deleted file mode 100644
index dd94eae..0000000
--- a/linux-live/modules/06-langpack-ru/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/linux-live/modules/06-langpack-ru/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml b/linux-live/modules/06-langpack-ru/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
deleted file mode 100644
index dd94eae..0000000
--- a/linux-live/modules/06-langpack-ru/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/keyboard-layout.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/linux-live/modules/06-langpack-ru/standard.list b/linux-live/modules/06-langpack-ru/standard.list
deleted file mode 100644
index 9a43ff6..0000000
--- a/linux-live/modules/06-langpack-ru/standard.list
+++ /dev/null
@@ -1 +0,0 @@
-locales
\ No newline at end of file
diff --git a/minios-modules/etc/bash_completion.d/minios-autoinstall b/minios-modules/etc/bash_completion.d/minios-autoinstall
deleted file mode 100644
index 83cf917..0000000
--- a/minios-modules/etc/bash_completion.d/minios-autoinstall
+++ /dev/null
@@ -1,2 +0,0 @@
-#/usr/bin/env bash
-complete -W "build_modules repack_system" minios-install
diff --git a/minios-modules/etc/bash_completion.d/minios-install b/minios-modules/etc/bash_completion.d/minios-install
deleted file mode 100644
index 83cf917..0000000
--- a/minios-modules/etc/bash_completion.d/minios-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#/usr/bin/env bash
-complete -W "build_modules repack_system" minios-install
diff --git a/minios-modules/etc/minios/config b/minios-modules/etc/minios/config
deleted file mode 100644
index 34771e7..0000000
--- a/minios-modules/etc/minios/config
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-# This is a config file for MiniOS-Live build script and Linux Live Kit boot script.
-# You shouldn't need to change anything expect LIVEKITNAME PACKAGE_VARIANT OUTPUT COMP_TYPE
-
-# Live Kit Name. Defaults to 'linux';
-# This will be the name of the directory created on your CD/USB, which
-# will contain everything including boot files and such.
-# For example, Slax changes it to 'slax'
-# Must not contain any spaces.
-# If you change it, you must run ./tools/isolinux.bin.update script
-# in order to update isolinux.bin for CD booting.
-# If you do not need booting from CD (eg you're booting only from USB)
-# then you can ignore recompiling isolinux.bin, just rename LIVEKITNAME
-# and you're done.
-LIVEKITNAME="minios"
-
-# Sets the name of the iso
-SYSTEMNAME="MiniOS"
-
-DISTRIBUTION_TYPE="debian"
-
-DISTRIBUTION="bullseye"
-
-DISTRIBUTION_ARCH="amd64"
-
-PACKAGE_VARIANT="standard"
-
-LIVE_TYPE="livekit"
-
-# default is output to log. you can use OUTPUT="/dev/stdout" if you want to route events to standard output.
-#OUTPUT="/dev/stdout"
-OUTPUT="/dev/null"
-
-DEBIAN_FRONTEND_TYPE="noninteractive"
-
-APT_CMD="apt-get"
-
-APT_OPTIONS="-y"
-
-APT_OPTIONS2="--no-install-recommends"
-
-UNION_BUILD_TYPE="overlayfs"
-
-#
-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
-# out of the box.
-VMLINUZ="/vmlinuz"
-
-# Kernel version. Change it to "3.2.28" for example, if you are building
-# Live Kit with a different kernel than the one you are actually running
-if [ -f /usr/bin/dpkg-query ] 2>/dev/null; then
- KERNEL=$(dpkg-query -W -f='${binary:Package}\n' linux-image-* | head -n 1 | sed 's/linux-image-//')
-else
- KERNEL=$(uname -r)
-fi
-
-# List of directories for root filesystem
-# No subdirectories are allowed, no slashes,
-# so You can't use /var/tmp here for example
-# Exclude directories like proc sys tmp
-MKMOD="bin etc home lib lib64 opt root sbin srv usr var"
-
-# If you require network support in initrd, for example to boot over
-# PXE or to load data using 'from' boot parameter from a http server,
-# you will need network modules included in your initrd.
-# This is disabled by default since most people won't need it.
-# To enable, set to true
-NETWORK=true
-
-# Temporary directory to store livekit filesystem
-LIVEKITDATA=/tmp/$LIVEKITNAME-data-$$
-
-# Bundle extension, for example 'sb' for .sb extension
-BEXT=sb
-
-# Directory with kernel .ko modules, can be different in some distros
-LMK="lib/modules/$KERNEL"
diff --git a/minios-modules/modulelib b/minios-modules/modulelib
new file mode 100644
index 0000000..8e49f8b
--- /dev/null
+++ b/minios-modules/modulelib
@@ -0,0 +1,2057 @@
+#!/bin/bash
+
+# Functions library :: for install scripts
+# Author: crims0n.
+#
+
+# =================================================================
+# =================================================================
+# ========================= VARIABLES =============================
+# =================================================================
+# =================================================================
+
+function common_variables() {
+ #
+ CONTAINER_TYPE="0"
+ set +u
+ if [ -z $container ]; then
+ container=""
+ fi
+ set -u
+ : 'if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
+ OUTPUT="/dev/stdout"
+ #CONTAINER="docker"
+ fi'
+ if [ -f /.dockerenv ] || [ "$container" = "podman" ] && [ ! -d /opt/minios-live ] && [ ! -f /.minios-live-container ]; then
+ CONTAINER_TYPE="1"
+ fi
+ if [[ (-f /.dockerenv || "$container" = "podman") && (-d /opt/minios-live || -f /.minios-live-container) ]]; then
+ CONTAINER_TYPE="2"
+ fi
+
+ if [ $DISTRIBUTION_ARCH = "amd64" ]; then
+ KERNEL_ARCH="amd64"
+ #PACKAGE_VARIANT="standard"
+ elif [ $DISTRIBUTION_ARCH = "i386" ]; then
+ KERNEL_ARCH="686-pae"
+ PACKAGE_VARIANT="minimal"
+ elif [ $DISTRIBUTION_ARCH = "arm64" ]; then
+ KERNEL_ARCH="arm64"
+ fi
+}
+
+# =================================================================
+# =================================================================
+# ===================== COMMON FUNCTIONS ==========================
+# =================================================================
+# =================================================================
+
+function current_process() {
+ echo -e "${LIGHTYELLOW}=====> running ${CYAN}${CMD[ii]}${ENDCOLOUR}${LIGHTYELLOW} ...${ENDCOLOUR}"
+}
+
+# =================================================================
+# beautiful console
+# красивая консоль
+# =================================================================
+function console_colours() {
+ RED="\e[31m"
+ GREEN="\e[32m"
+ YELLOW="\e[33m"
+ BLUE="\e[34m"
+ MAGENTA="\e[35m"
+ CYAN="\e[36m"
+ LIGHTGRAY="\e[37m"
+ DARKGRAY="\e[90m"
+ LIGHTRED="\e[91m"
+ LIGHTGREEN="\e[92m"
+ LIGHTYELLOW="\e[93m"
+ LIGHTBLUE="\e[94m"
+ LIGHTMAGENTA="\e[95m"
+ LIGHTCYAN="\e[96m"
+ BOLD="\e[1m"
+ DIM="\e[2m"
+ UNDERLINED="\e[4m"
+ BLINK="\e[5m"
+ REVERSE="\e[7m"
+ HIDDEN="\e[8m"
+ ENDCOLOUR="\e[0m"
+}
+
+# =================================================================
+# help functions
+# функции помощи
+# =================================================================
+function help() {
+ # if $1 is set, use $1 as headline message in help()
+ if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
+ if [ -z ${1+x} ]; then
+ echo -e "${LIGHTYELLOW}Этот скрипт собирает загружаемый ISO образ $SYSTEMNAME.${ENDCOLOUR}"
+ echo -e
+ else
+ echo -e $1
+ echo
+ fi
+ echo -e "Поддерживаемые команды : ${CYAN}${CMD[*]}${ENDCOLOUR}"
+ echo -e
+ echo -e "Синтаксис: ${MAGENTA}$0${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
+ if [ -L /usr/bin/$LIVEKITNAME-install ] && [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
+ echo -e "\t${CYAN}$LIVEKITNAME-install${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
+ fi
+ echo -e "\tзапуск от start_cmd до end_cmd"
+ echo -e "\tесли start_cmd опущен, выполняются все команды, начиная с первой"
+ echo -e "\tесли end_cmd опущен, выполняются все команды до последней"
+ echo -e "\tвведите одну команду, чтобы запустить определенную команду"
+ echo -e "\tвведите '-' как единственный аргумент для запуска всех команд"
+ echo -e "\t"
+ echo -e "\tПримеры:${LIGHTYELLOW}$0 build_bootstrap - build_chroot${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 - build_chroot${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 build_bootstrap -${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 build_iso${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 -${ENDCOLOUR}"
+ exit 0
+ else
+ if [ -z ${1+x} ]; then
+ echo -e "${LIGHTYELLOW}This script builds bootable $SYSTEMNAME ISO image.${ENDCOLOUR}"
+ echo -e
+ else
+ echo -e $1
+ echo
+ fi
+ echo -e "Supported commands : ${CYAN}${CMD[*]}${ENDCOLOUR}"
+ echo -e
+ echo -e "Syntax: ${MAGENTA}$0${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
+ if [ -L /usr/bin/$LIVEKITNAME-install ] && [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
+ echo -e "\t${CYAN}$LIVEKITNAME-install${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
+ fi
+ echo -e "\trun from start_cmd to end_cmd"
+ echo -e "\tif start_cmd is omitted, start from first command"
+ echo -e "\tif end_cmd is omitted, end with last command"
+ echo -e "\tenter single cmd to run the specific command"
+ echo -e "\tenter '-' as only argument to run all commands"
+ echo -e "\t"
+ echo -e "\tExamples:${LIGHTYELLOW}$0 build_bootstrap - build_chroot${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 - build_chroot${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 build_bootstrap -${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 build_iso${ENDCOLOUR}"
+ echo -e "\t\t${LIGHTYELLOW}$0 -${ENDCOLOUR}"
+ exit 0
+ fi
+}
+
+# =================================================================
+# parsing input commands
+# разбор входных команд
+# =================================================================
+function find_index() {
+ local ret
+ local i
+ for ((i = 0; i < ${#CMD[*]}; i++)); do
+ if [ "${CMD[i]}" == "$1" ]; then
+ index=$i
+ return
+ fi
+ done
+ help "Command not found : $1"
+}
+
+# =================================================================
+# creating a symbolic link to the executable file for using
+# autocompletion on the command line
+# создание символической ссылки на исполняемый файл для
+# использования автодополнения в командной строке
+# =================================================================
+function create_livekitname_install_symlink() {
+ if [ -L /usr/bin/$LIVEKITNAME-install ]; then
+ if [ "$(readlink /usr/bin/$LIVEKITNAME-install)" != "$SCRIPT_DIR/install" ]; then
+ rm -f /usr/bin/$LIVEKITNAME-install
+ ln -s $SCRIPT_DIR/install /usr/bin/$LIVEKITNAME-install
+ if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
+ echo -e "Символическая ссылка ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} была обновлена."
+ echo -e "Теперь она указывает на ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
+ else
+ echo -e "The ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} symbolic link has been updated."
+ echo -e "It now points to ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
+ fi
+ fi
+ if [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
+ if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
+ echo -e "Вы можете использовать команду ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} для запуска этой программы."
+ else
+ echo -e "You can use the ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} command to run this program."
+ fi
+ fi
+ else
+ ln -s $SCRIPT_DIR/install /usr/bin/$LIVEKITNAME-install
+ if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
+ echo -e "Символическая ссылка ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} была добавлена"
+ echo -e "для ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
+
+ else
+ echo -e "The ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} symbolic link has been added"
+ echo -e "for ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
+ fi
+ fi
+}
+
+# =================================================================
+# creating autocompletion on the command line
+# создание автодополнения в командной строке
+# =================================================================
+function create_completion() {
+ if [ -d /etc/bash_completion.d ]; then
+ if [ ! -f /etc/bash_completion.d/$LIVEKITNAME-install ] || ! grep "${CMD[*]}" /etc/bash_completion.d/$LIVEKITNAME-install >>$OUTPUT; then
+ cat </etc/bash_completion.d/$LIVEKITNAME-install
+#/usr/bin/env bash
+complete -W "${CMD[*]}" $LIVEKITNAME-install
+EOF
+ fi
+ if [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
+ if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
+ echo -e "Дополнение команд работает только при использовании команды ${CYAN}$LIVEKITNAME-install${ENDCOLOUR}."
+ echo -e
+ else
+ echo -e "Command completion only works when using the ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} command."
+ echo -e
+ fi
+ fi
+ fi
+}
+
+# =================================================================
+# only allow 'root' to run the script
+# разрешаем запуск скрипта только пользователю 'root'
+# =================================================================
+
+function allow_root_only() {
+ if [ $(id -u) -ne 0 ]; then
+ echo -e "${BOLD}${RED}This script should be run as 'root'!${ENDCOLOUR}"
+ exit 1
+ fi
+
+ export HOME=/root
+ export LC_ALL=C
+}
+
+# =================================================================
+# check that we are inside chroot
+# проверяем, что мы внутри chroot
+# =================================================================
+
+function check_is_in_chroot() {
+ if [ $(stat -c %i /)="2" ]; then
+ echo -e "${BOLD}${RED}This script should be run inside chroot only!${ENDCOLOUR}"
+ exit 1
+ fi
+}
+
+# =================================================================
+# check if filesystems are unmounted inside chroot
+# проверяем, размонтированы ли файловые системы внутри chroot
+# =================================================================
+
+function check_mounted() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if grep -qs "$BUILD_DIR/dev" /proc/mounts || grep -qs "$BUILD_DIR/run" /proc/mounts || grep -qs "$BUILD_DIR/proc" /proc/mounts || grep -qs "$BUILD_DIR/sys" /proc/mounts || grep -qs "$BUILD_DIR/dev/pts" /proc/mounts || grep -qs "$BUILD_DIR/tmp" /proc/mounts; then
+ echo -e "${BOLD}${LIGHTYELLOW}Сhroot contains mounted filesystems.${ENDCOLOUR}"
+ if [ "$UNATTENDED" = "1" ]; then
+ chroot_umount_fs
+ else
+ read -r -p "$(echo -e ""Do you want to ${GREEN}unmount them${ENDCOLOUR}? [${BOLD}${GREEN}Y${ENDCOLOUR}/n])" response
+ response=${response,,}
+ if [[ "$response" =~ ^(no|n)$ ]]; then
+ exit 1
+ else
+ chroot_umount_fs
+ fi
+ fi
+ fi
+}
+
+# =================================================================
+# check if the folder where the installation will be performed is empty
+# проверяем, пуста ли папка, в которую будет производиться установка
+# =================================================================
+
+function check_build_dir() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ "$UNATTENDED" = "1" ]; then
+ #echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}"
+ BUILD_DIR="/build/$DISTRIBUTION"
+ echo -e "The working directory is ${MAGENTA}$BUILD_DIR${ENDCOLOUR}."
+ if [ "$(ls -A $BUILD_DIR)" != "" ]; then
+ cleanup
+ check_mounted
+ fi
+ else
+ # ▼ должно быть только перенаправление ошибки!
+ if [ "$(ls -A $BUILD_DIR)" != "" ]; then
+ echo -e "${MAGENTA}$BUILD_DIR${ENDCOLOUR} is not empty."
+ cleanup
+ check_mounted
+ if [ ! -d "$BUILD_DIR" ]; then
+ mkdir -p $BUILD_DIR
+ fi
+ BUILD_DIR="$(
+ cd $BUILD_DIR
+ pwd
+ )"
+ echo $BUILD_DIR >$SCRIPT_DIR/.build_dir && chmod 644 $SCRIPT_DIR/.build_dir
+ echo -e "The working directory is ${MAGENTA}$BUILD_DIR${ENDCOLOUR}."
+ else
+ mkdir -p $BUILD_DIR
+ check_mounted
+ BUILD_DIR="$(
+ cd $BUILD_DIR
+ pwd
+ )"
+ echo $BUILD_DIR >$SCRIPT_DIR/.build_dir && chmod 644 $SCRIPT_DIR/.build_dir
+ echo -e "The working directory is ${MAGENTA}$BUILD_DIR${ENDCOLOUR}."
+ fi
+ fi
+}
+
+# =================================================================
+# configure the build folder
+# настраиваем папку для сборки
+# =================================================================
+
+function setup_build_dir() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ "$UNATTENDED" = "1" ] && [ "$BUILD_DIR" = "" ]; then
+ BUILD_DIR="/build/$DISTRIBUTION"
+ check_build_dir
+ else
+ if [ "$BUILD_DIR" = "" ]; then
+ if [ ! -f "$SCRIPT_DIR/.build_dir" ]; then
+ echo "Enter the address of the working directory where we will build the system"
+ read -r -p "$(echo -e "(Default is ${MAGENTA}$PARENT_DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response
+ BUILD_DIR=${response,,}
+ if [ "$BUILD_DIR" = "" ]; then
+ BUILD_DIR=$PARENT_DIR/$DISTRIBUTION
+ fi
+ check_build_dir
+ else
+ LAST_BUILD_DIR=$(cat "$SCRIPT_DIR/.build_dir")
+ echo -e "Last time you used the build directory ${MAGENTA}$LAST_BUILD_DIR${ENDCOLOUR}."
+ read -r -p "$(echo -e ""Do you want to use it again? [${BOLD}${GREEN}Y${ENDCOLOUR}/n])" response
+ response=${response,,}
+ if [[ "$response" =~ ^(no|n)$ ]]; then
+ echo "Enter the address of the working directory where we will build the system"
+ read -r -p "$(echo -e "(Default is ${MAGENTA}$PARENT_DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response
+ BUILD_DIR=${response,,}
+ if [ "$BUILD_DIR" = "" ]; then
+ BUILD_DIR=$PARENT_DIR/$DISTRIBUTION
+ fi
+ check_build_dir
+ else
+ BUILD_DIR="$LAST_BUILD_DIR"
+ check_build_dir
+ fi
+ fi
+ fi
+ fi
+}
+
+# =================================================================
+# cleaning the build folder
+# очистка папки для сборки
+# =================================================================
+function cleanup() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ "${CMD[ii]}" = "setup_host" ] || [ "${CMD[ii]}" = "build_bootstrap" ] || [ "${CMD[ii]}" = "build_chroot" ]; then
+ if [ "$UNATTENDED" = "1" ]; then
+ check_mounted
+ rm -rf $BUILD_DIR
+ if [ -d "$BUILD_DIR" ]; then
+ cleanup
+ fi
+ else
+ read -r -p "$(echo -e ""Do you want to ${BOLD}${RED}completely remove content${ENDCOLOUR} of ${MAGENTA}$BUILD_DIR${ENDCOLOUR}? [y/${BOLD}${GREEN}N${ENDCOLOUR}])" response
+ response=${response,,}
+ if [[ "$response" =~ ^(yes|y)$ ]]; then
+ check_mounted
+ rm -rf $BUILD_DIR
+ if [ -d "$BUILD_DIR" ]; then
+ cleanup
+ fi
+ else
+ echo -e "${MAGENTA}$BUILD_DIR${ENDCOLOUR} should be empty to continue."
+ exit 1
+ fi
+ fi
+ fi
+}
+
+# =================================================================
+# mount filesystems inside chroot
+# монтируем файловые системы внутри chroot
+# =================================================================
+
+function chroot_mount_fs() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+
+ check_mounted
+
+ mount --bind /dev $BUILD_DIR/dev
+ mount --bind /run $BUILD_DIR/run
+ mount none -t proc $BUILD_DIR/proc
+ mount none -t sysfs $BUILD_DIR/sys
+ mount none -t devpts $BUILD_DIR/dev/pts
+ mount none -t tmpfs $BUILD_DIR/tmp
+}
+
+# =================================================================
+# unmount filesystems inside chroot
+# размонтируем файловые системы внутри chroot
+# =================================================================
+
+function chroot_umount_fs() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+
+ set +e
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ umount $BUILD_DIR/proc
+ umount $BUILD_DIR/sys
+ umount $BUILD_DIR/dev/pts
+ umount $BUILD_DIR/tmp
+ umount $BUILD_DIR/dev
+ umount $BUILD_DIR/run
+ else
+ umount $BUILD_DIR/proc >>$OUTPUT 2>&1
+ umount $BUILD_DIR/sys >>$OUTPUT 2>&1
+ umount $BUILD_DIR/dev/pts >>$OUTPUT 2>&1
+ umount $BUILD_DIR/tmp >>$OUTPUT 2>&1
+ umount $BUILD_DIR/dev >>$OUTPUT 2>&1
+ umount $BUILD_DIR/run >>$OUTPUT 2>&1
+ fi
+ set -e
+
+ check_mounted
+}
+
+# =================================================================
+# delete the log
+# удаляем лог
+# =================================================================
+function remove_log_file() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ -f $LOGPATH/$LIVEKITNAME.log ]; then
+ rm -f $LOGPATH/$LIVEKITNAME.log
+ fi
+ if [ -f $BUILD_DIR/$LIVEKITNAME.log ]; then
+ rm -f $BUILD_DIR/$LIVEKITNAME.log
+ fi
+}
+
+# =================================================================
+# creating a backup of scripts (to run you need to set the variable
+# CREATE_BACKUP = "1" in linux-live/buildconfig)
+# создание бэкапа скриптов (для запуска необходимо установить
+# переменную CREATE_BACKUP="1" в linux-live/buildconfig)
+# =================================================================
+function create_backup() {
+ if [ $CREATE_BACKUP = "1" ]; then
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ ! -f $SCRIPT_DIR/.script_version ]; then
+ cat "1" >$SCRIPT_DIR/.script_version >>$OUTPUT 2>&1
+ chmod 644 $SCRIPT_DIR/.script_version >>$OUTPUT 2>&1
+ fi
+ DATE=$(date +%Y%m%d_%H%M)
+ CHANGED="0"
+ rm -rf $SCRIPT_DIR/iso >>$OUTPUT 2>&1
+ rm -f $SCRIPT_DIR/.build_dir >>$OUTPUT 2>&1
+ rm -f $SCRIPT_DIR/*.log >>$OUTPUT 2>&1
+ if [ ! -d $PARENT_DIR/minios-live-current ]; then
+ CHANGED="1"
+ mkdir -p $PARENT_DIR/minios-live-current
+ (cd $SCRIPT_DIR && cp --parents -afr * $PARENT_DIR/minios-live-current)
+ else
+ for file in $(find $SCRIPT_DIR -path $SCRIPT_DIR/.git -prune -false -o -type f | sed "s,$SCRIPT_DIR/,,g" | sed "s,.script_version,,g"); do
+ if ! cmp $SCRIPT_DIR/$file $PARENT_DIR/minios-live-current/$file >>$OUTPUT 2>&1; then
+ CHANGED="1"
+ echo -e "$file has been modified since last backup." >>$OUTPUT 2>&1
+ echo -e "Copying $SCRIPT_DIR/$file to $PARENT_DIR/minios-live-current/$file..." >>$OUTPUT 2>&1
+ cp -f "$SCRIPT_DIR/$file" "$PARENT_DIR/minios-live-current/$file" >>$OUTPUT 2>&1
+ fi
+ done
+ fi
+ if [ $CHANGED = "1" ]; then
+ SCRIPT_VERSION=$(cat $SCRIPT_DIR/.script_version)
+ echo $(($SCRIPT_VERSION + 1)) >$SCRIPT_DIR/.script_version
+ echo $(($SCRIPT_VERSION + 1)) >$PARENT_DIR/minios-live-current/.script_version
+ cd $SCRIPT_DIR >>$OUTPUT 2>&1
+ rm -f $PARENT_DIR/minios-live-current.tar.gz
+ tar -czf $PARENT_DIR/minios-live-current.tar.gz ./ >>$OUTPUT 2>&1
+ cp $PARENT_DIR/minios-live-current.tar.gz $PARENT_DIR/minios-live-v$SCRIPT_VERSION-$DATE.tar.gz >>$OUTPUT 2>&1
+ fi
+ fi
+}
+
+# =================================================================
+# Displaying information about the start of the build for a more
+# convenient search in the logs
+# Отображение информации о старте сборки для более удобного поиска
+# в логах
+# =================================================================
+function new_run() {
+ DATE=$(date +"%Y.%m.%d %H:%M")
+ echo ""
+ echo "=================================================================" >>$OUTPUT 2>&1
+ echo "=================================================================" >>$OUTPUT 2>&1
+ echo "============================ NEW RUN ============================" >>$OUTPUT 2>&1
+ echo "======================== $DATE =======================" >>$OUTPUT 2>&1
+ echo "=================================================================" >>$OUTPUT 2>&1
+ echo "======= If during the installation you get an error that ========" >>$OUTPUT 2>&1
+ echo "=== /dev/stdout is not available, try using a bionic or xenial ==" >>$OUTPUT 2>&1
+ echo "================= based container to install. ===================" >>$OUTPUT 2>&1
+ echo "=================================================================" >>$OUTPUT 2>&1
+ echo "=================================================================" >>$OUTPUT 2>&1
+ echo ""
+}
+
+# =================================================================
+# =================================================================
+# ====================== HOST FUNCTIONS ===========================
+# =================================================================
+# =================================================================
+
+# =================================================================
+# Creating a $PACKAGE_VARIANT list from a template
+# Создание списка пакетов из шаблона
+# =================================================================
+function create_apt_list() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ ! -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list ] && [ $DISTRIBUTION_TYPE != "debian" ]; then
+ cp -f $SCRIPT_DIR/linux-live/aptsources/sources.list $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list
+ sed -i "s,distro,$DISTRIBUTION,g" $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list
+ sed -i "s,http://ru.archive.ubuntu.com/ubuntu,$DISTRIBUTION_URL,g" $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list
+ fi
+}
+
+# =================================================================
+# Installing the base system
+# Установка базовой системы
+# =================================================================
+function build_bootstrap() {
+ current_process
+
+ if [ $CONTAINER_TYPE = "1" ]; then
+ if [ ! -f /.minios-live ]; then
+ setup_host
+ fi
+ fi
+ if [ $DISTRIBUTION_TYPE != "debian" ]; then
+ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+ debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $BUILD_DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
+ else
+ sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
+ debootstrap --arch=$DISTRIBUTION_ARCH $DISTRIBUTION $BUILD_DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function copy_build_scripts() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ ! -d $BUILD_DIR/linux-live ]; then
+ mkdir -p $BUILD_DIR/linux-live
+ (cd $SCRIPT_DIR/linux-live && cp --parents -afr * $BUILD_DIR/linux-live)
+ else
+ find $SCRIPT_DIR/linux-live -type f -print0 | sed "s,$SCRIPT_DIR/linux-live/,,g" | while IFS= read -r -d '' file; do
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ if ! cmp $SCRIPT_DIR/linux-live/"$file" $BUILD_DIR/linux-live/"$file"; then
+ echo -e "$file has been modified since last build run."
+ echo -e "Copying $SCRIPT_DIR/linux-live/$file to $BUILD_DIR/linux-live/$file..."
+ cp -f $SCRIPT_DIR/linux-live/"$file" $BUILD_DIR/linux-live/"$file"
+ fi
+ else
+ if ! cmp $SCRIPT_DIR/linux-live/"$file" $BUILD_DIR/linux-live/"$file" >>$OUTPUT 2>&1; then
+ echo -e "$file has been modified since last build run." >>$OUTPUT 2>&1
+ echo -e "Copying $SCRIPT_DIR/linux-live/$file to $BUILD_DIR/linux-live/$file..." >>$OUTPUT 2>&1
+ cp -f $SCRIPT_DIR/linux-live/"$file" $BUILD_DIR/linux-live/"$file" >>$OUTPUT 2>&1
+ fi
+ fi
+ done
+ fi
+
+ #chmod +x $BUILD_DIR/linux-live/build
+ chmod +x $BUILD_DIR/linux-live/install_chroot
+
+ if [ "$DEV_SYSTEM" = "1" ]; then
+ if [ ! -d $BUILD_DIR/opt/minios-live ]; then
+ mkdir -p $BUILD_DIR/opt/minios-live
+ (cd $SCRIPT_DIR && cp --parents -afr * $BUILD_DIR/opt/minios-live)
+ else
+ find $SCRIPT_DIR/linux-live -type f -print0 | sed "s,$SCRIPT_DIR/linux-live/,,g" | while IFS= read -r -d '' file; do
+ if ! cmp $SCRIPT_DIR/"$file" $BUILD_DIR/opt/minios-live/"$file" >>$OUTPUT 2>&1; then
+ echo -e "$file has been modified since last build run." >>$OUTPUT 2>&1
+ echo -e "Copying $SCRIPT_DIR/$file to $BUILD_DIR/opt/minios-live/$file..." >>$OUTPUT 2>&1
+ cp -f $SCRIPT_DIR/"$file" $BUILD_DIR/opt/minios-live/"$file" >>$OUTPUT 2>&1
+ fi
+ done
+ fi
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function build_chroot() {
+ current_process
+
+ if [ $CONTAINER_TYPE = "1" ]; then
+ if [ ! -f /.minios-live ]; then
+ setup_host
+ fi
+ fi
+
+ chroot_mount_fs
+
+ copy_build_scripts
+
+ create_apt_list
+
+ if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f /$LIVEKITNAME.log ]; then
+ mv -f /$LIVEKITNAME.log $BUILD_DIR/$LIVEKITNAME.log
+ fi
+ if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f $BUILD_DIR/$LIVEKITNAME.log ]; then
+ echo "===========================================" >>$BUILD_DIR/$LIVEKITNAME.log 2>&1
+ echo "===========================================" >>$BUILD_DIR/$LIVEKITNAME.log 2>&1
+ echo "=============== CHROOT LOG ================" >>$BUILD_DIR/$LIVEKITNAME.log 2>&1
+ echo "===========================================" >>$BUILD_DIR/$LIVEKITNAME.log 2>&1
+ echo "===========================================" >>$BUILD_DIR/$LIVEKITNAME.log 2>&1
+ fi
+
+ cp -f $SCRIPT_DIR/linux-live/aptsources/$DISTRIBUTION.list $BUILD_DIR/etc/apt/sources.list
+
+ if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
+ chroot $BUILD_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE /linux-live/install_chroot -
+ else
+ chroot $BUILD_DIR /linux-live/install_chroot -
+ fi
+
+ chroot_umount_fs
+
+ if [ "$OUTPUT"="$LOGPATH/$LIVEKITNAME.log" ] && [ -f $BUILD_DIR/$LIVEKITNAME.log ]; then
+ mv -f $BUILD_DIR/$LIVEKITNAME.log $SCRIPT_DIR/$LIVEKITNAME.log
+ if [ -f $SCRIPT_DIR/$LIVEKITNAME.log ]; then
+ echo -e "Installation log was saved to ${MAGENTA}$SCRIPT_DIR/$LIVEKITNAME.log${ENDCOLOUR}"
+ fi
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function build_live() {
+ current_process
+
+ if [ $CONTAINER_TYPE = "1" ]; then
+ if [ ! -f /.minios-live ]; then
+ setup_host
+ fi
+ fi
+
+ remove_log_file
+
+ copy_build_scripts
+
+ check_build_dir
+
+ #(cd /linux-live/rootcopy && cp --parents -afr * /)
+
+ chroot $BUILD_DIR mount none -t proc /proc
+ chroot $BUILD_DIR /linux-live/initrfs
+ chroot $BUILD_DIR umount /proc
+
+ rm -rf $PARENT_DIR/image
+ mkdir -p $PARENT_DIR/image/$LIVEKITNAME/{boot,changes,modules}
+
+ # copy kernel files
+ if [ $DISTRIBUTION_TYPE != "debian" ]; then
+ cp $BUILD_DIR/boot/vmlinuz-**-**-generic $PARENT_DIR/image/$LIVEKITNAME/boot/vmlinuz
+ else
+ cp $BUILD_DIR/boot/vmlinuz-**-**-$KERNEL_ARCH $PARENT_DIR/image/$LIVEKITNAME/boot/vmlinuz
+ fi
+ mv $BUILD_DIR/boot/initrfs.img $PARENT_DIR/image/$LIVEKITNAME/boot/initrfs.img
+
+ cp -r $SCRIPT_DIR/linux-live/bootfiles/* $PARENT_DIR/image/$LIVEKITNAME
+
+ # create compressed 01-core.sb
+ cd $BUILD_DIR
+ COREFS=""
+ for i in $MKMOD; do
+ if [ -d /$i ]; then
+ COREFS="$COREFS $i"
+ fi
+ done
+ if [ $COMP_TYPE = "zstd" ]; then
+ mksquashfs $COREFS $PARENT_DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -keep-as-directory -noappend || exit
+ else
+ mksquashfs $COREFS $PARENT_DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit
+ fi
+
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function build_iso() {
+ current_process
+
+ if [ $CONTAINER_TYPE = "1" ]; then
+ if [ ! -f /.minios-live ]; then
+ setup_host
+ fi
+ fi
+
+ check_build_dir
+
+ if [ "$UNATTENDED" = "1" ]; then
+ BUILD_DIR="/build/$DISTRIBUTION"
+ fi
+ if [ "$BUILD_DIR" = "" ]; then
+ LAST_BUILD_DIR=$(cat "$SCRIPT_DIR/.build_dir") >>$OUTPUT 2>&1
+ BUILD_DIR=$LAST_BUILD_DIR
+ fi
+
+ cd $PARENT_DIR/image
+ if [ ! -d $ISO_DIR ]; then
+ mkdir -p $ISO_DIR
+ fi
+
+ mkdir -p $ISO_DIR >>$OUTPUT 2>&1
+ VER=$SYSTEMVER
+ DATE=$(date +%Y%m%d_%H%M)
+
+ DIR=$PARENT_DIR/image
+ ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso
+
+ B="-b $LIVEKITNAME/boot/isolinux.bin -c $LIVEKITNAME/boot/isolinux.boot"
+
+ C="-no-emul-boot -boot-load-size 4 -boot-info-table"
+
+ # ▼ должно быть только перенаправление ошибки!
+
+ M=genisoimage
+
+ D=""
+
+ E=""
+
+ #VER="$SYSTEMNAME $VER"
+ VER="$SYSTEMNAME"
+
+ if [ REMOVE_OLD_ISO = "1" ]; then
+ rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-*.iso >>$OUTPUT 2>&1
+ fi
+
+ if
+ ! $M -f -r -J -l -V "$VER" -A "$VER" \
+ $B $C $D $E -o $ISO $DIR
+ then
+ exit 1
+ fi
+
+ echo ">>> $ISO created"
+
+ if [ $BUILD_TEST_ISO = "1" ]; then
+ if [ -L $ISO_DIR/$LIVEKITNAME.iso ]; then
+ rm $ISO_DIR/$LIVEKITNAME.iso
+ fi
+ if ln -s $LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then
+ echo ">>> $ISO_DIR/$LIVEKITNAME.iso created"
+ fi
+ fi
+ exit 0
+}
+
+# =================================================================
+# =================================================================
+# ====================== INSTALL FUNCTIONS ========================
+# =================================================================
+# =================================================================
+
+# =================================================================
+#
+#
+# =================================================================
+function setup_host() {
+ current_process
+
+ if [ $CONTAINER_TYPE != "2" ]; then
+ hostreq_pkg_list
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function chroot_setup_host() {
+ current_process
+
+ echo $LIVEKITNAME >/etc/hostname
+
+ prereq_pkg_list
+
+ #configure machine id
+ dbus-uuidgen >/etc/machine-id >>$OUTPUT 2>&1
+ ln -fs /etc/machine-id /var/lib/dbus/machine-id >>$OUTPUT 2>&1
+
+ # don't understand why, but multiple sources indicate this
+ dpkg-divert --local --rename --add /sbin/initctl >>$OUTPUT 2>&1
+ ln -s /bin/true /sbin/initctl >>$OUTPUT 2>&1
+
+ current_process
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function chroot_build_cleanup() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+
+ set +e
+
+ rm -f /preinstall >>$OUTPUT 2>&1
+ rm -f /install >>$OUTPUT 2>&1
+ rm -f /install2 >>$OUTPUT 2>&1
+ rm -f /cleanup >>$OUTPUT 2>&1
+ rm -f /$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
+ rm -f /postinstall >>$OUTPUT 2>&1
+ rm -rf /rootcopy >>$OUTPUT 2>&1
+ rm -rf /patches >>$OUTPUT 2>&1
+
+ rm -f /etc/fstab >>$OUTPUT 2>&1
+ rm -f /etc/mtab >>$OUTPUT 2>&1
+ rm -f /etc/apt/sources.list~ >>$OUTPUT 2>&1
+ rm -Rf /etc/systemd/system/timers.target.wants >>$OUTPUT 2>&1
+ rm -f /etc/systemd/system/multi-user.target.wants/ssh.service >>$OUTPUT 2>&1
+ rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service >>$OUTPUT 2>&1
+
+ rm -f /etc/ssh/ssh_host* >>$OUTPUT 2>&1
+
+ rm -f /var/backups/* >>$OUTPUT 2>&1
+ rm -f /var/cache/ldconfig/* >>$OUTPUT 2>&1
+ rm -f /var/cache/debconf/* >>$OUTPUT 2>&1
+ rm -f /var/cache/fontconfig/* >>$OUTPUT 2>&1
+ rm -f /var/lib/apt/extended_states >>$OUTPUT 2>&1
+ rm -f /var/lib/systemd/random-seed >>$OUTPUT 2>&1
+ rm -f /var/lib/apt/lists/deb.* >>$OUTPUT 2>&1
+ rm -Rf /root/.local/share/mc >>$OUTPUT 2>&1
+ rm -Rf /root/.cache >>$OUTPUT 2>&1
+ rm -f /root/.wget-hsts >>$OUTPUT 2>&1
+
+ rm -f /var/lib/dpkg/*-old >>$OUTPUT 2>&1
+ rm -f /var/log/* >>$OUTPUT 2>&1
+ rm -f /var/log/*/* >>$OUTPUT 2>&1
+ rm -f /var/log/*/*/* >>$OUTPUT 2>&1
+ rm -f /var/cache/apt/archives/*.deb >>$OUTPUT 2>&1
+ rm -f /var/cache/apt/*.bin >>$OUTPUT 2>&1
+ rm -f /var/cache/debconf/*-old >>$OUTPUT 2>&1
+ rm -f /var/lib/dhcp/dhclient.leases >>$OUTPUT 2>&1
+ rm -f /root/.bash_history >>$OUTPUT 2>&1
+ rm -f /root/.wget-hsts >>$OUTPUT 2>&1
+ rm -Rf /usr/share/doc/* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/info/* >>$OUTPUT 2>&1
+ rm -f /usr/share/images/fluxbox/debian-squared.jpg >>$OUTPUT 2>&1
+ rm -Rf /usr/share/fluxbox/nls/??* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/gnome/help >>$OUTPUT 2>&1
+
+ rm -Rf /usr/share/locale/?? >>$OUTPUT 2>&1
+ rm -Rf /usr/share/locale/??_* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/locale/??@* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/locale/??? >>$OUTPUT 2>&1
+ rm -Rf /usr/share/i18n/locales/*_* >>$OUTPUT 2>&1
+ rm -Rf /usr/share/man/?? >>$OUTPUT 2>&1
+ rm -Rf /usr/share/man/*_* >>$OUTPUT 2>&1
+
+ #rm -Rf /usr/share/icons/elementaryXubuntu-dark >>$OUTPUT 2>&1
+ rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
+
+ rm /usr/share/applications/compton.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/debian-uxterm.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/debian-xterm.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/htop.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/mc.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/mcedit.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/pcmanfm-desktop-pref.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/python2.7.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/python3.7.desktop >>$OUTPUT 2>&1
+ rm /usr/share/applications/vim.desktop >>$OUTPUT 2>&1
+
+ # Unzip gzipped files (man pages), so LZMA can compress 2times better.
+ # First we fix symlinks, then uncompress files
+ # $1 = search directory
+ uncompress_files() {
+ local LINK LINE
+
+ find "$1" -type l -name "*.gz" | while read LINE; do
+ LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
+ FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
+ ln -sfn "$LINK" "$FILE"
+ rm -f "$LINE"
+ done
+ find "$1" -type f -name "*.gz" | xargs -r gunzip >>$OUTPUT 2>&1
+ }
+
+ uncompress_files /etc/alternatives >>$OUTPUT 2>&1
+ uncompress_files /usr/share/man >>$OUTPUT 2>&1
+
+ # remove broken links
+ # $1 = search directory
+ remove_broken_links() {
+ find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf >>$OUTPUT 2>&1
+ }
+
+ remove_broken_links /etc/alternatives >>$OUTPUT 2>&1
+ remove_broken_links /usr/share/man >>$OUTPUT 2>&1
+
+ set -e
+
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function hostreq_pkg_list() {
+ echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}"
+ $APT_CMD update >>$OUTPUT 2>&1
+
+ if [ -f $SCRIPT_DIR/linux-live/pkglists/hostreq.list ]; then
+ $APT_CMD install -y \
+ $(grep -vE "^\s*#" $SCRIPT_DIR/linux-live/pkglists/hostreq.list | tr "\n" " ") >>$OUTPUT 2>&1
+ else
+ $APT_CMD install -y sudo debootstrap genisoimage >>$OUTPUT 2>&1
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function prereq_pkg_list() {
+ echo -e "${YELLOW}=====> installing prerequested software for chroot system ...${ENDCOLOUR}"
+
+ if [ -f $SCRIPT_DIR/pkglists/prereq.list ]; then
+ $APT_CMD update >>$OUTPUT 2>&1 &&
+ echo -e "${YELLOW}=====> upgrading chroot system ...${ENDCOLOUR}" &&
+ $APT_CMD upgrade $APT_OPTIONS >>$OUTPUT 2>&1 &&
+ echo -e "${YELLOW}=====> installing packages ...${ENDCOLOUR}" &&
+ $APT_CMD install $APT_OPTIONS \
+ $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/prereq.list | tr "\n" " ") >>$OUTPUT 2>&1
+ fi
+
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function main_pkg_list() {
+ echo -e "${YELLOW}=====> installing main packages for chroot system ...${ENDCOLOUR}"
+
+ if [ -f /linux-live/basesystem/01-core/preinstall ]; then
+ chmod +x /linux-live/basesystem/01-core/preinstall
+ /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /linux-live/basesystem/01-core/preinstall
+ fi
+ : ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy)" != "" ]; then
+ (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /)
+ fi'
+ if [ -f /linux-live/basesystem/01-core/install ]; then
+ chmod +x /linux-live/basesystem/01-core/install
+ /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ KERNEL_ARCH=$KERNEL_ARCH \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ COMP_TYPE=$COMP_TYPE \
+ /linux-live/basesystem/01-core/install
+ fi
+ if [ -f /linux-live/basesystem/01-core/postinstall ]; then
+ chmod +x /linux-live/basesystem/01-core/postinstall
+ /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /linux-live/basesystem/01-core/postinstall
+ fi
+
+ chroot_build_cleanup
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function chroot_pkg_install() {
+ current_process
+
+ main_pkg_list
+
+ # remove unused
+ $APT_CMD autoremove $APT_OPTIONS >>$OUTPUT 2>&1
+
+ # clean up apt cache
+ $APT_CMD clean $APT_OPTIONS >>$OUTPUT 2>&1
+}
+
+# =================================================================
+# No longer used, it will be cleaned after successful testing.
+# Больше не используется, будет убрано после успешного тестирования.
+# =================================================================
+function chroot_configure() {
+ current_process
+
+ echo "Set up password for user 'root'" >>$OUTPUT 2>&1
+ echo root:toor | chpasswd >>$OUTPUT 2>&1
+
+ echo "Set up user 'live'" >>$OUTPUT 2>&1
+ adduser --gecos '' live --disabled-password >>$OUTPUT 2>&1
+ echo "Set up password for user 'live'" >>$OUTPUT 2>&1
+ echo live:evil | chpasswd >>$OUTPUT 2>&1
+ addgroup live adm >>$OUTPUT 2>&1
+ addgroup live sudo >>$OUTPUT 2>&1
+ addgroup live audio >>$OUTPUT 2>&1
+ addgroup live plugdev >>$OUTPUT 2>&1
+ addgroup live users >>$OUTPUT 2>&1
+ addgroup live live >>$OUTPUT 2>&1
+
+ (cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /)
+
+ chown live:live /home/live
+ chown -R live:live /home/live
+
+ cat </etc/sudoers.d/90-minios
+# live user is default user in minios.
+# It needs passwordless sudo functionality.
+live ALL=(ALL) NOPASSWD:ALL
+EOF
+
+ if [ ! -d /etc/NetworkManager ]; then
+ echo "Enable dhclient.service autostart." >>$OUTPUT 2>&1
+ cat </usr/lib/systemd/system/dhclient.service
+[Unit]
+Description=DHCP Client
+Documentation=man:dhclient(8)
+Wants=network.target
+After=network-pre.target systemd-sysctl.service systemd-modules-load.service
+Before=network.target shutdown.target network-online.target
+ConditionPathExists=!/run/initramfs/net.up.flag
+
+[Service]
+Type=forking
+ExecStart=-/bin/sh -c 'udevadm settle && dhclient -nw'
+PIDFile=/run/dhclient.pid
+
+[Install]
+WantedBy=multi-user.target
+WantedBy=network-online.target
+EOF
+ systemctl enable dhclient >>$OUTPUT 2>&1
+ fi
+
+ if [ -f /etc/systemd/system/multi-user.target.wants/grub-initrd-fallback.service ]; then
+ echo "Disable grub-initrd-fallback.service autostart."
+ systemctl disable grub-initrd-fallback.service
+ fi
+
+ if grep openssh-server $SCRIPT_DIR/basesystem/01-core/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then
+ echo "Enable ssh.service autostart." >>$OUTPUT 2>&1
+ cat </usr/lib/systemd/system/ssh-keygen.service
+[Unit]
+Description=Generate sshd keys
+Before=ssh.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/ssh-keygen -A
+RemainAfterExit=true
+StandardOutput=journal
+
+[Install]
+WantedBy=multi-user.target
+EOF
+ sed -i 's,#PermitRootLogin prohibit-password,PermitRootLogin yes,g' /etc/ssh/sshd_config
+ sed -i 's,#PasswordAuthentication yes,PasswordAuthentication yes,g' /etc/ssh/sshd_config
+ systemctl enable ssh-keygen >>$OUTPUT 2>&1
+ systemctl enable ssh >>$OUTPUT 2>&1
+ fi
+
+ if [ ! -f /usr/share/sudo ]; then
+ cat </usr/share/sudo
+#!/bin/bash
+if [ "$#" -lt 1 ]; then
+ echo "Usage: sudo [command] [arguments]"
+ exit 1
+fi
+
+if [ "$UID" = 0 ]; then
+ exec "$@"
+fi
+
+echo "Sudo is not installed. Run the command as root or install sudo."
+EOF
+ fi
+
+ if [ $DISTRIBUTION_TYPE = "debian" ]; then
+ cat </etc/issue
+
+
+ \l
+
+
+
+
+
+ Thank you for using MiniOS.
+ Based on Debian GNU/Linux.
+ Powered by [1;32mSlax[0;29m.
+
+ [1;1m:::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: :::::::: [0;29m
+ [1;1m+:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+: [0;29m
+ [1;1m+:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ [0;29m
+ [1;1m+#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++ [0;29m
+ [1;1m+#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ [0;29m
+ [1;1m#+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# [0;29m
+ [1;1m### ### ########### ### #### ########### ######## ######## [0;29m
+
+ : :
+ : Root login name: [1;33mroot[0;29m :
+ : Password: [1;33mtoor[0;29m :
+ : User login name: [1;33mlive[0;29m :
+ : Password: [1;33mevil[0;29m :
+
+
+
+
+
+
+
+EOF
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function chroot_finish_up() {
+ current_process
+
+ # truncate machine id (why??)
+ truncate -s 0 /etc/machine-id >>$OUTPUT 2>&1
+
+ # remove diversion (why??)
+ rm /sbin/initctl >>$OUTPUT 2>&1
+ dpkg-divert --rename --remove /sbin/initctl >>$OUTPUT 2>&1
+
+ # remove ssh config
+ #rm -f /etc/ssh/ssh_host*
+
+ # clean up useless stuff
+ rm -rf /tmp/* ~/.bash_history >>$OUTPUT 2>&1
+ rm -rf ~/.cache
+ find /var/log/ -type f | xargs rm -f >>$OUTPUT 2>&1
+ rm -f /etc/ssh/ssh_host*
+ rm -f /var/backups/* >>$OUTPUT 2>&1
+ rm -f /var/cache/ldconfig/* >>$OUTPUT 2>&1
+ #rm -f /var/cache/debconf/* >>$OUTPUT 2>&1
+ rm -f /var/cache/fontconfig/* >>$OUTPUT 2>&1
+ rm -f /var/cache/apt/archives/*.deb >>$OUTPUT 2>&1
+ rm -f /var/cache/apt/*.bin >>$OUTPUT 2>&1
+ rm -f /var/cache/debconf/*-old >>$OUTPUT 2>&1
+ rm -f /var/lib/apt/extended_states >>$OUTPUT 2>&1
+ rm -f /var/lib/apt/lists/*Packages >>$OUTPUT 2>&1
+ rm -f /var/lib/apt/lists/*Translation* >>$OUTPUT 2>&1
+ rm -f /var/lib/apt/lists/*InRelease >>$OUTPUT 2>&1
+ rm -f /var/lib/apt/lists/deb.* >>$OUTPUT 2>&1
+ rm -f /var/lib/dpkg/*-old >>$OUTPUT 2>&1
+
+}
+
+# =================================================================
+# =================================================================
+# ======================= MODULE FUNCTIONS ========================
+# =================================================================
+# =================================================================
+
+# =================================================================
+#
+#
+# =================================================================
+function module_check_mounted() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if grep -qs "$MODULE_MERGED_DIR" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/dev" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/run" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/proc" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/sys" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/dev/pts" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/tmp" /proc/mounts; then
+ echo -e "${BOLD}${LIGHTYELLOW}Сhroot contains mounted filesystems.${ENDCOLOUR}"
+ if [ "$UNATTENDED" = "1" ]; then
+ module_chroot_umount_fs
+ else
+ read -r -p "$(echo -e ""Do you want to ${GREEN}unmount them${ENDCOLOUR}? [${BOLD}${GREEN}Y${ENDCOLOUR}/n])" response
+ response=${response,,}
+ if [[ "$response" =~ ^(no|n)$ ]]; then
+ exit 1
+ else
+ module_chroot_umount_fs
+ fi
+ fi
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function module_check_build_dir() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ "$UNATTENDED" = "1" ]; then
+ #echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}"
+ echo -e "The working directory is ${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR}."
+ if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
+ module_cleanup
+ module_check_mounted
+ fi
+ else
+ # ▼ должно быть только перенаправление ошибки!
+ if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
+ echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is not empty."
+ module_cleanup
+ module_check_mounted
+ echo -e "The working directory is ${MAGENTA}$MODULE_MERGED_DIR${ENDCOLOUR}."
+ else
+ module_check_mounted
+ echo -e "The working directory is ${MAGENTA}$MODULE_MERGED_DIR${ENDCOLOUR}."
+ fi
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function module_chroot_mount_fs() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+
+ local MODULES MODULE_LOWER_DIR
+
+ module_check_mounted
+
+ 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
+
+ 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
+ fi
+ if [ ! -d $MODULE_MERGED_DIR/run ]; then
+ mkdir -p $MODULE_MERGED_DIR/run
+ fi
+ if [ ! -d $MODULE_MERGED_DIR/proc ]; then
+ mkdir -p $MODULE_MERGED_DIR/proc
+ fi
+ if [ ! -d $MODULE_MERGED_DIR/sys ]; then
+ mkdir -p $MODULE_MERGED_DIR/sys
+ fi
+ if [ ! -d $MODULE_MERGED_DIR/tmp ]; then
+ mkdir -p $MODULE_MERGED_DIR/tmp
+ fi
+
+ mount --bind /dev $MODULE_MERGED_DIR/dev
+ if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
+ mkdir -p $MODULE_MERGED_DIR/run/resolvconf
+ touch $MODULE_MERGED_DIR/run/resolvconf/resolv.conf
+ mount --bind /etc/resolv.conf $MODULE_MERGED_DIR/run/resolvconf/resolv.conf
+ else
+ mount --bind /run $MODULE_MERGED_DIR/run
+ fi
+ mount none -t proc $MODULE_MERGED_DIR/proc
+ mount none -t sysfs $MODULE_MERGED_DIR/sys
+ mount none -t devpts $MODULE_MERGED_DIR/dev/pts
+ mount none -t tmpfs $MODULE_MERGED_DIR/tmp
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function module_chroot_umount_fs() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+
+ local MODULES MODULE_LOWER_DIR
+
+ set +e
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ umount $MODULE_MERGED_DIR/proc
+ umount $MODULE_MERGED_DIR/sys
+ umount $MODULE_MERGED_DIR/dev/pts
+ umount $MODULE_MERGED_DIR/tmp
+ umount $MODULE_MERGED_DIR/dev
+ if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
+ umount $MODULE_MERGED_DIR/run/resolvconf/resolv.conf
+ rm -f $MODULE_MERGED_DIR/run/resolvconf/resolv.conf
+ rmdir $MODULE_MERGED_DIR/run/resolvconf
+ else
+ umount $MODULE_MERGED_DIR/run
+ fi
+ umount $MODULE_MERGED_DIR
+ else
+ umount $MODULE_MERGED_DIR/proc >>$OUTPUT 2>&1
+ umount $MODULE_MERGED_DIR/sys >>$OUTPUT 2>&1
+ umount $MODULE_MERGED_DIR/dev/pts >>$OUTPUT 2>&1
+ umount $MODULE_MERGED_DIR/tmp >>$OUTPUT 2>&1
+ umount $MODULE_MERGED_DIR/dev >>$OUTPUT 2>&1
+ 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 $MODULE_MERGED_DIR/run/resolvconf
+ else
+ umount $MODULE_MERGED_DIR/run >>$OUTPUT 2>&1
+ fi
+ umount $MODULE_MERGED_DIR >>$OUTPUT 2>&1
+ fi
+
+ MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT)
+ for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
+ MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
+ umount $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
+ done
+
+ set -e
+
+ module_check_mounted
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function module_cleanup() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ if [ "$UNATTENDED" = "1" ]; then
+ module_check_mounted
+ rm -rf $MODULE_UPPER_DIR
+ if [ -d "$MODULE_UPPER_DIR" ]; then
+ module_cleanup
+ fi
+ else
+ read -r -p "$(echo -e ""Do you want to ${BOLD}${RED}completely remove content${ENDCOLOUR} of ${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR}? [y/${BOLD}${GREEN}N${ENDCOLOUR}])" response
+ response=${response,,}
+ if [[ "$response" =~ ^(yes|y)$ ]]; then
+ module_check_mounted
+ rm -rf $MODULE_UPPER_DIR
+ if [ -d "$MODULE_UPPER_DIR" ]; then
+ module_cleanup
+ fi
+ else
+ echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} should be empty to continue."
+ exit 1
+ fi
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function module_chroot_finish_up() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+
+ # truncate machine id (why??)
+ chroot $MODULE_MERGED_DIR /bin/bash -x <>$OUTPUT 2>&1
+ dpkg-divert --rename --remove /sbin/initctl >>$OUTPUT 2>&1
+EOF
+ fi
+
+ if [ -d $MODULE_UPPER_DIR/home/live ]; then
+ chown 1000:1000 $MODULE_UPPER_DIR/home/live
+ chown -R 1000:1000 $MODULE_UPPER_DIR/home/live
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function module_chroot_cleanup() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+ # clean up useless stuff
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ 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
+ rm -rf $MODULE_UPPER_DIR/.cache
+ find $MODULE_UPPER_DIR/var/log/ -type f | xargs rm -f
+ rm -f $MODULE_UPPER_DIR/etc/ssh/ssh_host*
+ rm -f $MODULE_UPPER_DIR/var/backups/*
+ rm -f $MODULE_UPPER_DIR/var/cache/ldconfig/*
+ #rm -f $MODULE_UPPER_DIR/var/cache/debconf/*
+ rm -f $MODULE_UPPER_DIR/var/cache/fontconfig/*
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/archives/*.deb
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/*.bin
+ rm -f $MODULE_UPPER_DIR/var/cache/debconf/*-old
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/extended_states
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*Packages
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*Translation*
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*InRelease
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.*
+ rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old
+ rm -f $MODULE_UPPER_DIR/preinstall
+ rm -f $MODULE_UPPER_DIR/install
+ rm -f $MODULE_UPPER_DIR/install2
+ rm -f $MODULE_UPPER_DIR/cleanup
+ rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list
+ rm -f $MODULE_UPPER_DIR/postinstall
+ rm -rf $MODULE_UPPER_DIR/rootcopy
+ else
+ 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
+ rm -rf $MODULE_UPPER_DIR/.cache
+ find $MODULE_UPPER_DIR/var/log/ -type f | xargs rm -f >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/etc/ssh/ssh_host*
+ rm -f $MODULE_UPPER_DIR/var/backups/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/ldconfig/* >>$OUTPUT 2>&1
+ #rm -f $MODULE_UPPER_DIR/var/cache/debconf/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/fontconfig/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/archives/*.deb >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/*.bin >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/debconf/*-old >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/extended_states >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*Packages >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*Translation* >>$OUTPUT 2>&1
+ 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 >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/install >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
+ rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1
+ fi
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function module_build_cleanup() {
+ echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
+
+ set +e
+
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ rm -f $MODULE_UPPER_DIR/preinstall
+ rm -f $MODULE_UPPER_DIR/install
+ rm -f $MODULE_UPPER_DIR/install2
+ rm -f $MODULE_UPPER_DIR/cleanup
+ rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list
+ rm -f $MODULE_UPPER_DIR/postinstall
+ rm -rf $MODULE_UPPER_DIR/rootcopy
+ rm -rf $MODULE_UPPER_DIR/patches
+
+ rm -f $MODULE_UPPER_DIR/etc/fstab
+ rm -f $MODULE_UPPER_DIR/etc/mtab
+ rm -f $MODULE_UPPER_DIR/etc/apt/sources.list~
+ rm -Rf $MODULE_UPPER_DIR/etc/systemd/system/timers.target.wants
+ rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/ssh.service
+ rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/dnsmasq.service
+
+ rm -f $MODULE_UPPER_DIR/etc/ssh/ssh_host*
+
+ rm -f $MODULE_UPPER_DIR/var/backups/*
+ rm -f $MODULE_UPPER_DIR/var/cache/ldconfig/*
+ rm -f $MODULE_UPPER_DIR/var/cache/debconf/*
+ rm -f $MODULE_UPPER_DIR/var/cache/fontconfig/*
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/extended_states
+ rm -f $MODULE_UPPER_DIR/var/lib/systemd/random-seed
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.*
+ rm -Rf $MODULE_UPPER_DIR/root/.local/share/mc
+ rm -Rf $MODULE_UPPER_DIR/root/.cache
+ rm -f $MODULE_UPPER_DIR/root/.wget-hsts
+
+ rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old
+ rm -f $MODULE_UPPER_DIR/var/log/*
+ rm -f $MODULE_UPPER_DIR/var/log/*/*
+ rm -f $MODULE_UPPER_DIR/var/log/*/*/*
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/archives/*.deb
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/*.bin
+ rm -f $MODULE_UPPER_DIR/var/cache/debconf/*-old
+ rm -f $MODULE_UPPER_DIR/var/lib/dhcp/dhclient.leases
+ rm -f $MODULE_UPPER_DIR/root/.bash_history
+ rm -f $MODULE_UPPER_DIR/root/.wget-hsts
+ rm -Rf $MODULE_UPPER_DIR/usr/share/doc/*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/info/*
+ rm -f $MODULE_UPPER_DIR/usr/share/images/fluxbox/debian-squared.jpg
+ rm -Rf $MODULE_UPPER_DIR/usr/share/fluxbox/nls/??*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/gnome/help
+
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/???
+ rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_*
+ rm -Rf $MODULE_UPPER_DIR/usr/share/man/??
+ rm -Rf $MODULE_UPPER_DIR/usr/share/man/*_*
+
+ rm -Rf $MODULE_UPPER_DIR/usr/share/icons/elementaryXubuntu-dark
+ rm -Rf $MODULE_UPPER_DIR/usr/share/icons/gnome/256x256
+
+ rm $MODULE_UPPER_DIR/usr/share/applications/compton.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/debian-uxterm.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/debian-xterm.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/htop.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/mc.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/mcedit.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/pcmanfm-desktop-pref.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/python2.7.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/python3.7.desktop
+ rm $MODULE_UPPER_DIR/usr/share/applications/vim.desktop
+
+ # Unzip gzipped files (man pages), so LZMA can compress 2times better.
+ # First we fix symlinks, then uncompress files
+ # $1 = search directory
+ uncompress_files() {
+ local LINK LINE
+
+ find "$1" -type l -name "*.gz" | while read LINE; do
+ LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
+ FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
+ ln -sfn "$LINK" "$FILE"
+ rm -f "$LINE"
+ done
+ find "$1" -type f -name "*.gz" | xargs -r gunzip
+ }
+
+ uncompress_files $MODULE_UPPER_DIR/etc/alternatives
+ uncompress_files $MODULE_UPPER_DIR/usr/share/man
+
+ # remove broken links
+ # $1 = search directory
+ remove_broken_links() {
+ find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf
+ }
+
+ remove_broken_links $MODULE_UPPER_DIR/etc/alternatives
+ remove_broken_links $MODULE_UPPER_DIR/usr/share/man
+ else
+ rm -f $MODULE_UPPER_DIR/preinstall >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/install >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
+ rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1
+ rm -rf $MODULE_UPPER_DIR/patches >>$OUTPUT 2>&1
+
+ rm -f $MODULE_UPPER_DIR/etc/fstab >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/etc/mtab >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/etc/apt/sources.list~ >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/etc/systemd/system/timers.target.wants >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/ssh.service >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/dnsmasq.service >>$OUTPUT 2>&1
+
+ rm -f $MODULE_UPPER_DIR/etc/ssh/ssh_host* >>$OUTPUT 2>&1
+
+ rm -f $MODULE_UPPER_DIR/var/backups/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/ldconfig/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/debconf/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/fontconfig/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/extended_states >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/lib/systemd/random-seed >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.* >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/root/.local/share/mc >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/root/.cache >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/root/.wget-hsts >>$OUTPUT 2>&1
+
+ rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/log/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/log/*/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/log/*/*/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/archives/*.deb >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/apt/*.bin >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/cache/debconf/*-old >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/var/lib/dhcp/dhclient.leases >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/root/.bash_history >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/root/.wget-hsts >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/doc/* >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/info/* >>$OUTPUT 2>&1
+ rm -f $MODULE_UPPER_DIR/usr/share/images/fluxbox/debian-squared.jpg >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/fluxbox/nls/??* >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/gnome/help >>$OUTPUT 2>&1
+
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/?? >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_* >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@* >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??? >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_* >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/man/?? >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/man/*_* >>$OUTPUT 2>&1
+
+ rm -Rf $MODULE_UPPER_DIR/usr/share/icons/elementaryXubuntu-dark >>$OUTPUT 2>&1
+ rm -Rf $MODULE_UPPER_DIR/usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
+
+ rm $MODULE_UPPER_DIR/usr/share/applications/compton.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/debian-uxterm.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/debian-xterm.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/htop.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/mc.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/mcedit.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/pcmanfm-desktop-pref.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/python2.7.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/python3.7.desktop >>$OUTPUT 2>&1
+ rm $MODULE_UPPER_DIR/usr/share/applications/vim.desktop >>$OUTPUT 2>&1
+
+ # Unzip gzipped files (man pages), so LZMA can compress 2times better.
+ # First we fix symlinks, then uncompress files
+ # $1 = search directory
+ uncompress_files() {
+ local LINK LINE
+
+ find "$1" -type l -name "*.gz" | while read LINE; do
+ LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
+ FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
+ ln -sfn "$LINK" "$FILE"
+ rm -f "$LINE"
+ done
+ find "$1" -type f -name "*.gz" | xargs -r gunzip >>$OUTPUT 2>&1
+ }
+
+ uncompress_files $MODULE_UPPER_DIR/etc/alternatives >>$OUTPUT 2>&1
+ uncompress_files $MODULE_UPPER_DIR/usr/share/man >>$OUTPUT 2>&1
+
+ # remove broken links
+ # $1 = search directory
+ remove_broken_links() {
+ find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf >>$OUTPUT 2>&1
+ }
+
+ remove_broken_links $MODULE_UPPER_DIR/etc/alternatives >>$OUTPUT 2>&1
+ remove_broken_links $MODULE_UPPER_DIR/usr/share/man >>$OUTPUT 2>&1
+ fi
+
+ set -e
+
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function build_modules() {
+ current_process
+
+ if [ $CONTAINER_TYPE = "1" ]; then
+ if [ ! -f /.minios-live ]; then
+ setup_host
+ fi
+ fi
+
+ MODULES_DIR=$PARENT_DIR/modules
+
+ cd $SCRIPT_DIR/linux-live/modules
+
+ for MODULE in *; do
+ 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}"
+ else
+ MODULE_UPPER_DIR="$MODULES_DIR/$MODULE-upper"
+ MODULE_WORK_DIR="$MODULES_DIR/$MODULE-work"
+ MODULE_MERGED_DIR="$MODULES_DIR/$MODULE-merged"
+
+ module_check_build_dir
+
+ module_chroot_mount_fs
+
+ # run pre-install script
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall ]; then
+ cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
+ chmod +x $MODULE_MERGED_DIR/preinstall
+ chroot $MODULE_MERGED_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /preinstall >>$OUTPUT 2>&1
+ fi
+
+ # copy files
+ if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
+ fi
+ else
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
+ fi
+ fi
+ else
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then
+ mkdir $MODULE_MERGED_DIR/rootcopy
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/)
+ fi
+ else
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then
+ mkdir $MODULE_MERGED_DIR/rootcopy
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/)
+ fi
+ fi
+ fi
+
+ # run install script
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/install ]; then
+ cp $SCRIPT_DIR/linux-live/modules/$MODULE/install $MODULE_MERGED_DIR/install
+ chmod +x $MODULE_MERGED_DIR/install
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/cleanup ]; then
+ cp $SCRIPT_DIR/linux-live/modules/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup
+ fi
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list ]; then
+ cp $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
+ fi
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ chroot $MODULE_MERGED_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /install
+ else
+ chroot $MODULE_MERGED_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /install >>$OUTPUT 2>&1
+ fi
+ fi
+
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
+ module_chroot_umount_fs
+
+ module_build_cleanup
+
+ # run external actions
+
+ if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
+ mkdir -p $PARENT_DIR/modules/tmp >>$OUTPUT 2>&1
+ mksquashfs $MODULE_UPPER_DIR $PARENT_DIR/modules/tmp/$MODULE-stock.$BEXT -comp lz4 -b 1024K -always-use-fragments -noappend >>$OUTPUT 2>&1 || exit
+ mv $PARENT_DIR/modules/tmp/$MODULE-stock.$BEXT $MODULE_UPPER_DIR/$MODULE-stock.$BEXT >>$OUTPUT 2>&1
+ cd $MODULE_UPPER_DIR >>$OUTPUT 2>&1
+ unsquashfs $MODULE-stock.$BEXT >>$OUTPUT 2>&1
+ else
+ echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do."
+ fi
+
+ #module_check_build_dir
+
+ module_chroot_mount_fs
+ fi
+
+ # run install2 script
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/install2 ]; then
+ cp $SCRIPT_DIR/linux-live/modules/$MODULE/install2 $MODULE_MERGED_DIR/install2
+ chmod +x $MODULE_MERGED_DIR/install2
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then
+ mkdir $MODULE_MERGED_DIR/patches
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/)
+ fi
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ chroot $MODULE_MERGED_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /install2
+ else
+ chroot $MODULE_MERGED_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /install2 >>$OUTPUT 2>&1
+ fi
+ fi
+
+ # copy files
+ if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ]; then
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
+ fi
+ else
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
+ fi
+ fi
+ else
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ]; then
+ mkdir $MODULE_MERGED_DIR/rootcopy-postinstall
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
+ fi
+ else
+ if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
+ mkdir $MODULE_MERGED_DIR/rootcopy-postinstall
+ (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
+ fi
+ fi
+ fi
+
+ # run post-install script
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/postinstall ]; then
+ cp $SCRIPT_DIR/linux-live/modules/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
+ chmod +x $MODULE_MERGED_DIR/postinstall
+ if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
+ chroot $MODULE_MERGED_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /postinstall
+ else
+ chroot $MODULE_MERGED_DIR /usr/bin/env \
+ OUTPUT=$OUTPUT \
+ LOGPATH=$LOGPATH \
+ BUILD_TEST_ISO=$BUILD_TEST_ISO \
+ CREATE_BACKUP=$CREATE_BACKUP \
+ DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
+ APT_CMD=$APT_CMD \
+ APT_OPTIONS=$APT_OPTIONS \
+ APT_OPTIONS2=$APT_OPTIONS2 \
+ LIVE_TYPE=$LIVE_TYPE \
+ DISTRIBUTION=$DISTRIBUTION \
+ PACKAGE_VARIANT=$PACKAGE_VARIANT \
+ /postinstall >>$OUTPUT 2>&1
+ fi
+ fi
+
+ # run external actions
+ if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
+ cp $MODULE_UPPER_DIR/$MODULE.$BEXT $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT >>$OUTPUT 2>&1
+ fi
+
+ module_chroot_finish_up
+
+ module_chroot_umount_fs
+
+ if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
+ module_build_cleanup
+ fi
+
+ module_chroot_cleanup
+
+ if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
+ if [ ! -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT ]; then
+ if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
+ if [ $COMP_TYPE = "zstd" ]; then
+ mksquashfs $MODULE_UPPER_DIR $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -noappend || exit
+ else
+ mksquashfs $MODULE_UPPER_DIR $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
+ fi
+ else
+ echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do."
+ fi
+ else
+ echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
+ echo -e "Please remove ${MAGENTA}$PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}."
+ echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
+ fi
+ fi
+
+ fi
+ done
+}
+
+# =================================================================
+#
+#
+# =================================================================
+function build_modules_live() {
+ current_process
+ echo "here 2"
+ if [ $CONTAINER_TYPE = "1" ]; then
+ if [ ! -f /.minios-live ]; then
+ setup_host
+ fi
+ fi
+
+ MODULES_DIR=$PARENT_DIR/modules
+
+ cd $SCRIPT_DIR/linux-live/modules
+
+ for MODULE in *; do
+
+ 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}"
+ else
+
+ MODULE_UPPER_DIR="$MODULES_DIR/$MODULE-upper"
+ MODULE_WORK_DIR="$MODULES_DIR/$MODULE-work"
+ MODULE_MERGED_DIR="$MODULES_DIR/$MODULE-merged"
+
+ if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
+ if [ $COMP_TYPE = "zstd" ]; then
+ mksquashfs $MODULE_UPPER_DIR $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -Xcompression-level 22 -b 1024K -always-use-fragments -noappend || exit
+ else
+ mksquashfs $MODULE_UPPER_DIR $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
+ fi
+ else
+ echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is empty. Nothing to do."
+ fi
+ fi
+ done
+}
+
+function repack_module() {
+ OLD_MODULE=$MODULE
+ MODULE=${MODULE%"-$OLD_COMP_TYPE.$BEXT"}
+ if [ $COMP_TYPE = $OLD_COMP_TYPE ]; then
+ echo "The module is already in the required compression format." && exit
+ fi
+ unsquashfs $OLD_MODULE
+
+ mksquashfs squashfs-root $MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
+
+ rm -rf squashfs-root
+ rm -f $OLD_MODULE
+}
+
+function repack_modules() {
+ current_process
+
+ cd $PARENT_DIR/image/$LIVEKITNAME/
+ for MODULE in *; do
+ if (ls ./*-xz.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
+ OLD_COMP_TYPE="xz"
+ repack_module
+ elif (ls ./*-lz4.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
+ OLD_COMP_TYPE="lz4"
+ repack_module
+ elif (ls ./*-zstd.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
+ OLD_COMP_TYPE="zstd"
+ repack_module
+ fi
+ done
+}
diff --git a/minios-modules/usr/bin/minios-autoinstall b/minios-modules/usr/bin/minios-autoinstall
deleted file mode 100755
index e559582..0000000
--- a/minios-modules/usr/bin/minios-autoinstall
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/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")")"
-PARENT_DIR="$(dirname "$SCRIPT_DIR")"
-CURRENT_DIR="$(pwd)"
-ISO_DIR=$CURRENT_DIR/iso
-TMP_DIR="/tmp/"
-
-if [ -f $SCRIPT_DIR/minioslib ]; then
- . $SCRIPT_DIR/minioslib || exit 1
-else
- . /usr/lib/minioslib || exit 1
-fi
-if [ -f $SCRIPT_DIR/config ]; then
- . $SCRIPT_DIR/config || exit 1
-elif [ -f /etc/minios/config ]; then
- . /etc/minios/config || exit 1
-else
- . /run/initramfs/lib/config || exit 1
-fi
-if [ -f $CURRENT_DIR/config ]; then
- . $CURRENT_DIR/config
-fi
-
-# don't change! use ./autoinstall instead
-UNATTENDED="1"
-
-CMD=(build_modules repack_system)
-
-# ============= main ================
-
-BUILD_DIR=""
-
-common_variables
-
-console_colours
-
-allow_root_only
-
-create_completion
-
-# check number of args
-if [[ $# == 0 || $# > 3 ]]; then help; fi
-
-# loop through args
-dash_flag=false
-start_index=0
-end_index=${#CMD[*]}
-for ii in "$@"; do
- if [[ $ii == "-" ]]; then
- dash_flag=true
- continue
- fi
- find_index $ii
- if [[ $dash_flag == false ]]; then
- start_index=$index
- else
- end_index=$(($index + 1))
- fi
-done
-if [[ $dash_flag == false ]]; then
- end_index=$(($start_index + 1))
-fi
-
-#loop through the commands
-for ((ii = $start_index; ii < $end_index; ii++)); do
- ${CMD[ii]}
-done
-
-echo -e "${BOLD}${LIGHTYELLOW}$0${ENDCOLOUR} - ${LIGHTGREEN}Command completed successfully!${ENDCOLOUR}"
diff --git a/minios-modules/usr/bin/minios-install b/minios-modules/usr/bin/minios-install
deleted file mode 100755
index 88a4150..0000000
--- a/minios-modules/usr/bin/minios-install
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/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")")"
-PARENT_DIR="$(dirname "$SCRIPT_DIR")"
-CURRENT_DIR="$(pwd)"
-ISO_DIR=$CURRENT_DIR/iso
-TMP_DIR="/tmp/"
-
-if [ -f $SCRIPT_DIR/minioslib ]; then
- . $SCRIPT_DIR/minioslib || exit 1
-else
- . /usr/lib/minioslib || exit 1
-fi
-if [ -f $SCRIPT_DIR/config ]; then
- . $SCRIPT_DIR/config || exit 1
-elif [ -f /etc/minios/config ]; then
- . /etc/minios/config || exit 1
-else
- . /run/initramfs/lib/config || exit 1
-fi
-if [ -f $CURRENT_DIR/config ]; then
- . $CURRENT_DIR/config
-fi
-
-# don't change! use ./autoinstall instead
-UNATTENDED="0"
-
-CMD=(build_modules repack_system)
-
-# ============= main ================
-
-BUILD_DIR=""
-
-common_variables
-
-console_colours
-
-allow_root_only
-
-create_completion
-
-# check number of args
-if [[ $# == 0 || $# > 3 ]]; then help; fi
-
-# loop through args
-dash_flag=false
-start_index=0
-end_index=${#CMD[*]}
-for ii in "$@"; do
- if [[ $ii == "-" ]]; then
- dash_flag=true
- continue
- fi
- find_index $ii
- if [[ $dash_flag == false ]]; then
- start_index=$index
- else
- end_index=$(($index + 1))
- fi
-done
-if [[ $dash_flag == false ]]; then
- end_index=$(($start_index + 1))
-fi
-
-#loop through the commands
-for ((ii = $start_index; ii < $end_index; ii++)); do
- ${CMD[ii]}
-done
-
-echo -e "${BOLD}${LIGHTYELLOW}$0${ENDCOLOUR} - ${LIGHTGREEN}Command completed successfully!${ENDCOLOUR}"
diff --git a/minios-modules/usr/bin/minios-modules-build b/minios-modules/usr/bin/minios-modules-build
deleted file mode 100755
index 296bd09..0000000
--- a/minios-modules/usr/bin/minios-modules-build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-minios-autoinstall build_modules
\ No newline at end of file
diff --git a/minios-modules/usr/bin/minios-system-repack b/minios-modules/usr/bin/minios-system-repack
deleted file mode 100755
index 7b7c226..0000000
--- a/minios-modules/usr/bin/minios-system-repack
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-minios-autoinstall repack_system
\ No newline at end of file
diff --git a/minios-modules/usr/lib/minioslib b/minios-modules/usr/lib/minioslib
deleted file mode 100644
index 771b627..0000000
--- a/minios-modules/usr/lib/minioslib
+++ /dev/null
@@ -1,814 +0,0 @@
-#!/bin/bash
-
-# Functions library :: for install scripts
-# Author: crims0n.
-#
-
-# =================================================================
-# =================================================================
-# ========================= VARIABLES =============================
-# =================================================================
-# =================================================================
-
-function common_variables() {
- if [ $DISTRIBUTION_ARCH = "amd64" ]; then
- KERNEL_ARCH="amd64"
- PACKAGE_VARIANT="standard"
- elif [ $DISTRIBUTION_ARCH = "i386" ]; then
- KERNEL_ARCH="686-pae"
- PACKAGE_VARIANT="minimal"
- elif [ $DISTRIBUTION_ARCH = "arm64" ]; then
- KERNEL_ARCH="arm64"
- fi
-}
-
-# =================================================================
-# =================================================================
-# ===================== COMMON FUNCTIONS ==========================
-# =================================================================
-# =================================================================
-
-function current_process() {
- echo -e "${LIGHTYELLOW}=====> running ${CYAN}${CMD[ii]}${ENDCOLOUR}${LIGHTYELLOW} ...${ENDCOLOUR}"
-}
-
-# =================================================================
-# beautiful console
-# красивая консоль
-# =================================================================
-function console_colours() {
- RED="\e[31m"
- GREEN="\e[32m"
- YELLOW="\e[33m"
- BLUE="\e[34m"
- MAGENTA="\e[35m"
- CYAN="\e[36m"
- LIGHTGRAY="\e[37m"
- DARKGRAY="\e[90m"
- LIGHTRED="\e[91m"
- LIGHTGREEN="\e[92m"
- LIGHTYELLOW="\e[93m"
- LIGHTBLUE="\e[94m"
- LIGHTMAGENTA="\e[95m"
- LIGHTCYAN="\e[96m"
- BOLD="\e[1m"
- DIM="\e[2m"
- UNDERLINED="\e[4m"
- BLINK="\e[5m"
- REVERSE="\e[7m"
- HIDDEN="\e[8m"
- ENDCOLOUR="\e[0m"
-}
-
-# =================================================================
-# help functions
-# функции помощи
-# =================================================================
-function help() {
- # if $1 is set, use $1 as headline message in help()
- if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
- if [ -z ${1+x} ]; then
- echo -e "${LIGHTYELLOW}Этот скрипт собирает загружаемый ISO образ $SYSTEMNAME.${ENDCOLOUR}"
- echo -e
- else
- echo -e $1
- echo
- fi
- echo -e "Поддерживаемые команды : ${CYAN}${CMD[*]}${ENDCOLOUR}"
- echo -e
- echo -e "Синтаксис: ${MAGENTA}$0${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
- if [ -L /usr/bin/$LIVEKITNAME-install ] && [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
- echo -e "\t${CYAN}$LIVEKITNAME-install${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
- fi
- echo -e "\tзапуск от start_cmd до end_cmd"
- echo -e "\tесли start_cmd опущен, выполняются все команды, начиная с первой"
- echo -e "\tесли end_cmd опущен, выполняются все команды до последней"
- echo -e "\tвведите одну команду, чтобы запустить определенную команду"
- echo -e "\tвведите '-' как единственный аргумент для запуска всех команд"
- echo -e "\t"
- echo -e "\tПримеры:${LIGHTYELLOW}$0 build_bootstrap - build_chroot${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 - build_chroot${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 build_bootstrap -${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 build_iso${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 -${ENDCOLOUR}"
- exit 0
- else
- if [ -z ${1+x} ]; then
- echo -e "${LIGHTYELLOW}This script builds bootable $SYSTEMNAME ISO image.${ENDCOLOUR}"
- echo -e
- else
- echo -e $1
- echo
- fi
- echo -e "Supported commands : ${CYAN}${CMD[*]}${ENDCOLOUR}"
- echo -e
- echo -e "Syntax: ${MAGENTA}$0${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
- if [ -L /usr/bin/$LIVEKITNAME-install ] && [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
- echo -e "\t${CYAN}$LIVEKITNAME-install${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
- fi
- echo -e "\trun from start_cmd to end_cmd"
- echo -e "\tif start_cmd is omitted, start from first command"
- echo -e "\tif end_cmd is omitted, end with last command"
- echo -e "\tenter single cmd to run the specific command"
- echo -e "\tenter '-' as only argument to run all commands"
- echo -e "\t"
- echo -e "\tExamples:${LIGHTYELLOW}$0 build_bootstrap - build_chroot${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 - build_chroot${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 build_bootstrap -${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 build_iso${ENDCOLOUR}"
- echo -e "\t\t${LIGHTYELLOW}$0 -${ENDCOLOUR}"
- exit 0
- fi
-}
-
-# =================================================================
-# parsing input commands
-# разбор входных команд
-# =================================================================
-function find_index() {
- local ret
- local i
- for ((i = 0; i < ${#CMD[*]}; i++)); do
- if [ "${CMD[i]}" == "$1" ]; then
- index=$i
- return
- fi
- done
- help "Command not found : $1"
-}
-
-# =================================================================
-# creating a symbolic link to the executable file for using
-# autocompletion on the command line
-# создание символической ссылки на исполняемый файл для
-# использования автодополнения в командной строке
-# =================================================================
-function create_livekitname_install_symlink() {
- if [ -L /usr/bin/$LIVEKITNAME-install ]; then
- if [ "$(readlink /usr/bin/$LIVEKITNAME-install)" != "$SCRIPT_DIR/install" ]; then
- rm -f /usr/bin/$LIVEKITNAME-install
- ln -s $SCRIPT_DIR/install /usr/bin/$LIVEKITNAME-install
- if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
- echo -e "Символическая ссылка ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} была обновлена."
- echo -e "Теперь она указывает на ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
- else
- echo -e "The ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} symbolic link has been updated."
- echo -e "It now points to ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
- fi
- fi
- if [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
- if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
- echo -e "Вы можете использовать команду ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} для запуска этой программы."
- else
- echo -e "You can use the ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} command to run this program."
- fi
- fi
- else
- ln -s $SCRIPT_DIR/install /usr/bin/$LIVEKITNAME-install
- if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
- echo -e "Символическая ссылка ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} была добавлена"
- echo -e "для ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
-
- else
- echo -e "The ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} symbolic link has been added"
- echo -e "for ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
- fi
- fi
-}
-
-# =================================================================
-# creating autocompletion on the command line
-# создание автодополнения в командной строке
-# =================================================================
-function create_completion() {
- if [ -d /etc/bash_completion.d ]; then
- if [ ! -f /etc/bash_completion.d/$LIVEKITNAME-install ] || ! grep "${CMD[*]}" /etc/bash_completion.d/$LIVEKITNAME-install >>$OUTPUT; then
- cat </etc/bash_completion.d/$LIVEKITNAME-install
-#/usr/bin/env bash
-complete -W "${CMD[*]}" $LIVEKITNAME-install
-EOF
- fi
- if [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
- if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
- echo -e "Дополнение команд работает только при использовании команды ${CYAN}$LIVEKITNAME-install${ENDCOLOUR}."
- echo -e
- else
- echo -e "Command completion only works when using the ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} command."
- echo -e
- fi
- fi
- fi
-}
-
-# =================================================================
-# only allow 'root' to run the script
-# разрешаем запуск скрипта только пользователю 'root'
-# =================================================================
-
-function allow_root_only() {
- if [ $(id -u) -ne 0 ]; then
- echo -e "${BOLD}${RED}This script should be run as 'root'!${ENDCOLOUR}"
- exit 1
- fi
-
- export HOME=/root
- export LC_ALL=C
-}
-
-# =================================================================
-# check that we are inside chroot
-# проверяем, что мы внутри chroot
-# =================================================================
-
-function check_is_in_chroot() {
- if [ $(stat -c %i /)="2" ]; then
- echo -e "${BOLD}${RED}This script should be run inside chroot only!${ENDCOLOUR}"
- exit 1
- fi
-}
-
-# =================================================================
-# =================================================================
-# ======================= MODULES FUNCTIONS =======================
-# =================================================================
-# =================================================================
-
-# =================================================================
-#
-#
-# =================================================================
-function module_check_mounted() {
- echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
- if grep -qs "$MODULE_MERGED_DIR" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/dev" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/run" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/proc" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/sys" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/dev/pts" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/tmp" /proc/mounts; then
- echo -e "${BOLD}${LIGHTYELLOW}Chroot contains mounted filesystems.${ENDCOLOUR}"
- if [ "$UNATTENDED" = "1" ]; then
- module_chroot_umount_fs
- else
- read -r -p "$(echo -e ""Do you want to ${GREEN}unmount them${ENDCOLOUR}? [${BOLD}${GREEN}Y${ENDCOLOUR}/n])" response
- response=${response,,}
- if [[ "$response" =~ ^(no|n)$ ]]; then
- exit 1
- else
- module_chroot_umount_fs
- fi
- fi
- fi
-}
-
-# =================================================================
-#
-#
-# =================================================================
-function module_check_build_dir() {
- echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
- if [ "$UNATTENDED" = "1" ]; then
- #echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}"
- echo -e "The working directory is ${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR}."
- if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
- module_cleanup
- module_check_mounted
- fi
- else
- # ▼ должно быть только перенаправление ошибки!
- if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
- echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is not empty."
- module_cleanup
- module_check_mounted
- echo -e "The working directory is ${MAGENTA}$MODULE_MERGED_DIR${ENDCOLOUR}."
- else
- module_check_mounted
- echo -e "The working directory is ${MAGENTA}$MODULE_MERGED_DIR${ENDCOLOUR}."
- fi
- fi
-}
-
-# =================================================================
-#
-#
-# =================================================================
-function module_chroot_mount_fs() {
- echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
-
- local MODULES MODULE_LOWER_DIR
-
- module_check_mounted
-
- mkdir -p $MODULES_DIR
- mount -t tmpfs none $MODULES_DIR
-
- MODULES_LIST=""
- MODULES=(/run/initramfs/memory/bundles/*.$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 -o bind ${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
-
- if [ ! -d $MODULE_MERGED_DIR/dev ]; then
- mkdir -p $MODULE_MERGED_DIR/dev
- fi
- if [ ! -d $MODULE_MERGED_DIR/run ]; then
- mkdir -p $MODULE_MERGED_DIR/run
- fi
- if [ ! -d $MODULE_MERGED_DIR/proc ]; then
- mkdir -p $MODULE_MERGED_DIR/proc
- fi
- if [ ! -d $MODULE_MERGED_DIR/sys ]; then
- mkdir -p $MODULE_MERGED_DIR/sys
- fi
- if [ ! -d $MODULE_MERGED_DIR/tmp ]; then
- mkdir -p $MODULE_MERGED_DIR/tmp
- fi
-
- mount --bind /dev $MODULE_MERGED_DIR/dev
-
- echo "nameserver 8.8.8.8" >$MODULE_MERGED_DIR/etc/resolv.conf
-
- mount none -t proc $MODULE_MERGED_DIR/proc
- mount none -t sysfs $MODULE_MERGED_DIR/sys
- mount none -t devpts $MODULE_MERGED_DIR/dev/pts
- mount none -t tmpfs $MODULE_MERGED_DIR/tmp
-}
-
-# =================================================================
-#
-#
-# =================================================================
-function module_chroot_umount_fs() {
- echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
-
- local MODULES MODULE_LOWER_DIR
-
- set +e
- if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- umount $MODULE_MERGED_DIR/proc
- umount $MODULE_MERGED_DIR/sys
- umount $MODULE_MERGED_DIR/dev/pts
- umount $MODULE_MERGED_DIR/tmp
- umount $MODULE_MERGED_DIR/dev
-
- rm -f $MODULE_UPPER_DIR/etc/resolv.conf
-
- umount $MODULE_MERGED_DIR
-
- umount $MODULES_DIR/lower/*
-
- umount $MODULES_DIR
- else
- umount $MODULE_MERGED_DIR/proc >>$OUTPUT 2>&1
- umount $MODULE_MERGED_DIR/sys >>$OUTPUT 2>&1
- umount $MODULE_MERGED_DIR/dev/pts >>$OUTPUT 2>&1
- umount $MODULE_MERGED_DIR/tmp >>$OUTPUT 2>&1
- umount $MODULE_MERGED_DIR/dev >>$OUTPUT 2>&1
-
- rm -f $MODULE_UPPER_DIR/etc/resolv.conf >>$OUTPUT 2>&1
-
- umount $MODULE_MERGED_DIR >>$OUTPUT 2>&1
-
- umount $MODULES_DIR/lower/* >>$OUTPUT 2>&1
-
- umount $MODULES_DIR >>$OUTPUT 2>&1
- fi
-
- set -e
-
- module_check_mounted
-}
-
-# =================================================================
-#
-#
-# =================================================================
-function module_cleanup() {
- echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
- if [ "$UNATTENDED" = "1" ]; then
- module_check_mounted
- rm -rf $MODULE_UPPER_DIR
- if [ -d "$MODULE_UPPER_DIR" ]; then
- module_cleanup
- fi
- else
- read -r -p "$(echo -e ""Do you want to ${BOLD}${RED}completely remove content${ENDCOLOUR} of ${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR}? [y/${BOLD}${GREEN}N${ENDCOLOUR}])" response
- response=${response,,}
- if [[ "$response" =~ ^(yes|y)$ ]]; then
- module_check_mounted
- rm -rf $MODULE_UPPER_DIR
- if [ -d "$MODULE_UPPER_DIR" ]; then
- module_cleanup
- fi
- else
- echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} should be empty to continue."
- exit 1
- fi
- fi
-}
-
-# =================================================================
-#
-#
-# =================================================================
-function module_chroot_finish_up() {
- echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
-
- chroot $MODULE_MERGED_DIR /bin/bash -x <>$OUTPUT 2>&1
- dpkg-divert --rename --remove /sbin/initctl >>$OUTPUT 2>&1
-EOF
- fi
-
- if [ -d $MODULE_UPPER_DIR/home/live ]; then
- chown 1000:1000 $MODULE_UPPER_DIR/home/live
- chown -R 1000:1000 $MODULE_UPPER_DIR/home/live
- fi
-}
-
-# =================================================================
-#
-#
-# =================================================================
-function module_build_cleanup() {
- echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
-
- set +e
-
- if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- rm -f $MODULE_UPPER_DIR/preinstall
- rm -f $MODULE_UPPER_DIR/install
- rm -f $MODULE_UPPER_DIR/cleanup
- rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list
- rm -f $MODULE_UPPER_DIR/postinstall
- rm -rf $MODULE_UPPER_DIR/patches
-
- rm -f $MODULE_UPPER_DIR/etc/fstab
- rm -f $MODULE_UPPER_DIR/etc/mtab
- rm -f $MODULE_UPPER_DIR/etc/apt/sources.list~
- rm -Rf $MODULE_UPPER_DIR/etc/systemd/system/timers.target.wants
- rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/ssh.service
- rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/dnsmasq.service
- rm -f $MODULE_UPPER_DIR/etc/resolv.conf
-
- rm -f $MODULE_UPPER_DIR/etc/ssh/ssh_host*
-
- rm -f $MODULE_UPPER_DIR/var/backups/*
- rm -f $MODULE_UPPER_DIR/var/cache/ldconfig/*
- rm -f $MODULE_UPPER_DIR/var/cache/debconf/*
- rm -f $MODULE_UPPER_DIR/var/cache/fontconfig/*
- rm -f $MODULE_UPPER_DIR/var/lib/apt/extended_states
- rm -f $MODULE_UPPER_DIR/var/lib/systemd/random-seed
- rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.*
- rm -Rf $MODULE_UPPER_DIR/root/.local/share/mc
- rm -Rf $MODULE_UPPER_DIR/root/.cache
- rm -f $MODULE_UPPER_DIR/root/.wget-hsts
-
- rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old
- rm -f $MODULE_UPPER_DIR/var/log/*
- rm -f $MODULE_UPPER_DIR/var/log/*/*
- rm -f $MODULE_UPPER_DIR/var/log/*/*/*
- rm -f $MODULE_UPPER_DIR/var/cache/apt/archives/*.deb
- rm -f $MODULE_UPPER_DIR/var/cache/apt/*.bin
- rm -f $MODULE_UPPER_DIR/var/cache/debconf/*-old
- rm -f $MODULE_UPPER_DIR/var/lib/dhcp/dhclient.leases
- rm -f $MODULE_UPPER_DIR/root/.bash_history
- rm -f $MODULE_UPPER_DIR/root/.wget-hsts
- rm -Rf $MODULE_UPPER_DIR/usr/share/doc/*
- rm -Rf $MODULE_UPPER_DIR/usr/share/info/*
- rm -f $MODULE_UPPER_DIR/usr/share/images/fluxbox/debian-squared.jpg
- rm -Rf $MODULE_UPPER_DIR/usr/share/fluxbox/nls/??*
- rm -Rf $MODULE_UPPER_DIR/usr/share/gnome/help
-
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_*
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@*
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/???
- rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_*
- rm -Rf $MODULE_UPPER_DIR/usr/share/man/??
- rm -Rf $MODULE_UPPER_DIR/usr/share/man/*_*
-
- rm -Rf $MODULE_UPPER_DIR/usr/share/icons/elementaryXubuntu-dark
- rm -Rf $MODULE_UPPER_DIR/usr/share/icons/gnome/256x256
-
- rm $MODULE_UPPER_DIR/usr/share/applications/compton.desktop
- rm $MODULE_UPPER_DIR/usr/share/applications/debian-uxterm.desktop
- #rm $MODULE_UPPER_DIR/usr/share/applications/debian-xterm.desktop
- #rm $MODULE_UPPER_DIR/usr/share/applications/htop.desktop
- #rm $MODULE_UPPER_DIR/usr/share/applications/mc.desktop
- rm $MODULE_UPPER_DIR/usr/share/applications/mcedit.desktop
- rm $MODULE_UPPER_DIR/usr/share/applications/pcmanfm-desktop-pref.desktop
- rm $MODULE_UPPER_DIR/usr/share/applications/python2.7.desktop
- rm $MODULE_UPPER_DIR/usr/share/applications/python3.7.desktop
- rm $MODULE_UPPER_DIR/usr/share/applications/vim.desktop
-
- # Unzip gzipped files (man pages), so LZMA can compress 2times better.
- # First we fix symlinks, then uncompress files
- # $1 = search directory
- uncompress_files() {
- local LINK LINE
-
- find "$1" -type l -name "*.gz" | while read LINE; do
- LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
- FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
- ln -sfn "$LINK" "$FILE"
- rm -f "$LINE"
- done
- find "$1" -type f -name "*.gz" | xargs -r gunzip
- }
-
- uncompress_files $MODULE_UPPER_DIR/etc/alternatives
- uncompress_files $MODULE_UPPER_DIR/usr/share/man
-
- # remove broken links
- # $1 = search directory
- remove_broken_links() {
- find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf
- }
-
- remove_broken_links $MODULE_UPPER_DIR/etc/alternatives
- remove_broken_links $MODULE_UPPER_DIR/usr/share/man
- else
- rm -f $MODULE_UPPER_DIR/preinstall >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/install >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
- rm -rf $MODULE_UPPER_DIR/patches >>$OUTPUT 2>&1
-
- rm -f $MODULE_UPPER_DIR/etc/fstab >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/etc/mtab >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/etc/apt/sources.list~ >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/etc/systemd/system/timers.target.wants >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/ssh.service >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/dnsmasq.service >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/etc/resolv.conf >>$OUTPUT 2>&1
-
- rm -f $MODULE_UPPER_DIR/etc/ssh/ssh_host* >>$OUTPUT 2>&1
-
- rm -f $MODULE_UPPER_DIR/var/backups/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/cache/ldconfig/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/cache/debconf/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/cache/fontconfig/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/lib/apt/extended_states >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/lib/systemd/random-seed >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.* >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/root/.local/share/mc >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/root/.cache >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/root/.wget-hsts >>$OUTPUT 2>&1
-
- rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/log/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/log/*/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/log/*/*/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/cache/apt/archives/*.deb >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/cache/apt/*.bin >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/cache/debconf/*-old >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/var/lib/dhcp/dhclient.leases >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/root/.bash_history >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/root/.wget-hsts >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/doc/* >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/info/* >>$OUTPUT 2>&1
- rm -f $MODULE_UPPER_DIR/usr/share/images/fluxbox/debian-squared.jpg >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/fluxbox/nls/??* >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/gnome/help >>$OUTPUT 2>&1
-
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/?? >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_* >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@* >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??? >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_* >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/man/?? >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/man/*_* >>$OUTPUT 2>&1
-
- rm -Rf $MODULE_UPPER_DIR/usr/share/icons/elementaryXubuntu-dark >>$OUTPUT 2>&1
- rm -Rf $MODULE_UPPER_DIR/usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
-
- rm $MODULE_UPPER_DIR/usr/share/applications/compton.desktop >>$OUTPUT 2>&1
- rm $MODULE_UPPER_DIR/usr/share/applications/debian-uxterm.desktop >>$OUTPUT 2>&1
- #rm $MODULE_UPPER_DIR/usr/share/applications/debian-xterm.desktop >>$OUTPUT 2>&1
- #rm $MODULE_UPPER_DIR/usr/share/applications/htop.desktop >>$OUTPUT 2>&1
- #rm $MODULE_UPPER_DIR/usr/share/applications/mc.desktop >>$OUTPUT 2>&1
- rm $MODULE_UPPER_DIR/usr/share/applications/mcedit.desktop >>$OUTPUT 2>&1
- rm $MODULE_UPPER_DIR/usr/share/applications/pcmanfm-desktop-pref.desktop >>$OUTPUT 2>&1
- rm $MODULE_UPPER_DIR/usr/share/applications/python2.7.desktop >>$OUTPUT 2>&1
- rm $MODULE_UPPER_DIR/usr/share/applications/python3.7.desktop >>$OUTPUT 2>&1
- rm $MODULE_UPPER_DIR/usr/share/applications/vim.desktop >>$OUTPUT 2>&1
-
- # Unzip gzipped files (man pages), so LZMA can compress 2times better.
- # First we fix symlinks, then uncompress files
- # $1 = search directory
- uncompress_files() {
- local LINK LINE
-
- find "$1" -type l -name "*.gz" | while read LINE; do
- LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
- FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
- ln -sfn "$LINK" "$FILE"
- rm -f "$LINE"
- done
- find "$1" -type f -name "*.gz" | xargs -r gunzip >>$OUTPUT 2>&1
- }
-
- uncompress_files $MODULE_UPPER_DIR/etc/alternatives >>$OUTPUT 2>&1
- uncompress_files $MODULE_UPPER_DIR/usr/share/man >>$OUTPUT 2>&1
-
- # remove broken links
- # $1 = search directory
- remove_broken_links() {
- find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf >>$OUTPUT 2>&1
- }
-
- remove_broken_links $MODULE_UPPER_DIR/etc/alternatives >>$OUTPUT 2>&1
- remove_broken_links $MODULE_UPPER_DIR/usr/share/man >>$OUTPUT 2>&1
- fi
-
- set -e
-
-}
-
-# =================================================================
-#
-#
-# =================================================================
-function build_modules() {
- current_process
-
- MODULES_DIR=$CURRENT_DIR/build
-
- cd $CURRENT_DIR/modules
-
- for MODULE in *; do
- MODULE_UPPER_DIR="$MODULES_DIR/$MODULE-upper"
- MODULE_WORK_DIR="$MODULES_DIR/$MODULE-work"
- MODULE_MERGED_DIR="$MODULES_DIR/$MODULE-merged"
-
- module_check_build_dir
-
- module_chroot_mount_fs
-
- # run pre-install script
- if [ -f $CURRENT_DIR/modules/$MODULE/preinstall ]; then
- cp $CURRENT_DIR/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
- chmod +x $MODULE_MERGED_DIR/preinstall
- chroot $MODULE_MERGED_DIR /usr/bin/env \
- OUTPUT=$OUTPUT \
- BUILD_TEST_ISO=$BUILD_TEST_ISO \
- DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
- APT_CMD=$APT_CMD \
- APT_OPTIONS=$APT_OPTIONS \
- APT_OPTIONS2=$APT_OPTIONS2 \
- LIVE_TYPE=$LIVE_TYPE \
- DISTRIBUTION=$DISTRIBUTION \
- PACKAGE_VARIANT=$PACKAGE_VARIANT \
- /preinstall >>$OUTPUT 2>&1
- fi
-
- # copy files
- if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy)" != "" ]; then
- (cd $CURRENT_DIR/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
- fi
- else
- if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then
- (cd $CURRENT_DIR/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/)
- fi
- fi
-
- # run install script
- if [ -f $CURRENT_DIR/modules/$MODULE/install ]; then
- cp $CURRENT_DIR/modules/$MODULE/install $MODULE_MERGED_DIR/install
- chmod +x $MODULE_MERGED_DIR/install
- if [ -f $CURRENT_DIR/modules/$MODULE/cleanup ]; then
- cp $CURRENT_DIR/modules/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup
- fi
- if [ -f $CURRENT_DIR/modules/$MODULE/$PACKAGE_VARIANT.list ]; then
- cp $CURRENT_DIR/modules/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
- fi
- if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- chroot $MODULE_MERGED_DIR /usr/bin/env \
- OUTPUT=$OUTPUT \
- DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
- APT_CMD=$APT_CMD \
- APT_OPTIONS=$APT_OPTIONS \
- APT_OPTIONS2=$APT_OPTIONS2 \
- LIVE_TYPE=$LIVE_TYPE \
- DISTRIBUTION=$DISTRIBUTION \
- PACKAGE_VARIANT=$PACKAGE_VARIANT \
- /install
- else
- chroot $MODULE_MERGED_DIR /usr/bin/env \
- OUTPUT=$OUTPUT \
- DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
- APT_CMD=$APT_CMD \
- APT_OPTIONS=$APT_OPTIONS \
- APT_OPTIONS2=$APT_OPTIONS2 \
- LIVE_TYPE=$LIVE_TYPE \
- DISTRIBUTION=$DISTRIBUTION \
- PACKAGE_VARIANT=$PACKAGE_VARIANT \
- /install >>$OUTPUT 2>&1
- fi
- fi
-
- # copy post-install files
- if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall)" != "" ]; then
- (cd $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
- fi
- else
- if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
- (cd $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
- fi
- fi
-
- # run post-install script
- if [ -f $CURRENT_DIR/modules/$MODULE/postinstall ]; then
- cp $CURRENT_DIR/modules/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
- chmod +x $MODULE_MERGED_DIR/postinstall
- if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
- chroot $MODULE_MERGED_DIR /usr/bin/env \
- OUTPUT=$OUTPUT \
- DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
- APT_CMD=$APT_CMD \
- APT_OPTIONS=$APT_OPTIONS \
- APT_OPTIONS2=$APT_OPTIONS2 \
- LIVE_TYPE=$LIVE_TYPE \
- DISTRIBUTION=$DISTRIBUTION \
- PACKAGE_VARIANT=$PACKAGE_VARIANT \
- /postinstall
- else
- chroot $MODULE_MERGED_DIR /usr/bin/env \
- OUTPUT=$OUTPUT \
- DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE \
- APT_CMD=$APT_CMD \
- APT_OPTIONS=$APT_OPTIONS \
- APT_OPTIONS2=$APT_OPTIONS2 \
- LIVE_TYPE=$LIVE_TYPE \
- DISTRIBUTION=$DISTRIBUTION \
- PACKAGE_VARIANT=$PACKAGE_VARIANT \
- /postinstall >>$OUTPUT 2>&1
- fi
- fi
-
- module_chroot_finish_up
-
- module_build_cleanup
-
- if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
- mksquashfs $MODULE_UPPER_DIR $CURRENT_DIR/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
- else
- echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} ${RED}is empty${ENDCOLOUR}. Nothing to do."
- fi
-
- module_chroot_umount_fs
-
- done
-
-}
-
-function repack_module() {
- cd $CURRENT_DIR
- OLD_MODULE=$MODULE
- MODULE=${MODULE%"-$OLD_COMP_TYPE.$BEXT"}
- if [ $COMP_TYPE = $OLD_COMP_TYPE ]; then
- echo "The module is already in the required compression format." && exit
- fi
-
- if (ls $CURRENT_DIR/*.$BEXT | grep -q $MODULE 2>/dev/null); then
- echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
- echo -e "Please remove $CURRENT_DIR/$MODULE-$COMP_TYPE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}."
- echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
- else
- mksquashfs /run/initramfs/memory/bundles/$OLD_MODULE $CURRENT_DIR/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
- fi
-}
-
-function repack_system() {
- current_process
-
- cd /run/initramfs/memory/bundles/
- for MODULE in *; do
- if (ls /run/initramfs/memory/bundles/*-xz.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
- OLD_COMP_TYPE="xz"
- repack_module
- elif (ls /run/initramfs/memory/bundles/*-lz4.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
- OLD_COMP_TYPE="lz4"
- repack_module
- elif (ls /run/initramfs/memory/bundles/*-zstd.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
- OLD_COMP_TYPE="zstd"
- repack_module
- fi
- done
-}
diff --git a/minios-modules/usr/share/minios/modules/!!!-example/install b/minios-modules/usr/share/minios/modules/!!!-example/install
deleted file mode 100644
index 5575421..0000000
--- a/minios-modules/usr/share/minios/modules/!!!-example/install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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_VARIANT.list ]; then
- $APT_CMD update >>$OUTPUT 2>&1 &&
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
diff --git a/minios-modules/usr/share/minios/modules/!!!-example/minimal.list b/minios-modules/usr/share/minios/modules/!!!-example/minimal.list
deleted file mode 100644
index e7b065e..0000000
--- a/minios-modules/usr/share/minios/modules/!!!-example/minimal.list
+++ /dev/null
@@ -1 +0,0 @@
-firefox-esr
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/!!!-example/postinstall b/minios-modules/usr/share/minios/modules/!!!-example/postinstall
deleted file mode 100644
index a407c94..0000000
--- a/minios-modules/usr/share/minios/modules/!!!-example/postinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
diff --git a/minios-modules/usr/share/minios/modules/!!!-example/standard.list b/minios-modules/usr/share/minios/modules/!!!-example/standard.list
deleted file mode 100644
index e7b065e..0000000
--- a/minios-modules/usr/share/minios/modules/!!!-example/standard.list
+++ /dev/null
@@ -1 +0,0 @@
-firefox-esr
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/install b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/install
deleted file mode 100644
index 61f720a..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/install
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/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")")"
-
-echo "nodm nodm/enabled boolean true" | debconf-set-selections
-echo "samba-common samba-common/dhcp boolean false" | debconf-set-selections
-
-# install packages
-if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.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 $APT_OPTIONS2 \
- $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
-
-if grep slim $SCRIPT_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then
- sed -i 's,# hidecursor false,hidecursor false,g' /etc/slim.conf
- sed -i 's,screenshot_cmd scrot /root/slim.png,# screenshot_cmd scrot /root/slim.png,g' /etc/slim.conf
- if [ $PACKAGE_VARIANT = "minimal" ]; then
- sed -i 's,#default_user simone,default_user root,g' /etc/slim.conf
- else
- sed -i 's,#default_user simone,default_user live,g' /etc/slim.conf
- fi
- sed -i 's,#auto_login no,auto_login yes,g' /etc/slim.conf
- sed -i 's,current_theme debian-softwaves,current_theme minios,g' /etc/slim.conf
-fi
-
-# create user directories
-for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do
- mkdir -p /home/live/$dir >>$OUTPUT 2>&1
- mkdir -p /root/$dir >>$OUTPUT 2>&1
- mkdir -p /etc/skel/$dir >>$OUTPUT 2>&1
-done
-
-update-alternatives --install /usr/share/images/desktop-base/desktop-background desktop-background /usr/share/backgrounds/MiniOS-wallpaper.svg 100
-
- cat <>/usr/share/applications/htop.desktop
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Htop
-GenericName=Process Viewer
-GenericName[ca]=Visualitzador de processos
-GenericName[da]=Procesfremviser
-GenericName[de]=Prozessanzeige
-GenericName[en_GB]=Process Viewer
-GenericName[es]=Visor de procesos
-GenericName[fi]=Prosessikatselin
-GenericName[fr]=Visualiseur de processus
-GenericName[gl]=Visor de procesos
-GenericName[it]=Visore dei processi
-GenericName[ko]=프로세스 뷰어
-GenericName[nb]=Prosessviser
-GenericName[nl]=Viewer van processen
-GenericName[nn]=Prosessvisar
-GenericName[pl]=Przeglądarka procesów
-GenericName[pt]=Visualizador de Processos
-GenericName[pt_BR]=Visualizador de processos
-GenericName[ru]=Монитор процессов
-GenericName[sk]=Prehliadač procesov
-GenericName[sl]=Pregledovalnik opravil
-GenericName[sr@ijekavian]=Приказивач процеса
-GenericName[sr@ijekavianlatin]=Prikazivač procesa
-GenericName[sr@latin]=Prikazivač procesa
-GenericName[sr]=Приказивач процеса
-GenericName[sv]=Processvisning
-GenericName[tr]=Süreç Görüntüleyici
-GenericName[uk]=Перегляд процесів
-GenericName[zh_CN]=进程查看器
-GenericName[zh_TW]=行程檢視器
-Comment=Show System Processes
-Comment[ca]=Visualitzeu els processos del sistema
-Comment[da]=Vis systemprocesser
-Comment[de]=Systemprozesse anzeigen
-Comment[en_GB]=Show System Processes
-Comment[es]=Mostrar procesos del sistema
-Comment[fi]=Katsele järjestelmän prosesseja
-Comment[fr]=Affiche les processus système
-Comment[gl]=Mostrar os procesos do sistema.
-Comment[it]=Mostra processi di sistema
-Comment[ko]=시스템 프로세스 보기
-Comment[nb]=Vis systemprosesser
-Comment[nl]=Systeemprocessen tonen
-Comment[nn]=Vis systemprosessar
-Comment[pl]=Pokaż procesy systemowe
-Comment[pt]=Mostrar os Processos do Sistema
-Comment[pt_BR]=Mostra os processos do sistema
-Comment[ru]=Просмотр списка процессов в системе
-Comment[sk]=Zobraziť systémové procesy
-Comment[sl]=Prikaz sistemskih opravil
-Comment[sr@ijekavian]=Приказ системских процеса
-Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa
-Comment[sr@latin]=Prikaz sistemskih procesa
-Comment[sr]=Приказ системских процеса
-Comment[sv]=Visa systemprocesser
-Comment[tr]=Sistem Süreçlerini Göster
-Comment[uk]=Перегляд системних процесів
-Comment[zh_CN]=显示系统进程
-Comment[zh_TW]=顯示系統行程
-Icon=htop
-Exec=htop
-Terminal=true
-Categories=System;Monitor;ConsoleOnly;
-Keywords=system;process;task
-EOF
- cat <>/usr/share/applications/mc.desktop
-[Desktop Entry]
-Name=Midnight Commander
-Name[af]=Middernag Kommandeur
-Name[eo]=Meznokta komandanto
-Name[fa]=فرماندار نیمه شب
-Name[ko]=미드나잇 커멘더
-Name[lv]=Pusnakts Komandieris
-Name[nso]=Molaedi wa Bosegogare
-Name[th]=มิดไนท์คอมมานเดอร์
-Name[ve]=Muhulwane wa vhukati ha vhusiku
-Name[xh]=Umyaleli Waphakathi kobusuku
-Name[zu]=Umyaleli waphakathi nobusuku
-Comment=File manager
-Comment[pl]=Menedżer plików
-Exec=mc
-Icon=file-manager.png
-Terminal=true
-Type=Application
-Categories=ConsoleOnly;Utility;FileManager;System;FileTools;
-Keywords=file manager;console;
-EOF
- cat <>/usr/share/applications/debian-xterm.desktop
-[Desktop Entry]
-Name=XTerm
-#GenericName=Terminal
-Comment=standard terminal emulator for the X window system
-Exec=xterm
-Terminal=false
-Type=Application
-#Encoding=UTF-8
-Icon=Terminal
-Categories=System;TerminalEmulator;
-Keywords=shell;prompt;command;commandline;cmd;
-X-Desktop-File-Install-Version=0.26
-EOF
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/postinstall b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/postinstall
deleted file mode 100644
index f07d567..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/postinstall
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
-
-update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.cinnamon/configs/menu@cinnamon.org/0.json b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.cinnamon/configs/menu@cinnamon.org/0.json
deleted file mode 100644
index 0d68ace..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.cinnamon/configs/menu@cinnamon.org/0.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "layout": {
- "type": "layout",
- "pages": [
- "panel",
- "menu"
- ],
- "panel": {
- "type": "page",
- "title": "Panel",
- "sections": [
- "panel-appear",
- "panel-behave"
- ]
- },
- "menu": {
- "type": "page",
- "title": "Menu",
- "sections": [
- "menu-layout",
- "menu-behave"
- ]
- },
- "panel-appear": {
- "type": "section",
- "title": "Appearance",
- "keys": [
- "menu-custom",
- "menu-icon",
- "menu-icon-size",
- "menu-label"
- ]
- },
- "panel-behave": {
- "type": "section",
- "title": "Behavior",
- "keys": [
- "overlay-key",
- "activate-on-hover",
- "hover-delay",
- "force-show-panel",
- "enable-animation"
- ]
- },
- "menu-layout": {
- "type": "section",
- "title": "Layout and content",
- "keys": [
- "show-category-icons",
- "category-icon-size",
- "show-application-icons",
- "application-icon-size",
- "favbox-show",
- "fav-icon-size",
- "favbox-min-height",
- "show-places",
- "show-recents",
- "menu-editor-button"
- ]
- },
- "menu-behave": {
- "type": "section",
- "title": "Behavior",
- "keys": [
- "enable-autoscroll",
- "search-filesystem"
- ]
- }
- },
- "overlay-key": {
- "type": "keybinding",
- "description": "Keyboard shortcut to open and close the menu",
- "default": "Super_L::Super_R",
- "value": "Super_L::Super_R"
- },
- "menu-custom": {
- "type": "switch",
- "default": false,
- "description": "Use a custom icon and label",
- "tooltip": "Check this to specify a custom icon and label",
- "value": true
- },
- "menu-icon": {
- "type": "iconfilechooser",
- "default": "cinnamon-symbolic",
- "description": "Icon",
- "tooltip": "Select an icon to show in the panel.",
- "default_icon": "cinnamon-symbolic",
- "dependency": "menu-custom",
- "indent": true,
- "value": "/usr/share/pixmaps/MiniOS-white.svg"
- },
- "menu-icon-size": {
- "type": "spinbutton",
- "default": 32,
- "min": 16,
- "max": 96,
- "step": 1,
- "units": "px",
- "description": "Icon size",
- "dependency": "menu-custom",
- "indent": true,
- "value": 32
- },
- "menu-label": {
- "type": "entry",
- "default": "Menu",
- "description": "Text",
- "tooltip": "Enter custom text to show in the panel.",
- "dependency": "menu-custom",
- "indent": true,
- "value": ""
- },
- "favbox-min-height": {
- "type": "spinbutton",
- "default": 300,
- "min": 50,
- "max": 1000,
- "step": 10,
- "units": "px",
- "dependency": "favbox-show",
- "description": "Minimum height of the favorites section",
- "tooltip": "The minimum size allocated for the favorites section (this has an impact on the overall height of the menu).",
- "value": 300
- },
- "show-category-icons": {
- "type": "switch",
- "default": true,
- "description": "Show category icons",
- "tooltip": "Choose whether or not to show icons on categories.",
- "value": true
- },
- "category-icon-size": {
- "type": "spinbutton",
- "default": 22,
- "min": 16,
- "max": 48,
- "step": 1,
- "units": "px",
- "description": "Categories icon size",
- "dependency": "show-category-icons",
- "indent": true,
- "value": 22
- },
- "show-application-icons": {
- "type": "switch",
- "default": true,
- "description": "Show application icons",
- "tooltip": "Choose whether or not to show icons on applications.",
- "value": true
- },
- "application-icon-size": {
- "type": "spinbutton",
- "default": 22,
- "min": 16,
- "max": 48,
- "step": 1,
- "units": "px",
- "description": "Applications icon size",
- "dependency": "show-application-icons",
- "indent": true,
- "value": 22
- },
- "favbox-show": {
- "type": "switch",
- "default": true,
- "description": "Show favorites and session buttons",
- "tooltip": "Choose whether or not to show the left pane of the menu.",
- "value": true
- },
- "fav-icon-size": {
- "type": "spinbutton",
- "default": 32,
- "min": 16,
- "max": 64,
- "step": 1,
- "units": "px",
- "description": "Favorites icon size",
- "dependency": "favbox-show",
- "indent": true,
- "value": 32
- },
- "show-favorites": {
- "type": "switch",
- "default": true,
- "description": "Show favorites",
- "tooltip": "Choose whether or not to show favorite files in the menu.",
- "value": true
- },
- "show-places": {
- "type": "switch",
- "default": true,
- "description": "Show bookmarks and places",
- "tooltip": "Choose whether or not to show bookmarks and places in the menu.",
- "value": true
- },
- "show-recents": {
- "type": "switch",
- "default": true,
- "description": "Show recents",
- "tooltip": "Choose whether or not to show recents in the menu.",
- "value": true
- },
- "enable-autoscroll": {
- "type": "switch",
- "default": true,
- "description": "Enable autoscrolling in application list",
- "tooltip": "Choose whether or not to enable smooth autoscrolling in the application list.",
- "value": true
- },
- "search-filesystem": {
- "type": "switch",
- "default": false,
- "description": "Enable filesystem path entry in search box",
- "tooltip": "Allows path entry in the menu search box.",
- "value": false
- },
- "force-show-panel": {
- "type": "switch",
- "default": true,
- "description": "Force the panel to be visible when opening the menu",
- "tooltip": "Opening the menu will also show the main panel (which may be auto-hidden).",
- "value": true
- },
- "activate-on-hover": {
- "type": "switch",
- "default": false,
- "description": "Open the menu when I move my mouse over it",
- "tooltip": "Enable opening the menu when the mouse enters the applet",
- "value": false
- },
- "hover-delay": {
- "type": "spinbutton",
- "default": 0,
- "min": 0,
- "max": 1000,
- "step": 50,
- "units": "milliseconds",
- "dependency": "activate-on-hover",
- "description": "Menu hover delay",
- "tooltip": "Delay before the menu opens when hovered",
- "value": 0
- },
- "enable-animation": {
- "type": "switch",
- "default": false,
- "description": "Use menu animations",
- "tooltip": "Allow the menu to animate on open and close",
- "value": false
- },
- "menu-editor-button": {
- "type": "button",
- "description": "Open the menu editor",
- "callback": "_launch_editor",
- "tooltip": "Press this button to customize your menu entries."
- },
- "__md5__": "c4b27da93411965126569249b61793d7"
-}
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.config/dconf/user b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.config/dconf/user
deleted file mode 100644
index 92155e0..0000000
Binary files a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.config/dconf/user and /dev/null differ
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.xinitrc b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.xinitrc
deleted file mode 100644
index e741276..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.xinitrc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-xrdb -merge .Xresources
-
-exec cinnamon-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.xsession b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.xsession
deleted file mode 100644
index 1b09cae..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/etc/skel/.xsession
+++ /dev/null
@@ -1 +0,0 @@
-cinnamon-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.cinnamon/configs/menu@cinnamon.org/0.json b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.cinnamon/configs/menu@cinnamon.org/0.json
deleted file mode 100644
index 0d68ace..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.cinnamon/configs/menu@cinnamon.org/0.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "layout": {
- "type": "layout",
- "pages": [
- "panel",
- "menu"
- ],
- "panel": {
- "type": "page",
- "title": "Panel",
- "sections": [
- "panel-appear",
- "panel-behave"
- ]
- },
- "menu": {
- "type": "page",
- "title": "Menu",
- "sections": [
- "menu-layout",
- "menu-behave"
- ]
- },
- "panel-appear": {
- "type": "section",
- "title": "Appearance",
- "keys": [
- "menu-custom",
- "menu-icon",
- "menu-icon-size",
- "menu-label"
- ]
- },
- "panel-behave": {
- "type": "section",
- "title": "Behavior",
- "keys": [
- "overlay-key",
- "activate-on-hover",
- "hover-delay",
- "force-show-panel",
- "enable-animation"
- ]
- },
- "menu-layout": {
- "type": "section",
- "title": "Layout and content",
- "keys": [
- "show-category-icons",
- "category-icon-size",
- "show-application-icons",
- "application-icon-size",
- "favbox-show",
- "fav-icon-size",
- "favbox-min-height",
- "show-places",
- "show-recents",
- "menu-editor-button"
- ]
- },
- "menu-behave": {
- "type": "section",
- "title": "Behavior",
- "keys": [
- "enable-autoscroll",
- "search-filesystem"
- ]
- }
- },
- "overlay-key": {
- "type": "keybinding",
- "description": "Keyboard shortcut to open and close the menu",
- "default": "Super_L::Super_R",
- "value": "Super_L::Super_R"
- },
- "menu-custom": {
- "type": "switch",
- "default": false,
- "description": "Use a custom icon and label",
- "tooltip": "Check this to specify a custom icon and label",
- "value": true
- },
- "menu-icon": {
- "type": "iconfilechooser",
- "default": "cinnamon-symbolic",
- "description": "Icon",
- "tooltip": "Select an icon to show in the panel.",
- "default_icon": "cinnamon-symbolic",
- "dependency": "menu-custom",
- "indent": true,
- "value": "/usr/share/pixmaps/MiniOS-white.svg"
- },
- "menu-icon-size": {
- "type": "spinbutton",
- "default": 32,
- "min": 16,
- "max": 96,
- "step": 1,
- "units": "px",
- "description": "Icon size",
- "dependency": "menu-custom",
- "indent": true,
- "value": 32
- },
- "menu-label": {
- "type": "entry",
- "default": "Menu",
- "description": "Text",
- "tooltip": "Enter custom text to show in the panel.",
- "dependency": "menu-custom",
- "indent": true,
- "value": ""
- },
- "favbox-min-height": {
- "type": "spinbutton",
- "default": 300,
- "min": 50,
- "max": 1000,
- "step": 10,
- "units": "px",
- "dependency": "favbox-show",
- "description": "Minimum height of the favorites section",
- "tooltip": "The minimum size allocated for the favorites section (this has an impact on the overall height of the menu).",
- "value": 300
- },
- "show-category-icons": {
- "type": "switch",
- "default": true,
- "description": "Show category icons",
- "tooltip": "Choose whether or not to show icons on categories.",
- "value": true
- },
- "category-icon-size": {
- "type": "spinbutton",
- "default": 22,
- "min": 16,
- "max": 48,
- "step": 1,
- "units": "px",
- "description": "Categories icon size",
- "dependency": "show-category-icons",
- "indent": true,
- "value": 22
- },
- "show-application-icons": {
- "type": "switch",
- "default": true,
- "description": "Show application icons",
- "tooltip": "Choose whether or not to show icons on applications.",
- "value": true
- },
- "application-icon-size": {
- "type": "spinbutton",
- "default": 22,
- "min": 16,
- "max": 48,
- "step": 1,
- "units": "px",
- "description": "Applications icon size",
- "dependency": "show-application-icons",
- "indent": true,
- "value": 22
- },
- "favbox-show": {
- "type": "switch",
- "default": true,
- "description": "Show favorites and session buttons",
- "tooltip": "Choose whether or not to show the left pane of the menu.",
- "value": true
- },
- "fav-icon-size": {
- "type": "spinbutton",
- "default": 32,
- "min": 16,
- "max": 64,
- "step": 1,
- "units": "px",
- "description": "Favorites icon size",
- "dependency": "favbox-show",
- "indent": true,
- "value": 32
- },
- "show-favorites": {
- "type": "switch",
- "default": true,
- "description": "Show favorites",
- "tooltip": "Choose whether or not to show favorite files in the menu.",
- "value": true
- },
- "show-places": {
- "type": "switch",
- "default": true,
- "description": "Show bookmarks and places",
- "tooltip": "Choose whether or not to show bookmarks and places in the menu.",
- "value": true
- },
- "show-recents": {
- "type": "switch",
- "default": true,
- "description": "Show recents",
- "tooltip": "Choose whether or not to show recents in the menu.",
- "value": true
- },
- "enable-autoscroll": {
- "type": "switch",
- "default": true,
- "description": "Enable autoscrolling in application list",
- "tooltip": "Choose whether or not to enable smooth autoscrolling in the application list.",
- "value": true
- },
- "search-filesystem": {
- "type": "switch",
- "default": false,
- "description": "Enable filesystem path entry in search box",
- "tooltip": "Allows path entry in the menu search box.",
- "value": false
- },
- "force-show-panel": {
- "type": "switch",
- "default": true,
- "description": "Force the panel to be visible when opening the menu",
- "tooltip": "Opening the menu will also show the main panel (which may be auto-hidden).",
- "value": true
- },
- "activate-on-hover": {
- "type": "switch",
- "default": false,
- "description": "Open the menu when I move my mouse over it",
- "tooltip": "Enable opening the menu when the mouse enters the applet",
- "value": false
- },
- "hover-delay": {
- "type": "spinbutton",
- "default": 0,
- "min": 0,
- "max": 1000,
- "step": 50,
- "units": "milliseconds",
- "dependency": "activate-on-hover",
- "description": "Menu hover delay",
- "tooltip": "Delay before the menu opens when hovered",
- "value": 0
- },
- "enable-animation": {
- "type": "switch",
- "default": false,
- "description": "Use menu animations",
- "tooltip": "Allow the menu to animate on open and close",
- "value": false
- },
- "menu-editor-button": {
- "type": "button",
- "description": "Open the menu editor",
- "callback": "_launch_editor",
- "tooltip": "Press this button to customize your menu entries."
- },
- "__md5__": "c4b27da93411965126569249b61793d7"
-}
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.config/dconf/user b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.config/dconf/user
deleted file mode 100644
index 92155e0..0000000
Binary files a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.config/dconf/user and /dev/null differ
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.xinitrc b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.xinitrc
deleted file mode 100644
index e741276..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.xinitrc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-xrdb -merge .Xresources
-
-exec cinnamon-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.xsession b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.xsession
deleted file mode 100644
index 1b09cae..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/home/live/.xsession
+++ /dev/null
@@ -1 +0,0 @@
-cinnamon-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.cinnamon/configs/menu@cinnamon.org/0.json b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.cinnamon/configs/menu@cinnamon.org/0.json
deleted file mode 100644
index 0d68ace..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.cinnamon/configs/menu@cinnamon.org/0.json
+++ /dev/null
@@ -1,258 +0,0 @@
-{
- "layout": {
- "type": "layout",
- "pages": [
- "panel",
- "menu"
- ],
- "panel": {
- "type": "page",
- "title": "Panel",
- "sections": [
- "panel-appear",
- "panel-behave"
- ]
- },
- "menu": {
- "type": "page",
- "title": "Menu",
- "sections": [
- "menu-layout",
- "menu-behave"
- ]
- },
- "panel-appear": {
- "type": "section",
- "title": "Appearance",
- "keys": [
- "menu-custom",
- "menu-icon",
- "menu-icon-size",
- "menu-label"
- ]
- },
- "panel-behave": {
- "type": "section",
- "title": "Behavior",
- "keys": [
- "overlay-key",
- "activate-on-hover",
- "hover-delay",
- "force-show-panel",
- "enable-animation"
- ]
- },
- "menu-layout": {
- "type": "section",
- "title": "Layout and content",
- "keys": [
- "show-category-icons",
- "category-icon-size",
- "show-application-icons",
- "application-icon-size",
- "favbox-show",
- "fav-icon-size",
- "favbox-min-height",
- "show-places",
- "show-recents",
- "menu-editor-button"
- ]
- },
- "menu-behave": {
- "type": "section",
- "title": "Behavior",
- "keys": [
- "enable-autoscroll",
- "search-filesystem"
- ]
- }
- },
- "overlay-key": {
- "type": "keybinding",
- "description": "Keyboard shortcut to open and close the menu",
- "default": "Super_L::Super_R",
- "value": "Super_L::Super_R"
- },
- "menu-custom": {
- "type": "switch",
- "default": false,
- "description": "Use a custom icon and label",
- "tooltip": "Check this to specify a custom icon and label",
- "value": true
- },
- "menu-icon": {
- "type": "iconfilechooser",
- "default": "cinnamon-symbolic",
- "description": "Icon",
- "tooltip": "Select an icon to show in the panel.",
- "default_icon": "cinnamon-symbolic",
- "dependency": "menu-custom",
- "indent": true,
- "value": "/usr/share/pixmaps/MiniOS-white.svg"
- },
- "menu-icon-size": {
- "type": "spinbutton",
- "default": 32,
- "min": 16,
- "max": 96,
- "step": 1,
- "units": "px",
- "description": "Icon size",
- "dependency": "menu-custom",
- "indent": true,
- "value": 32
- },
- "menu-label": {
- "type": "entry",
- "default": "Menu",
- "description": "Text",
- "tooltip": "Enter custom text to show in the panel.",
- "dependency": "menu-custom",
- "indent": true,
- "value": ""
- },
- "favbox-min-height": {
- "type": "spinbutton",
- "default": 300,
- "min": 50,
- "max": 1000,
- "step": 10,
- "units": "px",
- "dependency": "favbox-show",
- "description": "Minimum height of the favorites section",
- "tooltip": "The minimum size allocated for the favorites section (this has an impact on the overall height of the menu).",
- "value": 300
- },
- "show-category-icons": {
- "type": "switch",
- "default": true,
- "description": "Show category icons",
- "tooltip": "Choose whether or not to show icons on categories.",
- "value": true
- },
- "category-icon-size": {
- "type": "spinbutton",
- "default": 22,
- "min": 16,
- "max": 48,
- "step": 1,
- "units": "px",
- "description": "Categories icon size",
- "dependency": "show-category-icons",
- "indent": true,
- "value": 22
- },
- "show-application-icons": {
- "type": "switch",
- "default": true,
- "description": "Show application icons",
- "tooltip": "Choose whether or not to show icons on applications.",
- "value": true
- },
- "application-icon-size": {
- "type": "spinbutton",
- "default": 22,
- "min": 16,
- "max": 48,
- "step": 1,
- "units": "px",
- "description": "Applications icon size",
- "dependency": "show-application-icons",
- "indent": true,
- "value": 22
- },
- "favbox-show": {
- "type": "switch",
- "default": true,
- "description": "Show favorites and session buttons",
- "tooltip": "Choose whether or not to show the left pane of the menu.",
- "value": true
- },
- "fav-icon-size": {
- "type": "spinbutton",
- "default": 32,
- "min": 16,
- "max": 64,
- "step": 1,
- "units": "px",
- "description": "Favorites icon size",
- "dependency": "favbox-show",
- "indent": true,
- "value": 32
- },
- "show-favorites": {
- "type": "switch",
- "default": true,
- "description": "Show favorites",
- "tooltip": "Choose whether or not to show favorite files in the menu.",
- "value": true
- },
- "show-places": {
- "type": "switch",
- "default": true,
- "description": "Show bookmarks and places",
- "tooltip": "Choose whether or not to show bookmarks and places in the menu.",
- "value": true
- },
- "show-recents": {
- "type": "switch",
- "default": true,
- "description": "Show recents",
- "tooltip": "Choose whether or not to show recents in the menu.",
- "value": true
- },
- "enable-autoscroll": {
- "type": "switch",
- "default": true,
- "description": "Enable autoscrolling in application list",
- "tooltip": "Choose whether or not to enable smooth autoscrolling in the application list.",
- "value": true
- },
- "search-filesystem": {
- "type": "switch",
- "default": false,
- "description": "Enable filesystem path entry in search box",
- "tooltip": "Allows path entry in the menu search box.",
- "value": false
- },
- "force-show-panel": {
- "type": "switch",
- "default": true,
- "description": "Force the panel to be visible when opening the menu",
- "tooltip": "Opening the menu will also show the main panel (which may be auto-hidden).",
- "value": true
- },
- "activate-on-hover": {
- "type": "switch",
- "default": false,
- "description": "Open the menu when I move my mouse over it",
- "tooltip": "Enable opening the menu when the mouse enters the applet",
- "value": false
- },
- "hover-delay": {
- "type": "spinbutton",
- "default": 0,
- "min": 0,
- "max": 1000,
- "step": 50,
- "units": "milliseconds",
- "dependency": "activate-on-hover",
- "description": "Menu hover delay",
- "tooltip": "Delay before the menu opens when hovered",
- "value": 0
- },
- "enable-animation": {
- "type": "switch",
- "default": false,
- "description": "Use menu animations",
- "tooltip": "Allow the menu to animate on open and close",
- "value": false
- },
- "menu-editor-button": {
- "type": "button",
- "description": "Open the menu editor",
- "callback": "_launch_editor",
- "tooltip": "Press this button to customize your menu entries."
- },
- "__md5__": "c4b27da93411965126569249b61793d7"
-}
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.config/dconf/user b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.config/dconf/user
deleted file mode 100644
index 92155e0..0000000
Binary files a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.config/dconf/user and /dev/null differ
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.xinitrc b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.xinitrc
deleted file mode 100644
index e741276..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.xinitrc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-xrdb -merge .Xresources
-
-exec cinnamon-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.xsession b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.xsession
deleted file mode 100644
index 1b09cae..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-install/root/.xsession
+++ /dev/null
@@ -1 +0,0 @@
-cinnamon-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/debian-xterm.desktop b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/debian-xterm.desktop
deleted file mode 100644
index 94836b9..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/debian-xterm.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=XTerm
-#GenericName=Terminal
-Comment=standard terminal emulator for the X window system
-Exec=xterm
-Terminal=false
-Type=Application
-#Encoding=UTF-8
-Icon=xterm
-Categories=System;TerminalEmulator;
-Keywords=shell;prompt;command;commandline;cmd;
-X-Desktop-File-Install-Version=0.26
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/htop.desktop b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/htop.desktop
deleted file mode 100644
index ebdeed0..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/htop.desktop
+++ /dev/null
@@ -1,67 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Htop
-GenericName=Process Viewer
-GenericName[ca]=Visualitzador de processos
-GenericName[da]=Procesfremviser
-GenericName[de]=Prozessanzeige
-GenericName[en_GB]=Process Viewer
-GenericName[es]=Visor de procesos
-GenericName[fi]=Prosessikatselin
-GenericName[fr]=Visualiseur de processus
-GenericName[gl]=Visor de procesos
-GenericName[it]=Visore dei processi
-GenericName[ko]=프로세스 뷰어
-GenericName[nb]=Prosessviser
-GenericName[nl]=Viewer van processen
-GenericName[nn]=Prosessvisar
-GenericName[pl]=Przeglądarka procesów
-GenericName[pt]=Visualizador de Processos
-GenericName[pt_BR]=Visualizador de processos
-GenericName[ru]=Монитор процессов
-GenericName[sk]=Prehliadač procesov
-GenericName[sl]=Pregledovalnik opravil
-GenericName[sr@ijekavian]=Приказивач процеса
-GenericName[sr@ijekavianlatin]=Prikazivač procesa
-GenericName[sr@latin]=Prikazivač procesa
-GenericName[sr]=Приказивач процеса
-GenericName[sv]=Processvisning
-GenericName[tr]=Süreç Görüntüleyici
-GenericName[uk]=Перегляд процесів
-GenericName[zh_CN]=进程查看器
-GenericName[zh_TW]=行程檢視器
-Comment=Show System Processes
-Comment[ca]=Visualitzeu els processos del sistema
-Comment[da]=Vis systemprocesser
-Comment[de]=Systemprozesse anzeigen
-Comment[en_GB]=Show System Processes
-Comment[es]=Mostrar procesos del sistema
-Comment[fi]=Katsele järjestelmän prosesseja
-Comment[fr]=Affiche les processus système
-Comment[gl]=Mostrar os procesos do sistema.
-Comment[it]=Mostra processi di sistema
-Comment[ko]=시스템 프로세스 보기
-Comment[nb]=Vis systemprosesser
-Comment[nl]=Systeemprocessen tonen
-Comment[nn]=Vis systemprosessar
-Comment[pl]=Pokaż procesy systemowe
-Comment[pt]=Mostrar os Processos do Sistema
-Comment[pt_BR]=Mostra os processos do sistema
-Comment[ru]=Просмотр списка процессов в системе
-Comment[sk]=Zobraziť systémové procesy
-Comment[sl]=Prikaz sistemskih opravil
-Comment[sr@ijekavian]=Приказ системских процеса
-Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa
-Comment[sr@latin]=Prikaz sistemskih procesa
-Comment[sr]=Приказ системских процеса
-Comment[sv]=Visa systemprocesser
-Comment[tr]=Sistem Süreçlerini Göster
-Comment[uk]=Перегляд системних процесів
-Comment[zh_CN]=显示系统进程
-Comment[zh_TW]=顯示系統行程
-Icon=utilities-system-monitor
-Exec=htop
-Terminal=true
-Categories=System;Monitor;ConsoleOnly;
-Keywords=system;process;task
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/mc.desktop b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/mc.desktop
deleted file mode 100644
index 2027318..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/mc.desktop
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Name=Midnight Commander
-Name[af]=Middernag Kommandeur
-Name[eo]=Meznokta komandanto
-Name[fa]=فرماندار نیمه شب
-Name[ko]=미드나잇 커멘더
-Name[lv]=Pusnakts Komandieris
-Name[nso]=Molaedi wa Bosegogare
-Name[th]=มิดไนท์คอมมานเดอร์
-Name[ve]=Muhulwane wa vhukati ha vhusiku
-Name[xh]=Umyaleli Waphakathi kobusuku
-Name[zu]=Umyaleli waphakathi nobusuku
-Comment=File manager
-Comment[pl]=Menedżer plików
-Exec=mc
-Icon=file-manager.png
-Terminal=true
-Type=Application
-Categories=ConsoleOnly;Utility;FileManager;System;FileTools;
-Keywords=file manager;console;
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/ncdu.desktop b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/ncdu.desktop
deleted file mode 100644
index 6ab9888..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/ncdu.desktop
+++ /dev/null
@@ -1,179 +0,0 @@
-[Desktop Entry]
-Name[af]=Skyfgebruik
-Name[an]=Analizador d'uso de disco
-Name[ar]=محلّل استخدام القرص
-Name[as]=ডিস্ক ব্যৱহাৰ বিশ্লেষক
-Name[ast]=Analizador d'Usu de Discu
-Name[be]=Аналіз дыскавай прасторы
-Name[be@latin]=Analizatar zaniataści dyskavaj prastory
-Name[bg]=Анализатор на ползването на диска
-Name[bn]=ডিস্ক ব্যবহারের বিশ্লেষণ ব্যবস্থা
-Name[bn_IN]=ডিস্ক ব্যবহারের বিশ্লেষণ ব্যবস্থা
-Name[br]=Dezranner arver ar c'hantennoù
-Name[bs]=Alat za analizu upotrebe diska
-Name[ca]=Analitzador de l'ús dels discs
-Name[ca@valencia]=Analitzador de l'ús dels discs
-Name[crh]=Disk Qullanımı Tahlilcisi
-Name[cs]=Analyzátor využití disku
-Name[da]=Diskforbrugsanalyse
-Name[de]=Festplattenbelegungsanalyse
-Name[dz]=ཌིཀསི་གི་བེད་སྤྱོད་དཔྱད་ཞིབ་པ།
-Name[el]=Αναλυτής χρήσης δίσκου
-Name[en_GB]=Disk Usage Analyser
-Name[en@shaw]=𐑛𐑦𐑕𐑒 𐑿𐑕𐑦𐑡 𐑨𐑯𐑩𐑤𐑲𐑟𐑻
-Name[eo]=Diskuzada analizilo
-Name[es]=Analizador de uso de disco
-Name[et]=Kettakasutuse analüsaator
-Name[eu]=Disko-erabileraren analizatzailea
-Name[fa]=تحلیلگر مصرف دیسک
-Name[fi]=Levynkäytön analysointi
-Name[fr]=Analyseur d’utilisation des disques
-Name[fur]=Analizadôr di utilizazion dal disc
-Name[ga]=Anailíseoir Úsáid Diosca
-Name[gd]=Sgrùdair cleachdadh nan diosga
-Name[gl]=Analizador do uso do disco
-Name[gu]=ડિસ્ક વપરાશકર્તા વિશ્લેષક
-Name[he]=מנתח השימוש בכונן
-Name[hi]=डिस्क प्रयोग विश्लेषण
-Name[hr]=Analizator iskoristivosti diska
-Name[hu]=Lemezhasználat-elemző
-Name[id]=Penganalisa Penggunaan Diska
-Name[is]=Diskapláss
-Name[it]=Analizzatore di utilizzo del disco
-Name[ja]=ディスク使用量アナライザー
-Name[kk]=Диск қолдануын анализдеушісі
-Name[km]=កម្មវិធីវិភាគការប្រើថាស
-Name[kn]=ಡಿಸ್ಕ್ ಬಳಕೆಯ ವಿಶ್ಲೇಷಕ
-Name[ko]=디스크 사용량 분석
-Name[ku]=Analîzkerê Bikaranîna Dîskê
-Name[lt]=Disko naudojimo analizatorius
-Name[lv]=Diska izmantojuma analizators
-Name[mai]=डिस्क प्रयोग विश्लेषण
-Name[mjw]=Disk Usage Analyzer
-Name[mk]=Употребата на дискот
-Name[ml]=ഡിസ്ക് യൂസേജ് അനലൈസർ
-Name[mr]=डीस्क वापर विश्लेषक
-Name[ms]=Penganalisis Penggunaan Cakera
-Name[nb]=Analyse av diskplass
-Name[nds]=Spiekergebruk unnersöken
-Name[ne]=डिस्क प्रयोग विश्लेषक
-Name[nl]=Schijfgebruik
-Name[nn]=Analyse av diskplass
-Name[oc]=Analisador d'utilizacion dels disques
-Name[or]=ଡିସ୍କ ବ୍ଯବହାର ବିଧି ବିଶ୍ଳେଷକ
-Name[pa]=ਡਿਸਕ ਵਰਤੋਂ ਜਾਂਚਕਾਰ
-Name[pl]=Wykorzystanie dysku
-Name[ps]=د ټيکلي کارونې شننونکی
-Name[pt]=Analisador de utilização do disco
-Name[pt_BR]=Analisador de uso de disco
-Name[ro]=Analizatorul utilizării discului
-Name[ru]=Анализатор использования дисков
-Name[si]=තැටි භාවිත විශ්ලේෂකය
-Name[sk]=Analyzátor využitia disku
-Name[sl]=Orodje za preučevanje porabe diska
-Name[sr]=Испитивач искоришћености диска
-Name[sr@latin]=Ispitivač iskorišćenosti diska
-Name[sv]=Diskanvändningsanalysator
-Name[ta]=வட்டு பயன்பாடு ஆராய்வி
-Name[te]=డిస్క్ వినిమయ విశ్లేషకం
-Name[tg]=Таҳлилгари истифодаи диск
-Name[th]=เครื่องมือวิเคราะห์การใช้ดิสก์
-Name[tr]=Disk Kullanımı İnceleyici
-Name[ug]=دىسكا ئىشلىتىش تەھلىلچىسى
-Name[uk]=Аналізатор використання диска
-Name[vi]=Bộ phân tích đĩa
-Name[zh_CN]=磁盘使用情况分析器
-Name[zh_HK]=磁碟用量分析器
-Name[zh_TW]=磁碟用量分析器
-Name=Disk Usage Analyzer
-Comment[af]=Kontroleer gidsgroottes en beskikbare skyfspasie
-Comment[an]=Compreba la grandaria d'as carpetas y lo espacio disponible en disco
-Comment[ar]=افحص حجم المجلدات والمساحة المتوفرة
-Comment[as]=ফোল্ডাৰৰ মাপ আৰু ডিস্কত উপলব্ধ স্থান নিৰীক্ষণ কৰক
-Comment[ast]=Comprobar el tamañu de les carpetes y l'espaciu disponible en discu
-Comment[be]=Праверка памеру папак і выкарыстання дыскавай прасторы
-Comment[be@latin]=Spraŭdź pamiery katalohaŭ i dyskavuju prastoru
-Comment[bg]=Проверка на размерите на папките и свободното пространство на диска
-Comment[bn]=ফোল্ডারের মাপ ও ডিস্কে বিদ্যমান স্থান পরীক্ষা করা হবে
-Comment[bn_IN]=ফোল্ডারের মাপ ও ডিস্কে উপলব্ধ স্থান পরীক্ষা করা হবে
-Comment[br]=Gwiriañ mentoù an teuliadoù ha plas hegerz war ar gantennad
-Comment[bs]=Provjeri veličinu direktorija i raspoloživ prostor na disku
-Comment[ca]=Comprova la mida de les carpetes i l'espai disponible al disc
-Comment[ca@valencia]=Comprova la mida de les carpetes i l'espai disponible al disc
-Comment[ckb]=چێکردنی قەبارەی بوخچە و بۆشایی بەردەست لە پەپکەکاندا
-Comment[crh]=Cilbent ölçülerini ve faydalanışlı disk fezasını teşker
-Comment[cs]=Zkontrolovat velikost složek a dostupné místo na disku
-Comment[da]=Kontrollér mappestørrelser og tilgængelig diskplads
-Comment[de]=Ordnergrößen und freien Festplattenplatz analysieren
-Comment[dz]=ཡིག་སྣོད་ཀྱི་ཚད་ཚུ་དང་འཐོབ་ཚུགས་པའི་ཌིཀསི་ས་སྟོང་ཞིབ་དཔྱད་འབད
-Comment[el]=Έλεγχος μεγέθους φακέλων και διαθέσιμου χώρου στο δίσκο
-Comment[en_GB]=Check folder sizes and available disk space
-Comment[en@shaw]=𐑗𐑧𐑒 𐑓𐑴𐑤𐑛𐑼 𐑕𐑲𐑟𐑩𐑟 𐑯 𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤 𐑛𐑦𐑕𐑒 𐑕𐑐𐑱𐑕
-Comment[eo]=Kontroli dosierujajn grandojn kaj disponeblan diskmemoron
-Comment[es]=Compruebe el tamaño de las carpetas y el espacio disponible en disco
-Comment[et]=Kaustade suuruse ja saadaoleva kettaruumi kontroll
-Comment[eu]=Egiaztatu karpeten tamainak eta diskoan dagoen leku erabilgarria
-Comment[fa]=بررسی اندازهٔ شاخهها و فضای دیسک موجود
-Comment[fi]=Tarkista kansioiden koko ja käytettävissä oleva levytila
-Comment[fr]=Vérifier la taille des dossiers et l’espace disque disponible
-Comment[fur]=Controle la dimension des cartelis e il spazi libar sul disc
-Comment[ga]=Seiceáil méideanna fillteán agus spás diosca le fáil
-Comment[gd]=Thoir sùil air meud nam pasganan ’s an rum shaor air an diosga
-Comment[gl]=Verificar o tamaño dos cartafoles e o espazo dispoñíbel no disco
-Comment[gu]=ફોલ્ડર માપો અને ઉપલબ્ધ ડિસ્ક જગ્યા ચકાસો
-Comment[he]=בדיקת גדלי התיקיות והמקום פנוי בכונן
-Comment[hi]=फोल्डर आकार जाँचें और उपलब्ध डिस्क स्थान
-Comment[hr]=Provjerite veličinu mapa i dostupan prostor na disku
-Comment[hu]=Mappaméretek és elérhető lemezterület vizsgálata
-Comment[id]=Periksa ukuran folder dan ruang diska yang tersedia
-Comment[is]=Athuga hve mikið pláss skrár taka á tölvunni og hve mikið pláss er eftir
-Comment[it]=Controlla la dimensione delle cartelle e lo spazio disco disponibile
-Comment[ja]=フォルダーと利用可能なディスク容量をチェックします
-Comment[kk]=Бумалар өлшемдерін және дисктердегі қолжетерлік орынды тексеру
-Comment[km]=ពិនិត្យមើលទំហំថត និងទំហំថាសដែលអាចប្រើបាន
-Comment[kn]=ಕಡತಕೋಶದ ಗಾತ್ರಗಳು ಹಾಗು ಲಭ್ಯವಿರುವ ಡಿಸ್ಕಿನ ಜಾಗಕ್ಕಾಗಿ ನೋಡು
-Comment[ko]=폴더 용량과 디스크의 빈 공간을 검사합니다
-Comment[lt]=Tikrinti aplankų dydžius ir laisvą vietą
-Comment[lv]=Pārbauda mapju izmērus un pieejamo diska vietu
-Comment[mjw]=Folder apun lapen disk space angse kelang
-Comment[mk]=Провери ја големината на папките и достапниот простор на дискот
-Comment[ml]=ഫോൾഡറുകളുടെ വ്യാപ്തിയും ഡിസ്കില് ലഭ്യമായ സ്ഥലവും പരിശോധിയ്ക്കുക
-Comment[mr]=फोल्डर आकार व उपलब्ध डीस्क जागा तपासा
-Comment[ms]=Periksa saiz folder dan ruang cakera yang tersedia
-Comment[nb]=Sjekk mappestørrelser og tilgjengelig diskplass
-Comment[ne]=फोल्डर साइज र उपलब्ध डिस्क खालीस्थान जाँच गर्नुहोस्
-Comment[nl]=Mapgroottes en beschikbare schijfruimte bekijken
-Comment[nn]=Undersøk mappestorleikar og tilgjengeleg diskplass
-Comment[oc]=Verificar la talha dels dorsièrs e l'espaci de disc disponible
-Comment[or]=ଫୋଲଡରର ଆକାର ଏବଂ ଉପଲବ୍ଧ ଡିସ୍କ ସ୍ଥାନ ଯାଞ୍ଚ କରନ୍ତୁ
-Comment[pa]=ਫੋਲਡਰ ਸਾਇਜ਼ ਅਤੇ ਉਪਲੱਬਧ ਡਿਸਕ ਥਾਂ ਚੈੱਕ ਕਰੋ
-Comment[pl]=Wyświetlanie rozmiaru katalogów i dostępnego miejsca na dysku
-Comment[ps]=د پوښۍ کچونه او شته ټيکلی تشه وګورﺉ
-Comment[pt]=Verificar o tamanho das pastas e o espaço disponível em disco
-Comment[pt_BR]=Verifique o tamanho de pastas e o espaço disponível em disco
-Comment[ro]=Verifică dimensiunea dosarului și spațiul disponibil pe disc
-Comment[ru]=Изучение размера папок и свободного места на дисках
-Comment[sk]=Kontroluje veľkosti priečinkov a dostupné miesto na disku
-Comment[sl]=Preveri velikosti map in prostor na disku
-Comment[sr]=Проверите величине фасцикли и слободан простор на диску
-Comment[sr@latin]=Proverite veličine fascikli i slobodan prostor na disku
-Comment[sv]=Kontrollera mappstorlekar och tillgängligt diskutrymme
-Comment[ta]=அடைவு அளவு மற்றும் கிடைக்கக்கூடிய வட்டு இடைவெளி ஆகியவற்றை சரிபார்
-Comment[te]=అందుబాటులోవున్న డిస్క్ స్థలం మరియు సంచయపు పరిమాణాలను తనిఖీచేయి
-Comment[tg]=Санҷиши андозаи ҷузвдонҳо ва фазои диски дастрас
-Comment[th]=ตรวจสอบขนาดของโฟลเดอร์ต่างๆ และเนื้อที่ว่างในดิสก์
-Comment[tr]=Klasör boyutlarını ve kullanılabilir disk alanını denetle
-Comment[ug]=قىسقۇچ چوڭلۇقى ۋە ئىشلىتىشكە بولىدىغان دىسكا بوشلۇقىنى تەكشۈر
-Comment[uk]=Перевірте розміри тек та дисковий простір
-Comment[vi]=Kiểm tra kích cỡ của thư mục và chỗ trống trên đĩa
-Comment[zh_CN]=检查文件夹大小和可用磁盘空间
-Comment[zh_HK]=檢查資料夾大小與可用的磁碟空間
-Comment[zh_TW]=檢查資料夾大小與可用的磁碟空間
-Comment=Check folder sizes and available disk space
-Keywords=storage;space;cleanup;
-TryExec=ncdu
-Exec=ncdu
-Icon=baobab
-Terminal=true
-Type=Application
-Categories=ConsoleOnly;System;Filesystem;Utility;
diff --git a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/standard.list b/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/standard.list
deleted file mode 100644
index 7eb4f53..0000000
--- a/minios-modules/usr/share/minios/modules/03-cinnamon-desktop/standard.list
+++ /dev/null
@@ -1,8 +0,0 @@
-locales
-dbus-x11
-slim
-cinnamon-core
-gvfs-backends
-samba-common
-avahi-daemon
-faenza-icon-theme
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/install b/minios-modules/usr/share/minios/modules/03-xfce-desktop/install
deleted file mode 100644
index 7fa1c29..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/install
+++ /dev/null
@@ -1,638 +0,0 @@
-#!/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")")"
-
-GTKUI="2"
-
-if [ $DISTRIBUTION = "buster" ] && [ $GTKUI = "3" ]; then
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD update >>$OUTPUT 2>&1 &&
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- gnupg curl >>$OUTPUT 2>&1
- echo "deb http://mxrepo.com/mx/repo/ temp main" >>/etc/apt/sources.list
- curl -L https://cyber-x.ru/wp-content/upload/mx19/mx19.gpg | sudo apt-key add -
-fi
-
-echo "nodm nodm/enabled boolean true" | debconf-set-selections
-echo "samba-common samba-common/dhcp boolean false" | debconf-set-selections
-
-# install packages
-if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.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 $APT_OPTIONS2 \
- $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
-
-# install packages
-if [ $DISTRIBUTION = "stretch" ]; then
- wget -c http://ftp.ru.debian.org/debian/pool/main/e/elementary-xfce/elementary-xfce-icon-theme_0.15.2-1_all.deb
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD update >>$OUTPUT 2>&1 &&
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- ./elementary-xfce-icon-theme_0.15.2-1_all.deb >>$OUTPUT 2>&1
- rm -f ./elementary-xfce-icon-theme_0.15.2-1_all.deb >>$OUTPUT 2>&1
-else
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD update >>$OUTPUT 2>&1 &&
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- elementary-xfce-icon-theme >>$OUTPUT 2>&1
-fi
-
-if [ $DISTRIBUTION = "buster" ] && [ $GTKUI = "3" ]; then
- sed -i "s,deb http://mxrepo.com/mx/repo/ temp main,#deb http://mxrepo.com/mx/repo/ temp main,g" /etc/apt/sources.list
-fi
-
-if [ $DISTRIBUTION = "bullseye" ]; then
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- librsvg2-common >>$OUTPUT 2>&1
-fi
-
-if grep xfce4-whiskermenu-plugin $SCRIPT_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then
- if [ $DISTRIBUTION = "buster" ] || [ $DISTRIBUTION = "stretch" ]; then
- echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
- echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/root/.config/xfce4/panel/whiskermenu-1.rc
- echo "favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop" >/home/live/.config/xfce4/panel/whiskermenu-1.rc
- elif [ $DISTRIBUTION = "bullseye" ]; then
- echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
- echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/root/.config/xfce4/panel/whiskermenu-1.rc
- echo "favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop" >/home/live/.config/xfce4/panel/whiskermenu-1.rc
- fi
- cat <>/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
-recent=
-button-icon=/usr/share/pixmaps/MiniOS-white.svg
-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=false
-view-as-icons=false
-default-category=0
-recent-items-max=10
-favorites-in-recent=true
-position-search-alternate=true
-position-commands-alternate=false
-position-categories-alternate=true
-stay-on-focus-out=false
-confirm-session-command=true
-menu-width=450
-menu-height=500
-menu-opacity=100
-command-settings=xfce4-settings-manager
-show-command-settings=false
-command-lockscreen=xflock4
-show-command-lockscreen=false
-command-switchuser=dm-tool switch-to-greeter
-show-command-switchuser=false
-command-logoutuser=xfce4-session-logout --logout --fast
-show-command-logoutuser=false
-command-restart=xfce4-session-logout --reboot --fast
-show-command-restart=false
-command-shutdown=xfce4-session-logout --halt --fast
-show-command-shutdown=false
-command-suspend=xfce4-session-logout --suspend
-show-command-suspend=false
-command-hibernate=xfce4-session-logout --hibernate
-show-command-hibernate=false
-command-logout=xfce4-session-logout
-show-command-logout=true
-command-menueditor=menulibre
-show-command-menueditor=true
-command-profile=mugshot
-show-command-profile=false
-search-actions=5
-
-[action0]
-name=Man Pages
-pattern=#
-command=exo-open --launch TerminalEmulator man %s
-regex=false
-
-[action1]
-name=Web Search
-pattern=?
-command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
-regex=false
-
-[action2]
-name=Wikipedia
-pattern=!w
-command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
-regex=false
-
-[action3]
-name=Run in Terminal
-pattern=!
-command=exo-open --launch TerminalEmulator %s
-regex=false
-
-[action4]
-name=Open URI
-pattern=^(file|http|https):\\/\\/(.*)$
-command=exo-open \\0
-regex=true
-
-
-EOF
- cat <>/root/.config/xfce4/panel/whiskermenu-1.rc
-recent=
-button-icon=/usr/share/pixmaps/MiniOS-white.svg
-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=false
-view-as-icons=false
-default-category=0
-recent-items-max=10
-favorites-in-recent=true
-position-search-alternate=true
-position-commands-alternate=false
-position-categories-alternate=true
-stay-on-focus-out=false
-confirm-session-command=true
-menu-width=450
-menu-height=500
-menu-opacity=100
-command-settings=xfce4-settings-manager
-show-command-settings=false
-command-lockscreen=xflock4
-show-command-lockscreen=false
-command-switchuser=dm-tool switch-to-greeter
-show-command-switchuser=false
-command-logoutuser=xfce4-session-logout --logout --fast
-show-command-logoutuser=false
-command-restart=xfce4-session-logout --reboot --fast
-show-command-restart=false
-command-shutdown=xfce4-session-logout --halt --fast
-show-command-shutdown=false
-command-suspend=xfce4-session-logout --suspend
-show-command-suspend=false
-command-hibernate=xfce4-session-logout --hibernate
-show-command-hibernate=false
-command-logout=xfce4-session-logout
-show-command-logout=true
-command-menueditor=menulibre
-show-command-menueditor=true
-command-profile=mugshot
-show-command-profile=false
-search-actions=5
-
-[action0]
-name=Man Pages
-pattern=#
-command=exo-open --launch TerminalEmulator man %s
-regex=false
-
-[action1]
-name=Web Search
-pattern=?
-command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
-regex=false
-
-[action2]
-name=Wikipedia
-pattern=!w
-command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
-regex=false
-
-[action3]
-name=Run in Terminal
-pattern=!
-command=exo-open --launch TerminalEmulator %s
-regex=false
-
-[action4]
-name=Open URI
-pattern=^(file|http|https):\\/\\/(.*)$
-command=exo-open \\0
-regex=true
-
-
-EOF
- cat <>/home/live/.config/xfce4/panel/whiskermenu-1.rc
-recent=
-button-icon=/usr/share/pixmaps/MiniOS-white.svg
-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=false
-view-as-icons=false
-default-category=0
-recent-items-max=10
-favorites-in-recent=true
-position-search-alternate=true
-position-commands-alternate=false
-position-categories-alternate=true
-stay-on-focus-out=false
-confirm-session-command=true
-menu-width=450
-menu-height=500
-menu-opacity=100
-command-settings=xfce4-settings-manager
-show-command-settings=false
-command-lockscreen=xflock4
-show-command-lockscreen=false
-command-switchuser=dm-tool switch-to-greeter
-show-command-switchuser=false
-command-logoutuser=xfce4-session-logout --logout --fast
-show-command-logoutuser=false
-command-restart=xfce4-session-logout --reboot --fast
-show-command-restart=false
-command-shutdown=xfce4-session-logout --halt --fast
-show-command-shutdown=false
-command-suspend=xfce4-session-logout --suspend
-show-command-suspend=false
-command-hibernate=xfce4-session-logout --hibernate
-show-command-hibernate=false
-command-logout=xfce4-session-logout
-show-command-logout=true
-command-menueditor=menulibre
-show-command-menueditor=true
-command-profile=mugshot
-show-command-profile=false
-search-actions=5
-
-[action0]
-name=Man Pages
-pattern=#
-command=exo-open --launch TerminalEmulator man %s
-regex=false
-
-[action1]
-name=Web Search
-pattern=?
-command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
-regex=false
-
-[action2]
-name=Wikipedia
-pattern=!w
-command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
-regex=false
-
-[action3]
-name=Run in Terminal
-pattern=!
-command=exo-open --launch TerminalEmulator %s
-regex=false
-
-[action4]
-name=Open URI
-pattern=^(file|http|https):\\/\\/(.*)$
-command=exo-open \\0
-regex=true
-
-
-EOF
- #echo $WHISKERMENU >>/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
- #echo $WHISKERMENU >>/root/.config/xfce4/panel/whiskermenu-1.rc
- #echo $WHISKERMENU >>/home/live/.config/xfce4/panel/whiskermenu-1.rc
-else
- #read -r -d MINIMAL_PANEL '' </etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF
- cat </root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF
- cat </home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOF
- #echo $MINIMAL_PANEL >>/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
- #echo $MINIMAL_PANEL >>/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
- #echo $MINIMAL_PANEL >>/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
-fi
-
-if [ $PACKAGE_VARIANT = "minimal" ]; then
- cat </etc/skel/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=pcmanfm
-WebBrowser=
-
-EOF
- cat </home/live/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=pcmanfm
-WebBrowser=
-
-EOF
- cat </root/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=pcmanfm
-WebBrowser=
-
-EOF
-
-elif [ $PACKAGE_VARIANT = "standard" ]; then
- cat </etc/skel/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=Thunar
-WebBrowser=
-
-EOF
- cat </home/live/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=Thunar
-WebBrowser=
-
-EOF
- cat </root/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=Thunar
-WebBrowser=
-
-EOF
-fi
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/minimal.list b/minios-modules/usr/share/minios/modules/03-xfce-desktop/minimal.list
deleted file mode 100644
index 6ba5346..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/minimal.list
+++ /dev/null
@@ -1,15 +0,0 @@
-dbus-x11
-slim
-libxfce4ui-utils
-pcmanfm
-xfce4-appfinder
-xfce4-panel
-xfce4-session
-xfce4-settings
-xfconf
-xfdesktop4
-xfwm4
-greybird-gtk-theme
-volumeicon-alsa
-xfce4-xkb-plugin
-xfce4-battery-plugin
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/postinstall b/minios-modules/usr/share/minios/modules/03-xfce-desktop/postinstall
deleted file mode 100644
index b72f284..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/postinstall
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/bin/bash
-
-#(cd /rootcopy && cp --parents -afr * /)
-
-# create user directories
-for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do
- mkdir -p /home/live/$dir >>$OUTPUT 2>&1
- mkdir -p /root/$dir >>$OUTPUT 2>&1
-done
-
-rm -f /usr/share/backgrounds/xfce/*
-ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-verticals.png
-ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-teal.jpg
-
-if [ $PACKAGE_VARIANT = "standard" ]; then
- rm -f /usr/share/applications/pavucontrol.desktop
-fi
-
-if grep slim $SCRIPT_DIR/$PACKAGE_VARIANT.list >>$OUTPUT 2>&1; then
- sed -i 's,# hidecursor false,hidecursor false,g' /etc/slim.conf
- sed -i 's,screenshot_cmd scrot /root/slim.png,# screenshot_cmd scrot /root/slim.png,g' /etc/slim.conf
- if [ $PACKAGE_VARIANT = "minimal" ]; then
- sed -i 's,#default_user simone,default_user root,g' /etc/slim.conf
- else
- sed -i 's,#default_user simone,default_user live,g' /etc/slim.conf
- fi
- sed -i 's,#auto_login no,auto_login yes,g' /etc/slim.conf
- sed -i 's,current_theme debian-softwaves,current_theme minios,g' /etc/slim.conf
-fi
-
-if [ $PACKAGE_VARIANT = "minimal" ]; then
- cat <>/usr/share/applications/taskmanager.desktop
-[Desktop Entry]
-Name=Task Manager
-Name[ar]=مدير المهام
-Name[ast]=Xestor de xeres
-Name[be]=Кіраўнік задач
-Name[bg]=Мениджър на задачи
-Name[ca]=Gestor de tasques
-Name[cs]=Správce úloh
-Name[da]=Opgavehåndtering
-Name[de]=Taskmanager
-Name[el]=Διαχειριστής εργασιών
-Name[en_AU]=Task Manager
-Name[en_GB]=Task Manager
-Name[es]=Gestor de tareas
-Name[eu]=Zeregin kudeatzailea
-Name[fi]=Tehtävienhallinta
-Name[fr]=Gestionnaire de tâches
-Name[gl]=Xestor de tarefas
-Name[he]=מנהל משימות
-Name[hr]=Upravitelj zadacima
-Name[hu]=Feladatkezelő
-Name[id]=Manajer Tugas
-Name[is]=Verkefnastjóri
-Name[it]=Gestore dei processi
-Name[ja]=タスクマネージャー
-Name[kk]=Үрдістерді басқарушысы
-Name[ko]=작업 관리자
-Name[lt]=Užduočių tvarkytuvė
-Name[ms]=Pengurus Tugas
-Name[nb]=Oppgavebehandler
-Name[nl]=Taakbeheerder
-Name[oc]=Gestionari de prètzfaches
-Name[pl]=Menedżer zadań
-Name[pt]=Gestor de tarefas
-Name[pt_BR]=Gerenciador de tarefas
-Name[ru]=Диспетчер задач
-Name[sk]=Správca úloh
-Name[sl]=Upravljalnik nalog
-Name[sq]=Përgjegjës Aktesh
-Name[sr]=Управник задатака
-Name[sv]=Aktivitetshanterare
-Name[te]=కర్తవ్య నిర్వాహకం
-Name[th]=โปรแกรมจัดการทาสก์
-Name[tr]=Görev Yöneticisi
-Name[ug]=ۋەزىپە باشقۇرغۇ
-Name[uk]=Диспетчер задач
-Name[vi]=Quản lý tác vụ
-Name[zh_CN]=任务管理器
-Name[zh_HK]=工作管理員
-Name[zh_TW]=工作管理員
-Comment=Easy to use task manager
-Comment[ar]=من السهل إستخدام مدير المهام
-Comment[ast]=Xestor de xeres cenciellu d'usar
-Comment[be]=Зручны ў выкарыстанні кіраўнік задач
-Comment[bg]=Лесен за използване мениджър на задачи
-Comment[ca]=Gestor de tasques fàcil d'utilitzar
-Comment[cs]=Snadno použitelný správce úloh
-Comment[da]=Opgavehåndtering som er nem at bruge
-Comment[de]=Prozessverwaltung mit einfacher Bedienung
-Comment[el]=Εύκολος στην χρήση διαχειριστής διεργασιών
-Comment[en_AU]=Easy to use task manager
-Comment[en_GB]=Easy to use task manager
-Comment[es]=Un gestor de tareas fácil de usar
-Comment[eu]= Zeregin kudeatzaile erabilerraz bat da
-Comment[fi]=Helppokäyttöinen tehtävienhallinta
-Comment[fr]=Gestionnaire de tâches simple d’utilisation
-Comment[gl]=Xestor de tarefas fácil de usar
-Comment[he]=מנהל משימות קל לשימוש
-Comment[hr]=Lagan za korištenje upravitelj zadacima
-Comment[hu]=Egyszerűen használható feladatkezelő
-Comment[id]=Manajer tugas yang mudah digunakan
-Comment[is]=Einfaldur og auðveldur verkefnastjóri
-Comment[it]=Gestore dei processi di semplice utilizzo
-Comment[ja]=使いやすいタスクマネージャーです
-Comment[kk]=Жүйе үрдістерін ыңғайлы басқару
-Comment[ko]=쓰기 쉬운 작업관리자
-Comment[lt]=Lengvai naudojama užduočių tvarkytuvė
-Comment[ms]=Pengurus tugas yang mudah digunakan
-Comment[nb]=Lett å bruke oppgavebehandler
-Comment[nl]=Gemakkelijk te gebruiken taakbeheerder
-Comment[oc]=De bon utilizar : lo gestionari de prètzfaches
-Comment[pl]=Zarządza uruchomionymi procesami
-Comment[pt]=Gestor de tarefas fácil de usar
-Comment[pt_BR]=Um gerenciador de tarefas fácil de usar
-Comment[ru]=Простой диспетчер задач
-Comment[sk]=Správca úloh s jednoduchým používaním
-Comment[sl]=Enostaven upravljalnik nalog
-Comment[sq]=Përgjegjës aktesh i lehtë për t’u përdorur
-Comment[sr]=Управник задатака лак за коришћење
-Comment[sv]=Lättanvänd aktivitetshanterare
-Comment[te]=వాడుటకు సరళమైన కర్తవ్య నిర్వాహకం
-Comment[th]=โปรแกรมจัดการทาสก์สะดวกใช้
-Comment[tr]=Kullanımı kolay görev yöneticisi
-Comment[ug]=ئىشلىتىشكە ئەپلىك ۋەزىپە باشقۇرغۇ
-Comment[uk]=Простий у використанні диспетчер задач
-Comment[vi]=Trình quản lý tác vụ dễ dùng
-Comment[zh_CN]=易用的任务管理器
-Comment[zh_HK]=易用的工作管理員
-Comment[zh_TW]=易於使用的工作管理員
-GenericName=Task Manager
-GenericName[ar]=مدير المهام
-GenericName[ast]=Xestor de xeres
-GenericName[be]=Кіраўнік задач
-GenericName[bg]=Мениджър на задачи
-GenericName[ca]=Gestor de tasques
-GenericName[cs]=Správce úloh
-GenericName[da]=Opgavehåndtering
-GenericName[de]=Taskmanager
-GenericName[el]=Διαχειριστής εργασιών
-GenericName[en_AU]=Task Manager
-GenericName[en_GB]=Task Manager
-GenericName[es]=Gestor de tareas
-GenericName[eu]=Zeregin kudeatzailea
-GenericName[fi]=Tehtävienhallinta
-GenericName[fr]=Gestionnaire de tâches
-GenericName[gl]=Xestor de tarefas
-GenericName[he]=מנהל משימות
-GenericName[hr]=Upravitelj zadacima
-GenericName[hu]=Feladatkezelő
-GenericName[id]=Manajer Tugas
-GenericName[is]=Verkefnastjóri
-GenericName[it]=Gestore dei processi
-GenericName[ja]=タスクマネージャー
-GenericName[kk]=Үрдістерді басқарушысы
-GenericName[ko]=작업 관리자
-GenericName[lt]=Užduočių tvarkytuvė
-GenericName[ms]=Pengurus Tugas
-GenericName[nb]=Oppgavebehandler
-GenericName[nl]=Taakbeheerder
-GenericName[oc]=Gestionari de prètzfaches
-GenericName[pl]=Menedżer zadań
-GenericName[pt]=Gestor de tarefas
-GenericName[pt_BR]=Gerenciador de tarefas
-GenericName[ru]=Диспетчер задач
-GenericName[sk]=Správca úloh
-GenericName[sl]=Upravljalnik nalog
-GenericName[sq]=Përgjegjës Aktesh
-GenericName[sr]=Управник задатака
-GenericName[sv]=Aktivitetshanterare
-GenericName[te]=కర్తవ్య నిర్వాహకం
-GenericName[th]=โปรแกรมจัดการทาสก์
-GenericName[tr]=Görev Yöneticisi
-GenericName[ug]=ۋەزىپە باشقۇرغۇ
-GenericName[uk]=Диспетчер задач
-GenericName[vi]=Quản lý tác vụ
-GenericName[zh_CN]=任务管理器
-GenericName[zh_HK]=工作管理員
-GenericName[zh_TW]=工作管理員
-Exec=xterm -e 'htop'
-Icon=utilities-system-monitor
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=System;Utility;
-
-EOF
-fi
-
-rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
-
-update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm
deleted file mode 100644
index 5be8f85..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm
+++ /dev/null
@@ -1,32 +0,0 @@
-# nodm configuration
-
-# Set NODM_ENABLED to something different than 'false' to enable nodm
-NODM_ENABLED=true
-
-# User to autologin for
-NODM_USER=live
-
-# First vt to try when looking for free VTs
-NODM_FIRST_VT=7
-
-# X session
-NODM_XSESSION=/etc/X11/Xsession
-
-# Options for nodm itself
-NODM_OPTIONS=
-
-# Options for the X server.
-#
-# Format: [/usr/bin/] [:]
-#
-# The Xserver executable and the display name can be omitted, but should
-# be placed in front, if nodm's defaults shall be overridden.
-NODM_X_OPTIONS='-nolisten tcp'
-
-# If an X session will run for less than this time in seconds, nodm will wait an
-# increasing bit of time before restarting the session.
-NODM_MIN_SESSION_TIME=60
-
-# Timeout (in seconds) to wait for X to be ready to accept connections. If X is
-# not ready before this timeout, it is killed and restarted.
-NODM_X_TIMEOUT=300
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc
deleted file mode 100644
index f65e2a5..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc
+++ /dev/null
@@ -1,20 +0,0 @@
-[xarchiver]
-preferred_format=0
-confirm_deletion=true
-sort_filename_content=false
-store_output=false
-icon_size=0
-show_archive_comment=false
-show_sidebar=false
-show_location_bar=false
-preferred_temp_dir=/tmp
-allow_sub_dir=0
-overwrite=false
-full_path=true
-touch=false
-freshen=false
-update=false
-store_path=false
-recurse=true
-solid_archive=false
-remove_files=false
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc
deleted file mode 100644
index 170c036..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-display_label=false
-display_icon=false
-display_power=false
-display_percentage=false
-display_bar=true
-display_time=false
-tooltip_display_percentage=true
-tooltip_display_time=true
-low_percentage=10
-critical_percentage=5
-action_on_low=1
-action_on_critical=1
-hide_when_full=-415324144
-colorA=rgb(136,136,255)
-colorH=rgb(0,255,0)
-colorL=rgb(255,255,0)
-colorC=rgb(255,0,0)
-command_on_low=
-command_on_critical=
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
deleted file mode 100644
index e51e56e..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=Terminal Emulator
-Comment=Use the command line
-X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop
deleted file mode 100644
index 598b0c9..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=File Manager
-Comment=Browse the file system
-X-XFCE-Source=file:///usr/share/applications/exo-file-manager.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop
deleted file mode 100644
index 4662377..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=Web Browser
-Comment=Browse the web
-X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
deleted file mode 100644
index 0559966..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
deleted file mode 100644
index 5dd9176..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index ab0d597..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
deleted file mode 100644
index f3c9034..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
deleted file mode 100644
index 276b7ec..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
deleted file mode 100644
index 0693440..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
deleted file mode 100644
index a7d7fe7..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index 4d5554e..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc
deleted file mode 100644
index 41eda7a..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-xrdb -merge .Xresources
-
-exec xfce4-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession
deleted file mode 100644
index 8658258..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/Default/Preferences b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/Default/Preferences
deleted file mode 100644
index 5bfddb0..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/Default/Preferences
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "AudioCaptureAllowed": false,
- "account_id_migration_state": 2,
- "account_tracker_service_last_update": "13154004704520013",
- "alternate_error_pages": {
- "enabled": false
- },
- "bookmark_bar": {
- "show_on_all_tabs": false
- },
- "browser": {
- "check_default_browser": false,
- "has_seen_welcome_page": true,
- "show_home_button": false,
- "window_placement": {
- "bottom": 10,
- "left": 10,
- "maximized": true,
- "right": 10,
- "top": 10
- }
- },
- "extensions": {
- "theme": {
- "use_system": true
- }
- },
- "ntp": {
- "most_visited_blacklist": {
- "c8e0afd1da1d9e29511240861f795a5a": null,
- "eacc8c3ad0b50bd698ef8752d5ee24b6": null
- }
- },
- "safebrowsing": {
- "enabled": false,
- "scout_group_selected": true
- }
-}
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/First Run b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/chromium/First Run
deleted file mode 100644
index e69de29..0000000
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xarchiver/xarchiverrc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xarchiver/xarchiverrc
deleted file mode 100644
index f65e2a5..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xarchiver/xarchiverrc
+++ /dev/null
@@ -1,20 +0,0 @@
-[xarchiver]
-preferred_format=0
-confirm_deletion=true
-sort_filename_content=false
-store_output=false
-icon_size=0
-show_archive_comment=false
-show_sidebar=false
-show_location_bar=false
-preferred_temp_dir=/tmp
-allow_sub_dir=0
-overwrite=false
-full_path=true
-touch=false
-freshen=false
-update=false
-store_path=false
-recurse=true
-solid_archive=false
-remove_files=false
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/battery-10.rc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/battery-10.rc
deleted file mode 100644
index 170c036..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/battery-10.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-display_label=false
-display_icon=false
-display_power=false
-display_percentage=false
-display_bar=true
-display_time=false
-tooltip_display_percentage=true
-tooltip_display_time=true
-low_percentage=10
-critical_percentage=5
-action_on_low=1
-action_on_critical=1
-hide_when_full=-415324144
-colorA=rgb(136,136,255)
-colorH=rgb(0,255,0)
-colorL=rgb(255,255,0)
-colorC=rgb(255,0,0)
-command_on_low=
-command_on_critical=
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
deleted file mode 100644
index e51e56e..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=Terminal Emulator
-Comment=Use the command line
-X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop
deleted file mode 100644
index 598b0c9..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-4/FileManager.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=File Manager
-Comment=Browse the file system
-X-XFCE-Source=file:///usr/share/applications/exo-file-manager.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop
deleted file mode 100644
index 4662377..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/launcher-5/WebBrowser.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=Web Browser
-Comment=Browse the web
-X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/whiskermenu-1.rc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/whiskermenu-1.rc
deleted file mode 100644
index be72781..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/panel/whiskermenu-1.rc
+++ /dev/null
@@ -1,80 +0,0 @@
-favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop
-recent=
-button-icon=/usr/share/pixmaps/MiniOS-white.svg
-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=false
-view-as-icons=false
-default-category=0
-recent-items-max=10
-favorites-in-recent=true
-position-search-alternate=true
-position-commands-alternate=false
-position-categories-alternate=true
-stay-on-focus-out=false
-confirm-session-command=true
-menu-width=450
-menu-height=500
-menu-opacity=100
-command-settings=xfce4-settings-manager
-show-command-settings=false
-command-lockscreen=xflock4
-show-command-lockscreen=false
-command-switchuser=dm-tool switch-to-greeter
-show-command-switchuser=false
-command-logoutuser=xfce4-session-logout --logout --fast
-show-command-logoutuser=false
-command-restart=xfce4-session-logout --reboot --fast
-show-command-restart=false
-command-shutdown=xfce4-session-logout --halt --fast
-show-command-shutdown=false
-command-suspend=xfce4-session-logout --suspend
-show-command-suspend=false
-command-hibernate=xfce4-session-logout --hibernate
-show-command-hibernate=false
-command-logout=xfce4-session-logout
-show-command-logout=true
-command-menueditor=menulibre
-show-command-menueditor=true
-command-profile=mugshot
-show-command-profile=false
-search-actions=5
-
-[action0]
-name=Man Pages
-pattern=#
-command=exo-open --launch TerminalEmulator man %s
-regex=false
-
-[action1]
-name=Web Search
-pattern=?
-command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
-regex=false
-
-[action2]
-name=Wikipedia
-pattern=!w
-command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
-regex=false
-
-[action3]
-name=Run in Terminal
-pattern=!
-command=exo-open --launch TerminalEmulator %s
-regex=false
-
-[action4]
-name=Open URI
-pattern=^(file|http|https):\\/\\/(.*)$
-command=exo-open \\0
-regex=true
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
deleted file mode 100644
index e7e0bcd..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
deleted file mode 100644
index 0559966..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
deleted file mode 100644
index 5dd9176..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index ab0d597..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
deleted file mode 100644
index f3c9034..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
deleted file mode 100644
index 276b7ec..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
deleted file mode 100644
index 0693440..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
deleted file mode 100644
index a7d7fe7..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index 4d5554e..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.xinitrc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.xinitrc
deleted file mode 100644
index 41eda7a..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.xinitrc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-xrdb -merge .Xresources
-
-exec xfce4-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.xsession b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.xsession
deleted file mode 100644
index 8658258..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/home/live/.xsession
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xarchiver/xarchiverrc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xarchiver/xarchiverrc
deleted file mode 100644
index f65e2a5..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xarchiver/xarchiverrc
+++ /dev/null
@@ -1,20 +0,0 @@
-[xarchiver]
-preferred_format=0
-confirm_deletion=true
-sort_filename_content=false
-store_output=false
-icon_size=0
-show_archive_comment=false
-show_sidebar=false
-show_location_bar=false
-preferred_temp_dir=/tmp
-allow_sub_dir=0
-overwrite=false
-full_path=true
-touch=false
-freshen=false
-update=false
-store_path=false
-recurse=true
-solid_archive=false
-remove_files=false
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/battery-10.rc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/battery-10.rc
deleted file mode 100644
index 170c036..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/battery-10.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-display_label=false
-display_icon=false
-display_power=false
-display_percentage=false
-display_bar=true
-display_time=false
-tooltip_display_percentage=true
-tooltip_display_time=true
-low_percentage=10
-critical_percentage=5
-action_on_low=1
-action_on_critical=1
-hide_when_full=-415324144
-colorA=rgb(136,136,255)
-colorH=rgb(0,255,0)
-colorL=rgb(255,255,0)
-colorC=rgb(255,0,0)
-command_on_low=
-command_on_critical=
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
deleted file mode 100644
index e51e56e..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=Terminal Emulator
-Comment=Use the command line
-X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-4/FileManager.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-4/FileManager.desktop
deleted file mode 100644
index 598b0c9..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-4/FileManager.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=File Manager
-Comment=Browse the file system
-X-XFCE-Source=file:///usr/share/applications/exo-file-manager.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop
deleted file mode 100644
index 4662377..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/panel/launcher-5/WebBrowser.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[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;
-X-AppStream-Ignore=True
-Name=Web Browser
-Comment=Browse the web
-X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
deleted file mode 100644
index 0559966..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
deleted file mode 100644
index 5dd9176..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
deleted file mode 100644
index ab0d597..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
deleted file mode 100644
index f3c9034..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
deleted file mode 100644
index 276b7ec..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
deleted file mode 100644
index 0693440..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
deleted file mode 100644
index a7d7fe7..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
deleted file mode 100644
index 4d5554e..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.xinitrc b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.xinitrc
deleted file mode 100644
index 41eda7a..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.xinitrc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for f in /etc/X11/xinit/xinitrc.d/*; do
- [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-xrdb -merge .Xresources
-
-exec xfce4-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.xsession b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.xsession
deleted file mode 100644
index 8658258..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/root/.xsession
+++ /dev/null
@@ -1 +0,0 @@
-xfce4-session
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg
deleted file mode 100644
index 9c8639a..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg
deleted file mode 100644
index ca13046..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png
deleted file mode 100644
index 966915d..0000000
Binary files a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png and /dev/null differ
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png
deleted file mode 100644
index 8d01ac8..0000000
Binary files a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png and /dev/null differ
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme
deleted file mode 100644
index b70182b..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme
+++ /dev/null
@@ -1,36 +0,0 @@
-# greeny_dark theme for SLIM
-# by aditya shakya
-# using artwork from some free html+css login templates on the internet
-
-# Messages (ie: shutdown)
-
-msg_color #b5cd60
-msg_font Sans:size=18:bold:dpi=75
-msg_x 50%
-msg_y 30%
-
-# Session Name
-
-session_color #b5cd60
-session_font Sans:size=16:bold:dpi=75
-session_x 50%
-session_y 90%
-
-# valid values: stretch, tile
-
-background_style stretch
-background_color #f2f2f2
-
-# Input controls
-
-input_panel_x 50%
-input_panel_y 50%
-input_name_x 200
-input_name_y 78
-input_pass_x 200
-input_pass_y 145
-input_font Sans:size=14:dpi=75
-input_color #b5cd60
-
-username_msg
-password_msg
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg
deleted file mode 100644
index f702a54..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg
+++ /dev/null
@@ -1,472 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg
deleted file mode 100644
index 4fb1245..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg
+++ /dev/null
@@ -1,322 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg
deleted file mode 100644
index 8d60e10..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg
deleted file mode 100644
index 07cf41e..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg
+++ /dev/null
@@ -1,365 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg
deleted file mode 100644
index 45ccf8d..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg
+++ /dev/null
@@ -1,308 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg
deleted file mode 100644
index 80bd5e1..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg
+++ /dev/null
@@ -1,451 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg
deleted file mode 100644
index bc28a46..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg
deleted file mode 100644
index f655e9c..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg
deleted file mode 100644
index 2b093e1..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg
deleted file mode 100644
index 56e0e18..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg
+++ /dev/null
@@ -1,314 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg
deleted file mode 100644
index bdf7600..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg
+++ /dev/null
@@ -1,371 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg
deleted file mode 100644
index 526baf2..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg
deleted file mode 100644
index 2214891..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg
deleted file mode 100644
index 03f2e71..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg
+++ /dev/null
@@ -1,337 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg b/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg
deleted file mode 100644
index 9b8c436..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg
+++ /dev/null
@@ -1,371 +0,0 @@
-
-
diff --git a/minios-modules/usr/share/minios/modules/03-xfce-desktop/standard.list b/minios-modules/usr/share/minios/modules/03-xfce-desktop/standard.list
deleted file mode 100644
index 5dacc83..0000000
--- a/minios-modules/usr/share/minios/modules/03-xfce-desktop/standard.list
+++ /dev/null
@@ -1,25 +0,0 @@
-dbus-x11
-slim
-libxfce4ui-utils
-thunar
-thunar-volman
-gvfs-backends
-samba-common
-avahi-daemon
-tumbler
-eject
-xfce4-appfinder
-xfce4-panel
-xfce4-session
-xfce4-settings
-xfconf
-xfdesktop4
-xfwm4
-greybird-gtk-theme
-xfce4-pulseaudio-plugin
-pulseaudio
-pavucontrol
-xfce4-xkb-plugin
-xfce4-battery-plugin
-xfce4-whiskermenu-plugin
-network-manager-gnome
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/install b/minios-modules/usr/share/minios/modules/04-cinnamon-apps/install
deleted file mode 100644
index b8cfcce..0000000
--- a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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_VARIANT.list ]; then
- $APT_CMD update &&
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
-
-if [ $PACKAGE_VARIANT = "standard" ]; then
- if [ $DISTRIBUTION = "stretch" ]; then
- echo 'deb http://ftp.debian.org/debian stretch-backports main' | sudo tee --append /etc/apt/sources.list.d/stretch-backports.list >>$OUTPUT 2>&1
- fi
- $APT_CMD update &&
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1
-fi
-
-if [ $PACKAGE_VARIANT = "minimal" ]; then
- sed -i 's,create=xarchiver --add-to,create=xarchiver --compress,g' /usr/share/libfm/archivers.list
-fi
diff --git a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/minimal.list b/minios-modules/usr/share/minios/modules/04-cinnamon-apps/minimal.list
deleted file mode 100644
index 81ee1ec..0000000
--- a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/minimal.list
+++ /dev/null
@@ -1,3 +0,0 @@
-mousepad
-xarchiver
-ristretto
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/postinstall b/minios-modules/usr/share/minios/modules/04-cinnamon-apps/postinstall
deleted file mode 100644
index a407c94..0000000
--- a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/postinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
diff --git a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/standard.list b/minios-modules/usr/share/minios/modules/04-cinnamon-apps/standard.list
deleted file mode 100644
index e46364f..0000000
--- a/minios-modules/usr/share/minios/modules/04-cinnamon-apps/standard.list
+++ /dev/null
@@ -1,8 +0,0 @@
-gedit
-file-roller
-eog
-gnome-terminal
-gnome-system-monitor
-gnome-screenshot
-vlc
-gparted
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/install b/minios-modules/usr/share/minios/modules/04-xfce-apps/install
deleted file mode 100644
index 8d72be3..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/install
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/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_VARIANT.list ]; then
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD update &&
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
-
-if [ $PACKAGE_VARIANT = "standard" ]; then
- if [ $DISTRIBUTION = "stretch" ]; then
- echo 'deb http://ftp.debian.org/debian stretch-backports main' | sudo tee --append /etc/apt/sources.list.d/stretch-backports.list >>$OUTPUT 2>&1
- $APT_CMD update &&
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD install -t stretch-backports $APT_OPTIONS $APT_OPTIONS2 \
- remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1
- else
- $APT_CMD update &&
- #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
- $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
- remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1
-
- fi
-fi
-
-if [ $PACKAGE_VARIANT = "minimal" ]; then
- cat </etc/skel/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=pcmanfm
-WebBrowser=firefox
-
-EOF
- cat </home/live/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=pcmanfm
-WebBrowser=firefox
-
-EOF
- cat </root/.config/xfce4/helpers.rc
-TerminalEmulator=xterm
-FileManager=pcmanfm
-WebBrowser=firefox
-
-EOF
-
-elif [ $PACKAGE_VARIANT = "standard" ]; then
- cat </etc/skel/.config/xfce4/helpers.rc
-TerminalEmulator=xfce4-terminal
-FileManager=Thunar
-WebBrowser=firefox
-
-EOF
- cat </home/live/.config/xfce4/helpers.rc
-TerminalEmulator=xfce4-terminal
-FileManager=Thunar
-WebBrowser=firefox
-
-EOF
- cat </root/.config/xfce4/helpers.rc
-TerminalEmulator=xfce4-terminal
-FileManager=Thunar
-WebBrowser=firefox
-
-EOF
-fi
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/minimal.list b/minios-modules/usr/share/minios/modules/04-xfce-apps/minimal.list
deleted file mode 100644
index 81ee1ec..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/minimal.list
+++ /dev/null
@@ -1,3 +0,0 @@
-mousepad
-xarchiver
-ristretto
\ No newline at end of file
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/postinstall b/minios-modules/usr/share/minios/modules/04-xfce-apps/postinstall
deleted file mode 100644
index 6430bf2..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/postinstall
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-(cd /rootcopy && cp --parents -afr * /)
-
-if [ $PACKAGE_VARIANT = "minimal" ]; then
- sed -i 's,create=xarchiver --add-to,create=xarchiver --compress,g' /usr/share/libfm/archivers.list
-fi
-
-rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
-rm -Rf /usr/share/icons/Adwaita/256x256 >>$OUTPUT 2>&1
-rm -Rf /usr/share/icons/Adwaita/512x512 >>$OUTPUT 2>&1
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop
deleted file mode 100644
index 79c425b..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=volumeicon
-Comment=
-Exec=volumeicon
-OnlyShowIn=XFCE;
-StartupNotify=false
-Terminal=false
-Hidden=false
-
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon
deleted file mode 100644
index 32df349..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon
+++ /dev/null
@@ -1,27 +0,0 @@
-[Alsa]
-card=default
-logarithmic_scale=false
-
-[Notification]
-show_notification=true
-notification_type=0
-
-[StatusIcon]
-stepsize=5
-onclick=xterm -e 'alsamixer'
-theme=White Gnome
-use_panel_specific_icons=false
-reverse_scroll_direction=false
-lmb_slider=false
-mmb_mute=false
-use_horizontal_slider=false
-show_sound_level=false
-use_transparent_background=false
-
-[Hotkeys]
-up_enabled=false
-down_enabled=false
-mute_enabled=false
-up=XF86AudioRaiseVolume
-down=XF86AudioLowerVolume
-mute=XF86AudioMute
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm
deleted file mode 100644
index 43521c9..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm
+++ /dev/null
@@ -1,56 +0,0 @@
-; xfce4-terminal GtkAccelMap rc-file -*- scheme -*-
-; this file is an automated accelerator map dump
-;
-(gtk_accel_path "/terminal-window/goto-tab-1" "1")
-(gtk_accel_path "/terminal-window/goto-tab-3" "3")
-; (gtk_accel_path "/terminal-window/file-menu" "")
-; (gtk_accel_path "/terminal-window/close-other-tabs" "")
-; (gtk_accel_path "/terminal-window/search" "f")
-; (gtk_accel_path "/terminal-window/next-tab" "Page_Down")
-; (gtk_accel_path "/terminal-window/copy-html" "")
-; (gtk_accel_path "/terminal-window/show-menubar" "")
-; (gtk_accel_path "/terminal-window/zoom-reset" "0")
-; (gtk_accel_path "/terminal-window/close-window" "q")
-; (gtk_accel_path "/terminal-window/save-contents" "")
-; (gtk_accel_path "/terminal-window/close-tab" "w")
-; (gtk_accel_path "/terminal-window/view-menu" "")
-; (gtk_accel_path "/terminal-window/new-tab" "t")
-; (gtk_accel_path "/terminal-window/show-toolbar" "")
-; (gtk_accel_path "/terminal-window/copy-input" "")
-; (gtk_accel_path "/terminal-window/paste" "v")
-; (gtk_accel_path "/terminal-window/copy" "c")
-; (gtk_accel_path "/terminal-window/edit-menu" "")
-; (gtk_accel_path "/terminal-window/fullscreen" "F11")
-(gtk_accel_path "/terminal-window/goto-tab-6" "6")
-; (gtk_accel_path "/terminal-window/read-only" "")
-; (gtk_accel_path "/terminal-window/detach-tab" "d")
-(gtk_accel_path "/terminal-window/goto-tab-8" "8")
-(gtk_accel_path "/terminal-window/goto-tab-2" "2")
-; (gtk_accel_path "/terminal-window/scroll-on-output" "")
-(gtk_accel_path "/terminal-window/goto-tab-5" "5")
-; (gtk_accel_path "/terminal-window/prev-tab" "Page_Up")
-; (gtk_accel_path "/terminal-window/move-tab-left" "Page_Up")
-; (gtk_accel_path "/terminal-window/zoom-in" "plus")
-; (gtk_accel_path "/terminal-window/search-prev" "")
-; (gtk_accel_path "/terminal-window/reset-and-clear" "")
-; (gtk_accel_path "/terminal-window/about" "")
-; (gtk_accel_path "/terminal-window/search-next" "")
-(gtk_accel_path "/terminal-window/toggle-menubar" "F10")
-(gtk_accel_path "/terminal-window/goto-tab-7" "7")
-; (gtk_accel_path "/terminal-window/select-all" "a")
-; (gtk_accel_path "/terminal-window/help-menu" "")
-(gtk_accel_path "/terminal-window/goto-tab-9" "9")
-; (gtk_accel_path "/terminal-window/show-borders" "")
-; (gtk_accel_path "/terminal-window/new-window" "n")
-(gtk_accel_path "/terminal-window/goto-tab-4" "4")
-; (gtk_accel_path "/terminal-window/contents" "F1")
-; (gtk_accel_path "/terminal-window/preferences" "")
-; (gtk_accel_path "/terminal-window/move-tab-right" "Page_Down")
-; (gtk_accel_path "/terminal-window/zoom-out" "minus")
-; (gtk_accel_path "/terminal-window/set-title" "s")
-; (gtk_accel_path "/terminal-window/paste-selection" "")
-; (gtk_accel_path "/terminal-window/undo-close-tab" "")
-; (gtk_accel_path "/terminal-window/tabs-menu" "")
-; (gtk_accel_path "/terminal-window/zoom-menu" "")
-; (gtk_accel_path "/terminal-window/reset" "")
-; (gtk_accel_path "/terminal-window/terminal-menu" "")
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc
deleted file mode 100644
index 04abf43..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc
+++ /dev/null
@@ -1,30 +0,0 @@
-[Configuration]
-FontName=Monospace 10
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBellUrgent=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=TRUE
-MiscMouseAutohide=FALSE
-MiscMouseWheelZoom=TRUE
-MiscToolbarDefault=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-MiscMiddleClickOpensUri=FALSE
-MiscCopyOnSelect=FALSE
-MiscShowRelaunchDialog=TRUE
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=FALSE
-MiscNewTabAdjacent=FALSE
-BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
-BackgroundDarkness=0.800000
-
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/autostart/volumeicon.desktop b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/autostart/volumeicon.desktop
deleted file mode 100644
index 79c425b..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/autostart/volumeicon.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=volumeicon
-Comment=
-Exec=volumeicon
-OnlyShowIn=XFCE;
-StartupNotify=false
-Terminal=false
-Hidden=false
-
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/volumeicon/volumeicon b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/volumeicon/volumeicon
deleted file mode 100644
index 32df349..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/volumeicon/volumeicon
+++ /dev/null
@@ -1,27 +0,0 @@
-[Alsa]
-card=default
-logarithmic_scale=false
-
-[Notification]
-show_notification=true
-notification_type=0
-
-[StatusIcon]
-stepsize=5
-onclick=xterm -e 'alsamixer'
-theme=White Gnome
-use_panel_specific_icons=false
-reverse_scroll_direction=false
-lmb_slider=false
-mmb_mute=false
-use_horizontal_slider=false
-show_sound_level=false
-use_transparent_background=false
-
-[Hotkeys]
-up_enabled=false
-down_enabled=false
-mute_enabled=false
-up=XF86AudioRaiseVolume
-down=XF86AudioLowerVolume
-mute=XF86AudioMute
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/accels.scm b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/accels.scm
deleted file mode 100644
index 43521c9..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/accels.scm
+++ /dev/null
@@ -1,56 +0,0 @@
-; xfce4-terminal GtkAccelMap rc-file -*- scheme -*-
-; this file is an automated accelerator map dump
-;
-(gtk_accel_path "/terminal-window/goto-tab-1" "1")
-(gtk_accel_path "/terminal-window/goto-tab-3" "3")
-; (gtk_accel_path "/terminal-window/file-menu" "")
-; (gtk_accel_path "/terminal-window/close-other-tabs" "")
-; (gtk_accel_path "/terminal-window/search" "f")
-; (gtk_accel_path "/terminal-window/next-tab" "Page_Down")
-; (gtk_accel_path "/terminal-window/copy-html" "")
-; (gtk_accel_path "/terminal-window/show-menubar" "")
-; (gtk_accel_path "/terminal-window/zoom-reset" "0")
-; (gtk_accel_path "/terminal-window/close-window" "q")
-; (gtk_accel_path "/terminal-window/save-contents" "")
-; (gtk_accel_path "/terminal-window/close-tab" "w")
-; (gtk_accel_path "/terminal-window/view-menu" "")
-; (gtk_accel_path "/terminal-window/new-tab" "t")
-; (gtk_accel_path "/terminal-window/show-toolbar" "")
-; (gtk_accel_path "/terminal-window/copy-input" "")
-; (gtk_accel_path "/terminal-window/paste" "v")
-; (gtk_accel_path "/terminal-window/copy" "c")
-; (gtk_accel_path "/terminal-window/edit-menu" "")
-; (gtk_accel_path "/terminal-window/fullscreen" "F11")
-(gtk_accel_path "/terminal-window/goto-tab-6" "6")
-; (gtk_accel_path "/terminal-window/read-only" "")
-; (gtk_accel_path "/terminal-window/detach-tab" "d")
-(gtk_accel_path "/terminal-window/goto-tab-8" "8")
-(gtk_accel_path "/terminal-window/goto-tab-2" "2")
-; (gtk_accel_path "/terminal-window/scroll-on-output" "")
-(gtk_accel_path "/terminal-window/goto-tab-5" "5")
-; (gtk_accel_path "/terminal-window/prev-tab" "Page_Up")
-; (gtk_accel_path "/terminal-window/move-tab-left" "Page_Up")
-; (gtk_accel_path "/terminal-window/zoom-in" "plus")
-; (gtk_accel_path "/terminal-window/search-prev" "")
-; (gtk_accel_path "/terminal-window/reset-and-clear" "")
-; (gtk_accel_path "/terminal-window/about" "")
-; (gtk_accel_path "/terminal-window/search-next" "")
-(gtk_accel_path "/terminal-window/toggle-menubar" "F10")
-(gtk_accel_path "/terminal-window/goto-tab-7" "7")
-; (gtk_accel_path "/terminal-window/select-all" "a")
-; (gtk_accel_path "/terminal-window/help-menu" "")
-(gtk_accel_path "/terminal-window/goto-tab-9" "9")
-; (gtk_accel_path "/terminal-window/show-borders" "")
-; (gtk_accel_path "/terminal-window/new-window" "n")
-(gtk_accel_path "/terminal-window/goto-tab-4" "4")
-; (gtk_accel_path "/terminal-window/contents" "F1")
-; (gtk_accel_path "/terminal-window/preferences" "")
-; (gtk_accel_path "/terminal-window/move-tab-right" "Page_Down")
-; (gtk_accel_path "/terminal-window/zoom-out" "minus")
-; (gtk_accel_path "/terminal-window/set-title" "s")
-; (gtk_accel_path "/terminal-window/paste-selection" "")
-; (gtk_accel_path "/terminal-window/undo-close-tab" "")
-; (gtk_accel_path "/terminal-window/tabs-menu" "")
-; (gtk_accel_path "/terminal-window/zoom-menu" "")
-; (gtk_accel_path "/terminal-window/reset" "")
-; (gtk_accel_path "/terminal-window/terminal-menu" "")
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/terminalrc b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/terminalrc
deleted file mode 100644
index 04abf43..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/home/live/.config/xfce4/terminal/terminalrc
+++ /dev/null
@@ -1,30 +0,0 @@
-[Configuration]
-FontName=Monospace 10
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBellUrgent=FALSE
-MiscBordersDefault=TRUE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=80x24
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=TRUE
-MiscMouseAutohide=FALSE
-MiscMouseWheelZoom=TRUE
-MiscToolbarDefault=FALSE
-MiscConfirmClose=TRUE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-MiscMiddleClickOpensUri=FALSE
-MiscCopyOnSelect=FALSE
-MiscShowRelaunchDialog=TRUE
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=FALSE
-MiscNewTabAdjacent=FALSE
-BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
-BackgroundDarkness=0.800000
-
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/autostart/volumeicon.desktop b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/autostart/volumeicon.desktop
deleted file mode 100644
index 79c425b..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/autostart/volumeicon.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=volumeicon
-Comment=
-Exec=volumeicon
-OnlyShowIn=XFCE;
-StartupNotify=false
-Terminal=false
-Hidden=false
-
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/volumeicon/volumeicon b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/volumeicon/volumeicon
deleted file mode 100644
index 32df349..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/volumeicon/volumeicon
+++ /dev/null
@@ -1,27 +0,0 @@
-[Alsa]
-card=default
-logarithmic_scale=false
-
-[Notification]
-show_notification=true
-notification_type=0
-
-[StatusIcon]
-stepsize=5
-onclick=xterm -e 'alsamixer'
-theme=White Gnome
-use_panel_specific_icons=false
-reverse_scroll_direction=false
-lmb_slider=false
-mmb_mute=false
-use_horizontal_slider=false
-show_sound_level=false
-use_transparent_background=false
-
-[Hotkeys]
-up_enabled=false
-down_enabled=false
-mute_enabled=false
-up=XF86AudioRaiseVolume
-down=XF86AudioLowerVolume
-mute=XF86AudioMute
diff --git a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/accels.scm b/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/accels.scm
deleted file mode 100644
index 43521c9..0000000
--- a/minios-modules/usr/share/minios/modules/04-xfce-apps/rootcopy-install/root/.config/xfce4/terminal/accels.scm
+++ /dev/null
@@ -1,56 +0,0 @@
-; xfce4-terminal GtkAccelMap rc-file -*- scheme -*-
-; this file is an automated accelerator map dump
-;
-(gtk_accel_path "/terminal-window/goto-tab-1" "1")
-(gtk_accel_path "/terminal-window/goto-tab-3" "3")
-; (gtk_accel_path "/terminal-window/file-menu" "")
-; (gtk_accel_path "/terminal-window/close-other-tabs" "")
-; (gtk_accel_path "/terminal-window/search" "f")
-; (gtk_accel_path "/terminal-window/next-tab" "Page_Down")
-; (gtk_accel_path "/terminal-window/copy-html" "")
-; (gtk_accel_path "/terminal-window/show-menubar" "")
-; (gtk_accel_path "/terminal-window/zoom-reset" "0")
-; (gtk_accel_path "/terminal-window/close-window" "q")
-; (gtk_accel_path "/terminal-window/save-contents" "")
-; (gtk_accel_path "/terminal-window/close-tab" "w")
-; (gtk_accel_path "/terminal-window/view-menu" "")
-; (gtk_accel_path "/terminal-window/new-tab" "t")
-; (gtk_accel_path "/terminal-window/show-toolbar" "")
-; (gtk_accel_path "/terminal-window/copy-input" "")
-; (gtk_accel_path "/terminal-window/paste" "v")
-; (gtk_accel_path "/terminal-window/copy" "c")
-; (gtk_accel_path "