Update

buildall

@@ -0,0 +1,88 @@
+#!/bin/bash
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+. $SCRIPT_DIR/linux-live/minioslib || exit 1
+. $SCRIPT_DIR/linux-live/config || exit 1
+if [ -z $OUTPUT ]; then
+    . $SCRIPT_DIR/linux-live/buildconfig || exit 1
+fi
+
+function build() {
+    sed -i -e "/DISTRIBUTION_TYPE=/s/=.*/=$DISTRIBUTION_TYPE/" $SCRIPT_DIR/linux-live/buildconfig
+    sed -i -e "/DISTRIBUTION=/s/=.*/=$DISTRIBUTION/" $SCRIPT_DIR/linux-live/buildconfig
+    sed -i -e "/DISTRIBUTION_ARCH=/s/=.*/=$DISTRIBUTION_ARCH/" $SCRIPT_DIR/linux-live/buildconfig
+    sed -i -e "/DESKTOP_ENVIRONMENT=/s/=.*/=$DESKTOP_ENVIRONMENT/" $SCRIPT_DIR/linux-live/buildconfig
+    sed -i -e "/COMP_TYPE=/s/=.*/=$COMP_TYPE/" $SCRIPT_DIR/linux-live/buildconfig
+    ./install -
+}
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="bullseye"
+DISTRIBUTION_ARCH="amd64"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="bullseye"
+DISTRIBUTION_ARCH="i386"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="buster"
+DISTRIBUTION_ARCH="amd64"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="buster"
+DISTRIBUTION_ARCH="i386"
+DESKTOP_ENVIRONMENT="slax"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="buster"
+DISTRIBUTION_ARCH="amd64"
+DESKTOP_ENVIRONMENT="slax"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="buster"
+DISTRIBUTION_ARCH="i386"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="stretch"
+DISTRIBUTION_ARCH="amd64"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="debian"
+DISTRIBUTION="stretch"
+DISTRIBUTION_ARCH="i386"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="ubuntu"
+DISTRIBUTION="focal"
+DISTRIBUTION_ARCH="amd64"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build
+
+DISTRIBUTION_TYPE="ubuntu"
+DISTRIBUTION="focal"
+DISTRIBUTION_ARCH="i386"
+DESKTOP_ENVIRONMENT="xfce"
+COMP_TYPE="xz"
+build

linux-live/bootfiles/boot/syslinux.cfg

@@ -1,7 +1,7 @@
 UI /minios/boot/vesamenu.c32
 
 PROMPT 0
-TIMEOUT 40
+TIMEOUT 30
 
 MENU CLEAR
 MENU HIDDEN

linux-live/buildconfig

@@ -2,19 +2,23 @@
 
 # distribution type
 # тип дистрибутива
-DISTRIBUTION_TYPE="debian"
+DISTRIBUTION_TYPE=debian
 
 # distribution
 # дистрибутив
-DISTRIBUTION="buster"
+DISTRIBUTION=bullseye
 
 # distribution arch
 # note: stretch only works with amd64
 # архитектура дистрибутива
 # для заметки: stretch работает только с amd64
-DISTRIBUTION_ARCH="i386"
+DISTRIBUTION_ARCH=i386
 
-COMP_TYPE="xz"
+#DESKTOP_ENVIRONMENT=xfce
+#DESKTOP_ENVIRONMENT=xfce
+DESKTOP_ENVIRONMENT=xfce
+
+COMP_TYPE=xz
 
 # bootstrap variant (used to build Ubuntu)
 # вариант bootstrap (используется для сборки Ubuntu)
@@ -62,9 +66,6 @@ APT_OPTIONS="-y"
 #LIVE_TYPE="casper"
 LIVE_TYPE="livekit"
 
-#MODULES_TYPE="minios"
-#MODULES_TYPE="slax"
-MODULES_TYPE="minios"
 
 # тип iso
 BOOT_TYPE="hybrid"

linux-live/initramfs/static/minios-configure

@@ -92,6 +92,10 @@ function read_cmdline() {
             SSH=true
             shift # past argument with no value
             ;;
+        ssh_key=*)
+            SSH_KEY="${i#*=}"
+            shift # past argument=value
+            ;;
         cloud)
             CLOUD=true
             shift # past argument with no value
@@ -200,6 +204,19 @@ else
     fi
 fi
 
+if [ -z "$SSH_KEY" ]; then
+    if [ "$SCRIPT_DIR" != "/usr/bin" ]; then
+        if [ -f /etc/$LIVEKITNAME.conf ]; then
+            read_config /etc/$LIVEKITNAME.conf SSH_KEY
+            if [ -z "$SSH_KEY" ]; then
+                SSH_KEY="authorized_keys"
+            fi
+        else
+            SSH_KEY="authorized_keys"
+        fi
+    fi
+fi
+
 # Set up user 'root'
 if [ "$SCRIPT_DIR" != "/usr/bin" ]; then
     if [ ! -f /etc/$LIVEKITNAME.conf ]; then
@@ -324,6 +341,13 @@ if [ ! -f /etc/$LIVEKITNAME.conf ]; then
                     for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do
                         mkdir -p /home/$USER_NAME/$dir
                     done
+                    if [ ! -d /home/$USER_NAME/.ssh ]; then
+                        mkdir /home/$USER_NAME/.ssh
+                        chmod 700 /home/$USER_NAME/.ssh
+                    fi
+                    if [ -f /root/.ssh/authorized_keys ]; then
+                        cp /root/.ssh/authorized_keys /home/$USER_NAME/.ssh/authorized_keys
+                    fi
                     USER_ID=$(id -u $USER_NAME)
                     GROUP_ID=$(id -g $USER_NAME)
                     chown $USER_ID:$GROUP_ID /home/$USER_NAME
@@ -373,7 +397,6 @@ if [ "$CLOUD" != "true" ]; then
     if [ ! -z "$USER_NAME" ]; then
         if [ "$USER_NAME" != "root" ]; then
             cat <<EOF >>/etc/issue
-
                         Root login name: root
                         Password: $ROOT_PASSWORD
                         User login name: $USER_NAME
@@ -386,7 +409,6 @@ if [ "$CLOUD" != "true" ]; then
 EOF
         else
             cat <<EOF >>/etc/issue
-
                         Root login name: root
                         Password: $ROOT_PASSWORD
 
@@ -401,7 +423,6 @@ EOF
     fi
 else
     cat <<EOF >>/etc/issue
-
                         User login name set by
                         cloud-init. You must use
                         your ssh key to login.
@@ -428,7 +449,7 @@ ExecStop=-/bin/sh -c "if [ -f /run/initramfs/memory/data/$LIVEKITNAME/$LIVEKITNA
 [Install]
 WantedBy=multi-user.target
 EOF
-
+if [ -f /run/initramfs/memory/data/$LIVEKITNAME/$SSH_KEY ]; then if [ /etc/$LIVEKITNAME.conf -nt /run/initramfs/memory/data/$LIVEKITNAME/$LIVEKITNAME.conf ]; then cp -fp /etc/$LIVEKITNAME.conf /run/initramfs/memory/data/$LIVEKITNAME/$LIVEKITNAME.conf; fi; fi
 if [ ! -z "$USER_NAME" ]; then
     if [ -f /usr/lib/systemd/system/xorg.service ]; then
         cat <<EOF >/usr/lib/systemd/system/xorg.service
@@ -515,6 +536,7 @@ ROOT_PASSWORD=$ROOT_PASSWORD
 HOST_NAME=$HOST_NAME
 DEFAULT_TARGET=$DEFAULT_TARGET
 SSH=$SSH
+SSH_KEY=$SSH_KEY
 CLOUD=$CLOUD
 EOF
 else
@@ -536,6 +558,9 @@ else
     if [ ! -z "$SSH" ]; then
         sed -i -e "/SSH=/s/=.*/=$SSH/" /etc/$LIVEKITNAME.conf
     fi
+    if [ ! -z "$SSH_KEY" ]; then
+        sed -i -e "/SSH_KEY=/s/=.*/=$SSH_KEY/" /etc/$LIVEKITNAME.conf
+    fi
     if [ ! -z "$CLOUD" ]; then
         sed -i -e "/CLOUD=/s/=.*/=$CLOUD/" /etc/$LIVEKITNAME.conf
     fi

linux-live/livekitlib

@@ -800,7 +800,8 @@ fstab_create() {
 minios_configure() {
    debug_log "minios_configure" "$*"
 
-   local WRITABLE
+   local WRITABLE SSH_KEY
+   SSH_KEY=$(cmdline_value ssh_key)
 
    cp /bin/minios-configure $1/
    cat /proc/cmdline >$1/cmdline
@@ -810,6 +811,9 @@ minios_configure() {
    if [ $? -ne 0 ]; then
       WRITABLE="false"
       #echo "* Directory $2/$LIVEKITNAME not writable"
+      if [ -z $SSH_KEY ]; then
+         SSH_KEY="authorized_keys"
+      fi
    else
       WRITABLE="true"
       if [ -d $2/$LIVEKITNAME ]; then
@@ -824,15 +828,32 @@ minios_configure() {
          elif [ -f $1/etc/$LIVEKITNAME.conf ]; then
             cp -fp $1/etc/$LIVEKITNAME.conf $2/$LIVEKITNAME/$LIVEKITNAME.conf
          fi
+         if [ -z $SSH_KEY ]; then
+            SSH_KEY=$(config_value $1/etc/$LIVEKITNAME.conf SSH_KEY)
+            if [ -z $SSH_KEY ]; then
+               SSH_KEY="authorized_keys"
+            fi
+         fi
+         if [ ! -d $1/root/.ssh ]; then
+            mkdir $1/root/.ssh
+            chmod 700 $1/root/.ssh
+         fi
+         if [ -f $2/$LIVEKITNAME/$SSH_KEY ] && [ -f $1/root/.ssh/authorized_keys ]; then
+            if [ "$2/$LIVEKITNAME/$SSH_KEY" -nt "$1/root/.ssh/authorized_keys" ]; then
+               cp -fp $2/$LIVEKITNAME/$SSH_KEY $1/root/.ssh/authorized_keys
+            elif [ "$2/$LIVEKITNAME/$SSH_KEY" -ot "$1/root/.ssh/authorized_keys" ]; then
+               cp -fp $1/root/.ssh/authorized_keys $2/$LIVEKITNAME/$SSH_KEY
+            fi
+         elif [ -f $2/$LIVEKITNAME/$SSH_KEY ]; then
+            cp -fp $2/$LIVEKITNAME/$SSH_KEY $1/root/.ssh/authorized_keys
+         elif [ -f $1/root/.ssh/authorized_keys ]; then
+            cp -fp $1/root/.ssh/authorized_keys $2/$LIVEKITNAME/$SSH_KEY
+         fi
       fi
    fi
 
    echo "LIVEKITNAME=$LIVEKITNAME" >$1/livekit.conf
 
-   if grep -q minios_modules /proc/cmdline; then
-      cp /opt/minios-modules.tar.xz $1/minios-modules.tar.xz
-   fi
-
    mkdir $1/var/log/minios
    chroot $1 /bin/bash -c "/minios-configure" >>/dev/null 2>&1
    : 'chroot $1 /bin/bash <<'EOF'

linux-live/minioslib

@@ -46,7 +46,7 @@ function common_variables() {
         KERNEL_ARCH="arm64"
     fi
 
-    if [ $MODULES_TYPE = "slax" ]; then
+    if [ $DESKTOP_ENVIRONMENT = "slax" ]; then
         PACKAGE_VARIANT="minimal"
     fi
 
@@ -618,7 +618,7 @@ CREATE_BACKUP=$CREATE_BACKUP
 DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE
 APT_CMD=$APT_CMD
 APT_OPTIONS=$APT_OPTIONS
-LIVE_TYPE=$LIVE_TYPE
+DESKTOP_ENVIRONMENT=$DESKTOP_ENVIRONMENT
 DISTRIBUTION=$DISTRIBUTION
 DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE
 PACKAGE_VARIANT=$PACKAGE_VARIANT
@@ -759,8 +759,8 @@ function get_vars() {
     set +u
     add_chroot_configuration_files $1
     . /functions
-    read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
+    read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS DESKTOP_ENVIRONMENT DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
-    export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
+    export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS DESKTOP_ENVIRONMENT DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
     set -u
 }
 
@@ -769,8 +769,8 @@ function chroot_run() {
     add_chroot_configuration_files $1
     chroot $1 /bin/bash <<EOF
 . /functions
-read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
+read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS DESKTOP_ENVIRONMENT DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
-export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
+export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS DESKTOP_ENVIRONMENT DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
 ${@:2}
 EOF
     remove_chroot_configuration_files $1
@@ -1198,13 +1198,13 @@ EOF
     if [ $PACKAGE_VARIANT = "minimal" ]; then
         sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $BUILD_DIR/image/$LIVEKITNAME/boot/syslinux.cfg
         sed -i 's/minios.flags= /minios.flags=automount /g' $BUILD_DIR/image/$LIVEKITNAME/boot/syslinux.cfg
-        if [ $MODULES_TYPE = "slax" ]; then
+        if [ $DESKTOP_ENVIRONMENT = "slax" ]; then
             sed -i 's/quiet/quiet user_name=root/g' $BUILD_DIR/image/$LIVEKITNAME/boot/syslinux.cfg
         fi
         if [ $BOOT_TYPE = "hybrid" ]; then
             sed -i 's/minios.flags=perch/minios.flags=perch,automount/g' $BUILD_DIR/image/boot/grub/grub.cfg
             sed -i 's/minios.flags= /minios.flags=automount /g' $BUILD_DIR/image/boot/grub/grub.cfg
-            if [ $MODULES_TYPE = "slax" ]; then
+            if [ $DESKTOP_ENVIRONMENT = "slax" ]; then
                 sed -i 's/quiet/quiet user_name=root/g' $BUILD_DIR/image/boot/grub/grub.cfg
             fi
         fi
@@ -1244,7 +1244,7 @@ function build_iso() {
     DATE=$(date +%Y%m%d_%H%M)
 
     DIR=$BUILD_DIR/image
-    ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso
+    ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DESKTOP_ENVIRONMENT-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso
 
     B="-b $LIVEKITNAME/boot/isolinux.bin -c $LIVEKITNAME/boot/isolinux.boot"
 
@@ -1277,7 +1277,7 @@ function build_iso() {
     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
+        rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DESKTOP_ENVIRONMENT-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-*.iso >>$OUTPUT 2>&1
         while [ -f $ISO_DIR/$LIVEKITNAME.iso ]; do
             rm $ISO_DIR/$LIVEKITNAME.iso >>$OUTPUT 2>&1
             sleep 1
@@ -1311,7 +1311,7 @@ function build_iso() {
             rm $ISO_DIR/$LIVEKITNAME.iso >>$OUTPUT 2>&1
             sleep 1
         done
-        if ln $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then
+        if ln $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DESKTOP_ENVIRONMENT-$PACKAGE_VARIANT-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then
             echo ">>> $ISO_DIR/$LIVEKITNAME.iso created"
         fi
     fi
@@ -1577,7 +1577,7 @@ DISTRIBUTION_TYPE="$DISTRIBUTION_TYPE"
 DISTRIBUTION="$DISTRIBUTION"
 DISTRIBUTION_ARCH="$DISTRIBUTION_ARCH"
 PACKAGE_VARIANT="$PACKAGE_VARIANT"
-LIVE_TYPE="livekit"
+DESKTOP_ENVIRONMENT="livekit"
 OUTPUT="/dev/stdout" # Default is output to /dev/stdout. You can use OUTPUT="/dev/null" if you want to silent installation or OUTPUT="somefilename.log" to route events to log file.
 DEBIAN_FRONTEND_TYPE="noninteractive"
 APT_CMD="apt-get"
@@ -2071,7 +2071,7 @@ function build_modules() {
 
         MODULES_DIR=$BUILD_DIR/modules
 
-        cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE
+        cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT
 
         for MODULE in *; do
             if (ls $BUILD_DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then
@@ -2094,52 +2094,52 @@ function build_modules() {
                 #fi
 
                 # run pre-install script
-                if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall ]; then
+                if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/preinstall ]; then
                     if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
-                        cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
+                        cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
                         chmod +x $MODULE_MERGED_DIR/preinstall
                         chroot_run $MODULE_MERGED_DIR /preinstall
                     else
-                        cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
+                        cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
                         chmod +x $MODULE_MERGED_DIR/preinstall
                         chroot_run $MODULE_MERGED_DIR /preinstall >>$OUTPUT 2>&1
                     fi
                 fi
 
                 # copy files
-                if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
+                if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then
                     if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
-                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ]; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ]; then
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
                         fi
                     else
-                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && 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/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ]; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ]; then
                             mkdir $MODULE_MERGED_DIR/rootcopy-install
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
                         fi
                     else
-                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
                             mkdir $MODULE_MERGED_DIR/rootcopy-install
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
                         fi
                     fi
                 fi
 
                 # run install script
-                if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install ]; then
+                if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install ]; then
-                    cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install $MODULE_MERGED_DIR/install
+                    cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install $MODULE_MERGED_DIR/install
                     chmod +x $MODULE_MERGED_DIR/install
-                    if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/cleanup ]; then
+                    if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/cleanup ]; then
-                        cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup
+                        cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup
                     fi
-                    if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/$PACKAGE_VARIANT.list ]; then
+                    if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/$PACKAGE_VARIANT.list ]; then
-                        cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
+                        cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
                     fi
                     if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
                         chroot_run $MODULE_MERGED_DIR /install
@@ -2148,7 +2148,7 @@ function build_modules() {
                     fi
                 fi
 
-                if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
+                if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then
                     module_chroot_umount_fs
 
                     module_build_cleanup
@@ -2171,12 +2171,12 @@ function build_modules() {
                 fi
 
                 # run install2 script
-                if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install2 ]; then
+                if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install2 ]; then
-                    cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install2 $MODULE_MERGED_DIR/install2
+                    cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/install2 $MODULE_MERGED_DIR/install2
                     chmod +x $MODULE_MERGED_DIR/install2
-                    if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then
+                    if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then
                         mkdir $MODULE_MERGED_DIR/patches
-                        (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/)
+                        (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/)
                     fi
                     if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
                         chroot_run $MODULE_MERGED_DIR /install2
@@ -2186,33 +2186,33 @@ function build_modules() {
                 fi
 
                 # copy files
-                if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
+                if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then
                     if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
-                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ]; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ]; then
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
                         fi
                     else
-                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$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/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ]; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ]; then
                             mkdir $MODULE_MERGED_DIR/rootcopy-postinstall
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
                         fi
                     else
-                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
+                        if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
                             mkdir $MODULE_MERGED_DIR/rootcopy-postinstall
-                            (cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
+                            (cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$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/$MODULES_TYPE/$MODULE/postinstall ]; then
+                if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/postinstall ]; then
-                    cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
+                    cp $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
                     chmod +x $MODULE_MERGED_DIR/postinstall
                     if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
                         chroot_run $MODULE_MERGED_DIR /postinstall
@@ -2221,7 +2221,7 @@ function build_modules() {
                     fi
                 fi
 
-                if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
+                if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then
                     set +e
                     chroot_run $MODULE_MERGED_DIR uncompress_files /etc/alternatives
                     chroot_run $MODULE_MERGED_DIR uncompress_files /usr/share/man
@@ -2231,7 +2231,7 @@ function build_modules() {
                 fi
 
                 # run external actions
-                if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
+                if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then
                     cp $MODULE_UPPER_DIR/$MODULE.$BEXT $BUILD_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT >>$OUTPUT 2>&1
                 fi
 
@@ -2239,13 +2239,13 @@ function build_modules() {
 
                 module_chroot_umount_fs
 
-                if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
+                if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then
                     module_build_cleanup
                 fi
 
                 module_chroot_cleanup
 
-                if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
+                if [ ! -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/is_internal_build ]; then
                     if [ ! -f $BUILD_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT ]; then
                         if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
                             if [ $COMP_TYPE = "zstd" ]; then
@@ -2283,7 +2283,7 @@ function build_modules_live() {
 
     MODULES_DIR=$BUILD_DIR/modules
 
-    cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE
+    cd $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT
 
     for MODULE in *; do
 

linux-live/modules/cinnamon/01-firmware

@@ -0,0 +1 @@
+../xfce/01-firmware

linux-live/modules/cinnamon/02-xorg

@@ -0,0 +1 @@
+../xfce/02-xorg

linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.cinnamon/configs/menu@cinnamon.org/0.json

@@ -0,0 +1,258 @@
+{
+    "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"
+}

linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xinitrc

@@ -0,0 +1,16 @@
+#!/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

linux-live/modules/cinnamon/03-cinnamon-desktop/etc/skel/.xsession

@@ -0,0 +1 @@
+cinnamon-session

linux-live/modules/cinnamon/03-cinnamon-desktop/install

@@ -0,0 +1,137 @@
+#!/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
+  $APT_CMD update >>$OUTPUT 2>&1 &&
+    $APT_CMD install $APT_OPTIONS \
+      $(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
+
+update-alternatives --install /usr/share/images/desktop-base/desktop-background desktop-background /usr/share/backgrounds/MiniOS-wallpaper.svg 100
+
+     cat <<EOF >>/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 <<EOF >>/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 <<EOF >>/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

linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/debian-xterm.desktop

@@ -0,0 +1,12 @@
+[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

linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/htop.desktop

@@ -0,0 +1,67 @@
+[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

linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/mc.desktop

@@ -0,0 +1,20 @@
+[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;

linux-live/modules/cinnamon/03-cinnamon-desktop/rootcopy-postinstall/usr/share/applications/ncdu.desktop

@@ -0,0 +1,179 @@
+[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;

linux-live/modules/cinnamon/03-cinnamon-desktop/standard.list

@@ -0,0 +1,8 @@
+locales
+dbus-x11
+slim
+cinnamon-core
+gvfs-backends
+samba-common
+avahi-daemon
+faenza-icon-theme

linux-live/modules/cinnamon/04-cinnamon-apps/install

@@ -0,0 +1,32 @@
+#!/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
+        $APT_CMD update &&
+            $APT_CMD install -t stretch-backports $APT_OPTIONS $APT_OPTIONS2 \
+                remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1
+    else
+        $APT_CMD update &&
+            $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
+                remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1
+
+    fi
+fi
+
+if [ $PACKAGE_VARIANT = "minimal" ]; then
+    sed -i 's,create=xarchiver --add-to,create=xarchiver --compress,g' /usr/share/libfm/archivers.list
+fi

linux-live/modules/cinnamon/04-cinnamon-apps/postinstall

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1
+rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1

linux-live/modules/cinnamon/04-cinnamon-apps/standard.list

@@ -0,0 +1,8 @@
+gedit
+file-roller
+eog
+gnome-terminal
+gnome-system-monitor
+gnome-screenshot
+vlc
+gparted

linux-live/modules/cinnamon/05-firefox

@@ -0,0 +1 @@
+../xfce/05-firefox

linux-live/modules/slax/01-firmware

@@ -0,0 +1 @@
+../xfce/01-firmware

linux-live/modules/slax/01-firmware/install

@@ -1,29 +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 "firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true" | debconf-set-selections
-echo "b43-fwcutter b43-fwcutter/install-unconditional boolean true" | debconf-set-selections
-
-$APT_CMD update >>$OUTPUT 2>&1
-
-# install packages
-if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then
-    if [ $DISTRIBUTION = "focal" ] || [ $DISTRIBUTION = "bionic" ]; then
-        $APT_CMD install $APT_OPTIONS \
-            linux-firmware firmware-b43-installer firmware-ath9k-htc >>$OUTPUT 2>&1
-    else
-        $APT_CMD install $APT_OPTIONS \
-            #linux-firmware >>$OUTPUT 2>&1 #firmware-b43-installer
-            linux-image-generic
-    fi
-else
-    if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
-        $APT_CMD install $APT_OPTIONS \
-            $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-    fi
-fi

linux-live/modules/slax/01-firmware/minimal.list

@@ -1,13 +0,0 @@
-firmware-linux-free
-firmware-linux-nonfree
-firmware-atheros
-firmware-iwlwifi
-firmware-zd1211
-firmware-realtek
-firmware-bnx2
-firmware-brcm80211
-firmware-cavium
-firmware-ipw2x00
-firmware-libertas
-firmware-ti-connectivity
-firmware-b43-installer

linux-live/modules/slax/01-firmware/standard.list

@@ -1,13 +0,0 @@
-firmware-linux-free
-firmware-linux-nonfree
-firmware-atheros
-firmware-iwlwifi
-firmware-zd1211
-firmware-realtek
-firmware-bnx2
-firmware-brcm80211
-firmware-cavium
-firmware-ipw2x00
-firmware-libertas
-firmware-ti-connectivity
-firmware-b43-installer

linux-live/modules/slax/02-xorg

@@ -0,0 +1 @@
+../xfce/02-xorg

linux-live/modules/slax/02-xorg/install

@@ -1,28 +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 "keyboard-configuration	keyboard-configuration/variant	select	English (US)" | debconf-set-selections
-
-$APT_CMD update >>$OUTPUT 2>&1
-
-# install packages
-if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
-    $APT_CMD install $APT_OPTIONS \
-        $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
-
-cat <<EOF >/usr/lib/systemd/system/xorg.service
-[Unit]
-Description=X-Window
-ConditionKernelCommandLine=!text
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live
-
-EOF

linux-live/modules/slax/02-xorg/minimal.list

@@ -1,14 +0,0 @@
-xserver-xorg
-xserver-xorg-video-all
-xserver-xorg-video-intel
-xinit
-xterm
-blackbox
-libxcursor1
-breeze-cursor-theme
-x11-utils
-wmctrl
-xdotool
-libdrm-intel1
-libgl1-mesa-dri
-libglu1-mesa

linux-live/modules/slax/02-xorg/postinstall

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Set setuid bit on xorg binary, so it can be started by guest user
-chmod u+s /usr/lib/xorg/Xorg
-
-# use only white cursors. There were some troubles if the other cursors
-# was left behind, installing gtk apps reverted the cursor from white to gray,
-# so we're going to nuke it to leave only Snow cursors active.
-rm -Rf /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1
-mv /usr/share/icons/Breeze_Snow /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1
-
-(cd /rootcopy-install && cp --parents -afr * /)
-
-# install x11 server utils, apt-get would add cpp dependency, bullshit!
-cd /tmp
-apt-get download x11-xserver-utils >>$OUTPUT 2>&1
-ls -la
-dpkg -x x11-xserver-utils*.deb /tmp/x11utils >>$OUTPUT 2>&1
-cd /tmp/x11utils
-cp -aR * / >>$OUTPUT 2>&1
-
-rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1
-
-update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1

linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.Xresources

@@ -1,32 +0,0 @@
-! this are Xresources to make xterm look good
-! put into ~/.Xresources
-! after changing contents, run xrdb -merge .Xresources
-! gentoo has a bug so that it doesnt read it when X starts, so add above
-! command to /etc/xfce4/xinitrc (top) and be happy.
-
-XTerm*termName: xterm-256color
-XTerm*foreground: white
-XTerm*background: rgb:22/22/22
-XTerm*cursorColor: rgb:00/ff/00
-XTerm*borderColor: black
-XTerm*scrollColor: black
-XTerm*visualBell: true
-XTerm*saveLines: 1000
-XTerm*allowSendEvents: true
-XTerm*sessionMgt: false
-XTerm*scrollBar: true
-XTerm*rightScrollBar: true
-XTerm*eightBitInput: false
-XTerm*faceName: DejaVu Sans Mono: size=9
-XTerm*boldFont: DejaVu Sans Mono Bold: size=9
-XTerm*renderFont: true
-XTerm*activeIcon: true
-XTerm*iconPixmap: /usr/share/icons/locolor/16x16/apps/xterm.xbm
-XTerm*fullscreen: never
-XTerm*selectToClipboard: true
-Xft.dpi: 96
-Xft.antialias: true
-Xft.hinting: true
-Xft.hintstyle: hintlight
-Xft.lcdfilter: lcddefault
-Xft.rgba: rgb

linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackbox-menu

@@ -1,4 +0,0 @@
-[begin] ( Menu             )
-   [exec] (Terminal) { xterm -ls -title Terminal }
-   [exit] (Exit)
-[end]

linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackboxrc

@@ -1,6 +0,0 @@
-session.screen0.toolbar.widthPercent:	100
-session.screen0.strftimeFormat:	%H:%M
-session.edgeSnapThreshold:	10
-session.menuFile:	/root/.blackbox-menu
-session.styleFile:	/usr/share/blackbox/styles/Slax
-session.changeWorkspaceWithMouseWheel:	False

linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.xinitrc

@@ -1,2 +0,0 @@
-xrdb -merge .Xresources
-blackbox

linux-live/modules/slax/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service

@@ -1 +0,0 @@
-/lib/systemd/system/xorg.service

linux-live/modules/slax/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service

@@ -1,7 +0,0 @@
-[Unit]
-Description=X-Window
-ConditionKernelCommandLine=!text
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live

linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax

@@ -1,79 +0,0 @@
-*.appearance: flat solid
-
-*button.pressed.appearance: sunken solid
-*button.pressed.backgroundColor: rgb:69/c1/f1
-*button.appearance: parentrelative
-
-*.focus.backgroundColor: rgb:69/c1/f1
-*.unfocus.backgroundColor: rgb:28/28/28
-
-*font: Bitstream Vera Sans-9
-
-menu.title.appearance: flat solid
-menu.title.backgroundColor: rgb:69/c1/f1
-menu.title.textColor: rgb:28/28/28
-menu.title.alignment: center
-menu.title.marginWidth: 6
-
-menu.frame.appearance: flat gradient border
-menu.frame.textColor: rgb:28/28/28
-menu.frame.foregroundColor: grey40
-menu.frame.borderColor: rgb:69/c1/f1
-menu.frame.borderWidth: 6
-menu.frame.disabledColor: darkgrey
-menu.frame.alignment: left
-menu.frame.marginWidth: 2
-
-menu.active.appearance: flat solid border
-menu.active.backgroundColor: rgb:69/c1/f1
-menu.active.borderWidth: 4
-menu.active.borderColor: rgb:69/c1/f1
-menu.active.textColor: rgb:38/38/38
-
-rootCommand: bsetroot -solid rgb:77/90/aa
-
-slit.appearance: raised solid
-slit.backgroundColor: rgb:77/90/aa
-slit.marginWidth: 3
-
-toolbar.appearance: flat gradient border
-toolbar.alignment: center
-toolbar*textColor: rgb:28/28/28
-toolbar.label.appearance: parentrelative
-toolbar.clock.appearance: parentrelative
-toolbar.windowLabel.appearance: parentrelative
-
-window.title.focus.appearance: flat solid
-window.title.focus.backgroundColor: rgb:69/c1/f1
-window.title.unfocus.appearance: flat solid
-window.title.unfocus.backgroundColor: rgb:d6/d6/d6
-window.title.marginWidth: 5
-
-window.label.focus.appearance: parentrelative
-window.label.focus.textColor: rgb:28/28/28
-window.label.unfocus.appearance: parentrelative
-window.label.unfocus.textColor: rgb:28/28/28
-window.label.marginWidth: 1
-
-window.button.focus.appearance: parentrelative
-window.button.focus.foregroundColor: white
-
-window.button.unfocus.appearance: parentrelative
-window.button.unfocus.foregroundColor: darkgrey
-
-window.handle.focus.appearance: flat solid
-window.handle.focus.backgroundColor: rgb:69/c1/f1
-window.handle.unfocus.appearance: flat solid
-window.handle.unfocus.backgroundColor: rgb:d6/d6/d6
-
-window.grip.focus.appearance: flat solid
-window.grip.focus.backgroundColor: rgb:69/c1/f1
-window.grip.unfocus.appearance: flat solid
-window.grip.unfocus.backgroundColor: rgb:d6/d6/d6
-
-window*alignment: center
-
-window.handleHeight: 7
-window.frame.borderWidth: 7
-window.frame.focus.borderColor: rgb:69/c1/f1
-window.frame.unfocus.borderColor: rgb:d6/d6/d6

linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm

@@ -1,6 +0,0 @@
-#define command2_width 16
-#define command2_height 16
-static unsigned char command2_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff,
-   0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1,
-   0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

linux-live/modules/slax/02-xorg/standard.list

@@ -1,15 +0,0 @@
-xserver-xorg
-xserver-xorg-video-all
-xserver-xorg-video-intel
-xinit
-xterm
-blackbox
-libxcursor1
-breeze-cursor-theme
-x11-utils
-wmctrl
-xdotool
-libdrm-intel1
-libgl1-mesa-dri
-libglu1-mesa
-open-vm-tools-desktop

linux-live/modules/test/01-firmware/install

@@ -1,29 +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 "firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true" | debconf-set-selections
-echo "b43-fwcutter b43-fwcutter/install-unconditional boolean true" | debconf-set-selections
-
-$APT_CMD update >>$OUTPUT 2>&1
-
-# install packages
-if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then
-    if [ $DISTRIBUTION = "focal" ] || [ $DISTRIBUTION = "bionic" ]; then
-        $APT_CMD install $APT_OPTIONS \
-            linux-firmware firmware-b43-installer firmware-ath9k-htc >>$OUTPUT 2>&1
-    else
-        $APT_CMD install $APT_OPTIONS \
-            #linux-firmware >>$OUTPUT 2>&1 #firmware-b43-installer
-            linux-image-generic
-    fi
-else
-    if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
-        $APT_CMD install $APT_OPTIONS \
-            $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-    fi
-fi

linux-live/modules/test/01-firmware/minimal.list

@@ -1,13 +0,0 @@
-firmware-linux-free
-firmware-linux-nonfree
-firmware-atheros
-firmware-iwlwifi
-firmware-zd1211
-firmware-realtek
-firmware-bnx2
-firmware-brcm80211
-firmware-cavium
-firmware-ipw2x00
-firmware-libertas
-firmware-ti-connectivity
-firmware-b43-installer

linux-live/modules/test/01-firmware/standard.list

@@ -1,13 +0,0 @@
-firmware-linux-free
-firmware-linux-nonfree
-firmware-atheros
-firmware-iwlwifi
-firmware-zd1211
-firmware-realtek
-firmware-bnx2
-firmware-brcm80211
-firmware-cavium
-firmware-ipw2x00
-firmware-libertas
-firmware-ti-connectivity
-firmware-b43-installer

linux-live/modules/test/02-xorg/install

@@ -1,33 +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 "keyboard-configuration	keyboard-configuration/variant	select	English (US)" | debconf-set-selections
-
-$APT_CMD update >>$OUTPUT 2>&1
-
-# install packages
-if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
-    $APT_CMD install $APT_OPTIONS \
-        $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
-fi
-
-cat <<EOF >/usr/lib/systemd/system/xorg.service
-[Unit]
-Description=X-Window
-ConditionKernelCommandLine=!text
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live
-
-EOF
-
-update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1
-if [ ! -L /etc/alternatives/x-terminal-emulator ]; then
-    ln -s /usr/bin/xterm /etc/alternatives/x-terminal-emulator
-fi

linux-live/modules/test/02-xorg/minimal.list

@@ -1,14 +0,0 @@
-xserver-xorg
-xserver-xorg-video-all
-xserver-xorg-video-intel
-xinit
-xterm
-blackbox
-libxcursor1
-breeze-cursor-theme
-x11-utils
-wmctrl
-xdotool
-libdrm-intel1
-libgl1-mesa-dri
-libglu1-mesa

linux-live/modules/test/02-xorg/postinstall

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Set setuid bit on xorg binary, so it can be started by guest user
-chmod u+s /usr/lib/xorg/Xorg
-
-# use only white cursors. There were some troubles if the other cursors
-# was left behind, installing gtk apps reverted the cursor from white to gray,
-# so we're going to nuke it to leave only Snow cursors active.
-rm -Rf /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1
-mv /usr/share/icons/Breeze_Snow /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1
-
-(cd /rootcopy-install && cp --parents -afr * /)
-
-# install x11 server utils, apt-get would add cpp dependency, bullshit!
-cd /tmp
-apt-get download x11-xserver-utils >>$OUTPUT 2>&1
-ls -la
-dpkg -x x11-xserver-utils*.deb /tmp/x11utils >>$OUTPUT 2>&1
-cd /tmp/x11utils
-cp -aR * / >>$OUTPUT 2>&1
-
-rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1
-
-update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1

linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.Xresources

@@ -1,32 +0,0 @@
-! this are Xresources to make xterm look good
-! put into ~/.Xresources
-! after changing contents, run xrdb -merge .Xresources
-! gentoo has a bug so that it doesnt read it when X starts, so add above
-! command to /etc/xfce4/xinitrc (top) and be happy.
-
-XTerm*termName: xterm-256color
-XTerm*foreground: white
-XTerm*background: rgb:22/22/22
-XTerm*cursorColor: rgb:00/ff/00
-XTerm*borderColor: black
-XTerm*scrollColor: black
-XTerm*visualBell: true
-XTerm*saveLines: 1000
-XTerm*allowSendEvents: true
-XTerm*sessionMgt: false
-XTerm*scrollBar: true
-XTerm*rightScrollBar: true
-XTerm*eightBitInput: false
-XTerm*faceName: DejaVu Sans Mono: size=9
-XTerm*boldFont: DejaVu Sans Mono Bold: size=9
-XTerm*renderFont: true
-XTerm*activeIcon: true
-XTerm*iconPixmap: /usr/share/icons/locolor/16x16/apps/xterm.xbm
-XTerm*fullscreen: never
-XTerm*selectToClipboard: true
-Xft.dpi: 96
-Xft.antialias: true
-Xft.hinting: true
-Xft.hintstyle: hintlight
-Xft.lcdfilter: lcddefault
-Xft.rgba: rgb

linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackbox-menu

@@ -1,4 +0,0 @@
-[begin] ( Menu             )
-   [exec] (Terminal) { xterm -ls -title Terminal }
-   [exit] (Exit)
-[end]

linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackboxrc

@@ -1,6 +0,0 @@
-session.screen0.toolbar.widthPercent:	100
-session.screen0.strftimeFormat:	%H:%M
-session.edgeSnapThreshold:	10
-session.menuFile:	/root/.blackbox-menu
-session.styleFile:	/usr/share/blackbox/styles/Slax
-session.changeWorkspaceWithMouseWheel:	False

linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.xinitrc

@@ -1,2 +0,0 @@
-xrdb -merge .Xresources
-blackbox

linux-live/modules/test/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service

@@ -1 +0,0 @@
-/lib/systemd/system/xorg.service

linux-live/modules/test/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service

@@ -1,7 +0,0 @@
-[Unit]
-Description=X-Window
-ConditionKernelCommandLine=!text
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live

linux-live/modules/test/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax

@@ -1,79 +0,0 @@
-*.appearance: flat solid
-
-*button.pressed.appearance: sunken solid
-*button.pressed.backgroundColor: rgb:69/c1/f1
-*button.appearance: parentrelative
-
-*.focus.backgroundColor: rgb:69/c1/f1
-*.unfocus.backgroundColor: rgb:28/28/28
-
-*font: Bitstream Vera Sans-9
-
-menu.title.appearance: flat solid
-menu.title.backgroundColor: rgb:69/c1/f1
-menu.title.textColor: rgb:28/28/28
-menu.title.alignment: center
-menu.title.marginWidth: 6
-
-menu.frame.appearance: flat gradient border
-menu.frame.textColor: rgb:28/28/28
-menu.frame.foregroundColor: grey40
-menu.frame.borderColor: rgb:69/c1/f1
-menu.frame.borderWidth: 6
-menu.frame.disabledColor: darkgrey
-menu.frame.alignment: left
-menu.frame.marginWidth: 2
-
-menu.active.appearance: flat solid border
-menu.active.backgroundColor: rgb:69/c1/f1
-menu.active.borderWidth: 4
-menu.active.borderColor: rgb:69/c1/f1
-menu.active.textColor: rgb:38/38/38
-
-rootCommand: bsetroot -solid rgb:77/90/aa
-
-slit.appearance: raised solid
-slit.backgroundColor: rgb:77/90/aa
-slit.marginWidth: 3
-
-toolbar.appearance: flat gradient border
-toolbar.alignment: center
-toolbar*textColor: rgb:28/28/28
-toolbar.label.appearance: parentrelative
-toolbar.clock.appearance: parentrelative
-toolbar.windowLabel.appearance: parentrelative
-
-window.title.focus.appearance: flat solid
-window.title.focus.backgroundColor: rgb:69/c1/f1
-window.title.unfocus.appearance: flat solid
-window.title.unfocus.backgroundColor: rgb:d6/d6/d6
-window.title.marginWidth: 5
-
-window.label.focus.appearance: parentrelative
-window.label.focus.textColor: rgb:28/28/28
-window.label.unfocus.appearance: parentrelative
-window.label.unfocus.textColor: rgb:28/28/28
-window.label.marginWidth: 1
-
-window.button.focus.appearance: parentrelative
-window.button.focus.foregroundColor: white
-
-window.button.unfocus.appearance: parentrelative
-window.button.unfocus.foregroundColor: darkgrey
-
-window.handle.focus.appearance: flat solid
-window.handle.focus.backgroundColor: rgb:69/c1/f1
-window.handle.unfocus.appearance: flat solid
-window.handle.unfocus.backgroundColor: rgb:d6/d6/d6
-
-window.grip.focus.appearance: flat solid
-window.grip.focus.backgroundColor: rgb:69/c1/f1
-window.grip.unfocus.appearance: flat solid
-window.grip.unfocus.backgroundColor: rgb:d6/d6/d6
-
-window*alignment: center
-
-window.handleHeight: 7
-window.frame.borderWidth: 7
-window.frame.focus.borderColor: rgb:69/c1/f1
-window.frame.unfocus.borderColor: rgb:d6/d6/d6

linux-live/modules/test/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm

@@ -1,6 +0,0 @@
-#define command2_width 16
-#define command2_height 16
-static unsigned char command2_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff,
-   0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1,
-   0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

linux-live/modules/test/02-xorg/standard.list

@@ -1,15 +0,0 @@
-xserver-xorg
-xserver-xorg-video-all
-xserver-xorg-video-intel
-xinit
-xterm
-blackbox
-libxcursor1
-breeze-cursor-theme
-x11-utils
-wmctrl
-xdotool
-libdrm-intel1
-libgl1-mesa-dri
-libglu1-mesa
-open-vm-tools-desktop

linux-live/modules/xfce/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   width="256"
+   height="256"
+   version="1.1"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+   viewBox="0 0 256 256"
+   id="svg345"
+   sodipodi:docname="MiniOS-wis.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)"><metadata
+   id="metadata349"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1241"
+   inkscape:window-height="523"
+   id="namedview347"
+   showgrid="false"
+   inkscape:snap-global="false"
+   inkscape:zoom="0.984375"
+   inkscape:cx="235.54225"
+   inkscape:cy="107.04132"
+   inkscape:window-x="919"
+   inkscape:window-y="246"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Слой_x0020_1" />
+ <defs
+   id="defs292">
+  <font
+   id="FontID0"
+   horiz-adv-x="606"
+   font-variant="normal"
+   style="fill-rule:nonzero"
+   font-weight="700"
+   horiz-origin-x="0"
+   horiz-origin-y="0"
+   vert-origin-x="512"
+   vert-origin-y="768"
+   vert-adv-y="1024">
+	<font-face
+   font-family="Calibri"
+   id="font-face273">
+		<font-face-src>
+			<font-face-name
+   name="Calibri Bold" />
+		</font-face-src>
+	</font-face>
+   <missing-glyph
+   id="missing-glyph277"><path
+     d="M0 0z"
+     id="path275" /></missing-glyph>
+   <glyph
+   unicode="M"
+   horiz-adv-x="874"
+   d="M805.029 17.4996c0,-3.16292 -0.828384,-6.16581 -2.66401,-8.82982 -1.83562,-2.50398 -5.16799,-4.66907 -9.83706,-6.33525 -4.66907,-1.49674 -10.9949,-2.83345 -18.8363,-3.83128 -7.83199,-1.00724 -17.8291,-1.50615 -29.8312,-1.50615 -11.8327,0 -21.6698,0.498913 -29.5018,1.50615 -7.83199,0.997826 -13.9978,2.33454 -18.6669,3.83128 -4.49963,1.66618 -7.83199,3.83128 -9.66762,6.33525 -1.99565,2.66401 -2.99348,5.6669 -2.99348,8.82982l0 514.521 -1.00724 0 -182.508 -514.022c-1.3273,-4.16075 -3.33236,-7.66255 -6.32584,-10.496 -3.00289,-2.83345 -6.83417,-4.99854 -12.0022,-6.66472 -4.99854,-1.50615 -11.5032,-2.67342 -19.1658,-3.17233 -7.84141,-0.498913 -17.3396,-0.668355 -28.3345,-0.668355 -11.1738,0 -20.5025,0.338884 -28.3345,1.16727 -7.84141,0.837797 -14.3367,2.16509 -19.3352,4.00072 -4.99854,1.83562 -8.99926,4.00072 -12.0022,6.5047 -2.83345,2.66401 -4.83852,5.82693 -5.83634,9.32873l-176.173 514.022 -0.997826 0 0 -514.521c0,-3.16292 -0.837797,-6.16581 -2.66401,-8.82982 -1.83562,-2.50398 -5.16799,-4.66907 -10.0065,-6.33525 -4.99854,-1.49674 -11.3338,-2.83345 -18.9963,-3.83128 -7.67196,-1.00724 -17.4996,-1.50615 -29.5018,-1.50615 -11.8327,0 -21.6698,0.498913 -29.5018,1.50615 -7.83199,0.997826 -14.1672,2.33454 -18.8363,3.83128 -4.66907,1.66618 -8.00144,3.83128 -9.82765,6.33525 -1.83562,2.66401 -2.67342,5.6669 -2.67342,8.82982l0 563.188c0,16.6712 4.3396,29.3323 13.1694,38.1716 8.82982,8.82982 20.5025,13.1694 35.3381,13.1694l83.9962 0c15.005,0 28.005,-1.16727 38.6705,-3.67125 10.8349,-2.50398 20.173,-6.5047 28.005,-12.1716 7.66255,-5.6669 14.3273,-13.16 19.4953,-22.4982 5.16799,-9.32873 9.83706,-20.832 13.6683,-34.5003l136.175 -376.51 1.99565 0 141.004 375.682c4.17016,13.6589 8.83923,25.1622 13.8378,34.6603 5.16799,9.33815 11.0043,17.0007 17.6691,22.837 6.66472,5.83634 14.6662,9.99709 23.6654,12.5011 9.1687,2.50398 19.8341,3.67125 31.8363,3.67125l86.6697 0c8.82982,0 16.3323,-1.16727 22.6676,-3.5018 6.33525,-2.16509 11.6633,-5.50687 15.664,-10.0065 4.17016,-4.33019 7.17305,-9.66762 9.33815,-15.9935 2.16509,-6.33525 3.16292,-13.6683 3.16292,-21.8392l0 -563.188z"
+   id="glyph279" />
+   <glyph
+   unicode="O"
+   horiz-adv-x="676"
+   d="M637.027 323.343c0,-52.3294 -6.5047,-99.1707 -19.5047,-140.505 -13,-41.3345 -32.3352,-76.5031 -58.1657,-105.167 -25.6705,-28.8334 -57.5068,-50.8326 -95.3395,-66.0071 -38.0021,-15.1651 -81.8406,-22.6676 -131.675,-22.6676 -49.1665,0 -91.9977,6.5047 -128.503,19.3352 -36.6654,12.84 -67.165,32.3352 -91.6682,58.8341 -24.3338,26.3388 -42.6712,59.8413 -54.8334,100.507 -12.1716,40.6661 -18.3374,88.8348 -18.3374,144.506 0,51.0021 6.5047,97.0056 19.5047,137.841 13,40.8356 32.3352,75.4959 58.1657,104.169 25.6705,28.664 57.5068,50.6632 95.3395,65.8377 38.0021,15.3345 82.0006,22.9971 132.174,22.9971 47.8298,0 90.002,-6.33525 126.667,-18.9963 36.5054,-12.6705 67.165,-32.1752 91.6682,-58.6741 24.6727,-26.3294 43.1701,-59.5024 55.6712,-99.6696 12.5011,-40.3366 18.8363,-87.6675 18.8363,-142.341zm-135.008 -6.49528c0,33.1636 -2.66401,63.3337 -7.83199,90.5009 -5.16799,27.1672 -13.9978,50.5032 -26.4989,69.8384 -12.5011,19.3352 -29.1723,34.3309 -50.0043,44.9963 -20.832,10.5054 -46.8413,15.8334 -78.0093,15.8334 -31.4974,0 -57.8268,-5.99637 -78.8283,-17.8291 -21.1709,-11.8327 -38.341,-27.8356 -51.341,-47.6697 -13,-19.8341 -22.1687,-43.0007 -27.4967,-69.4995 -5.33743,-26.6683 -8.00144,-54.6733 -8.00144,-84.3351 0,-34.5097 2.66401,-65.5082 7.83199,-93.0049 5.16799,-27.5061 13.9978,-51.0021 26.3388,-70.6762 12.3316,-19.4953 28.8334,-34.3309 49.6654,-44.6668 20.832,-10.1665 47.0014,-15.3345 78.4988,-15.3345 31.5068,0 57.8363,5.83634 78.8377,17.6691 21.1709,11.6727 38.341,27.6661 51.341,47.8392 13,20.1636 22.1687,43.669 27.4967,70.4974 5.33743,26.8378 8.00144,55.5017 8.00144,85.8413z"
+   id="glyph281" />
+   <glyph
+   unicode="S"
+   horiz-adv-x="472"
+   d="M444.014 189.672c0,-33.333 -6.16581,-62.3359 -18.4974,-87.498 -12.5011,-25.0021 -29.1723,-45.8341 -50.3337,-62.6748 -21.3403,-16.6618 -46.0035,-29.3323 -74.338,-37.8327 -28.3345,-8.50035 -58.6646,-12.6705 -90.9999,-12.6705 -21.8392,0 -42.0028,1.83562 -60.8391,5.50687 -18.6669,3.66183 -35.1687,8.00144 -49.5054,13.16 -14.3273,5.00796 -26.3294,10.336 -35.997,16.0029 -9.66762,5.6669 -16.5018,10.6654 -20.832,14.8356 -4.17016,4.33019 -7.17305,10.5054 -8.99926,18.4974 -1.83562,8.00144 -2.67342,19.3352 -2.67342,34.3403 0,10.1665 0.338884,18.4974 1.00724,25.3316 0.658942,6.83417 1.66618,12.3316 3.16292,16.6712 1.49674,4.16075 3.5018,7.16364 5.83634,8.99926 2.49457,1.83562 5.32801,2.66401 8.66038,2.66401 4.49963,0 11.0043,-2.66401 19.3352,-8.17088 8.34032,-5.32801 19.0058,-11.3338 32.0057,-17.8291 13,-6.5047 28.664,-12.5011 46.8319,-17.8385 17.9985,-5.49746 38.9999,-8.16146 62.8348,-8.16146 15.6734,0 29.6712,1.83562 42.0028,5.49746 12.5011,3.83128 22.9971,8.99926 31.6669,15.8334 8.66979,6.83417 15.1651,15.1651 19.8341,25.1716 4.49963,9.99709 6.83417,21.1614 6.83417,33.5025 0,14.3273 -3.83128,26.6683 -11.6633,36.8348 -7.83199,10.3266 -18.0079,19.3352 -30.669,27.3273 -12.5011,8.00144 -26.8378,15.504 -42.8406,22.5076 -15.8334,6.9942 -32.3352,14.3273 -49.3359,22.1687 -17.0007,7.83199 -33.4931,16.6618 -49.3265,26.6589 -16.0029,9.83706 -30.3396,21.6698 -42.8406,35.5075 -12.6611,13.8284 -22.837,30.1701 -30.669,49.1665 -7.83199,18.8363 -11.6633,41.5039 -11.6633,67.8333 0,30.1701 5.6669,56.8384 16.8313,79.8355 11.1644,22.837 26.3388,41.8428 45.3352,57.0079 19.1658,15.1651 41.5039,26.4989 67.3344,34.0014 25.8399,7.50252 53.3366,11.1644 82.3395,11.1644 14.8356,0 29.8312,-1.16727 44.8363,-3.5018 14.9956,-2.16509 29.0028,-5.32801 42.0028,-9.1687 13,-3.9913 24.4938,-8.33091 34.6697,-13.16 9.99709,-4.99854 16.6618,-8.99926 19.9942,-12.341 3.17233,-3.16292 5.33743,-5.99637 6.5047,-8.16146 1.16727,-2.33454 2.16509,-5.33743 2.99348,-9.1687 0.837797,-3.66183 1.33671,-8.33091 1.67559,-14.1672 0.329471,-5.6669 0.498913,-12.6705 0.498913,-21.1709 0,-9.32873 -0.169442,-17.3302 -0.668355,-23.8349 -0.498913,-6.49528 -1.33671,-11.8327 -2.50398,-16.1629 -1.16727,-4.17016 -2.83345,-7.33308 -4.8291,-9.1687 -2.16509,-1.99565 -4.99854,-2.99348 -8.66979,-2.99348 -3.5018,0 -9.1687,2.32512 -17.0007,6.82475 -7.83199,4.49963 -17.4996,9.50759 -28.8334,15.005 -11.5032,5.33743 -24.6727,10.1665 -39.6683,14.4967 -15.005,4.49963 -31.3374,6.67414 -49.3359,6.67414 -13.9978,0 -26.1694,-1.66618 -36.6654,-5.16799 -10.336,-3.33236 -19.0058,-8.17088 -26,-14.1672 -7.00361,-6.00578 -12.341,-13.1694 -15.6734,-21.6698 -3.5018,-8.50035 -5.16799,-17.4996 -5.16799,-26.8378 0,-13.9978 3.84069,-26.16 11.5032,-36.3359 7.67196,-10.3266 17.9985,-19.4953 30.8385,-27.4967 12.8305,-7.83199 27.4967,-15.3345 43.829,-22.3381 16.1723,-6.9942 32.8341,-14.4967 49.8348,-22.1593 17.0007,-7.84141 33.6719,-16.6712 49.8348,-26.6683 16.3418,-10.0065 30.8385,-21.8392 43.669,-35.6676 12.6705,-13.8378 23.0065,-30.0007 30.8385,-48.837 7.83199,-18.6669 11.6633,-40.6661 11.6633,-66.0071z"
+   id="glyph283" />
+   <glyph
+   unicode="i"
+   horiz-adv-x="245"
+   d="M185.003 16.5018c0,-3.17233 -0.997826,-6.00578 -2.99348,-8.50035 -1.83562,-2.50398 -5.16799,-4.49963 -10.0065,-6.16581 -4.65966,-1.50615 -10.9949,-2.83345 -18.6669,-3.67125 -7.83199,-0.828384 -17.8291,-1.16727 -29.8312,-1.16727 -12.0022,0 -21.9992,0.338884 -29.8312,1.16727 -7.67196,0.837797 -14.0072,2.16509 -18.6669,3.67125 -4.83852,1.66618 -8.17088,3.66183 -10.0065,6.16581 -1.99565,2.49457 -2.99348,5.32801 -2.99348,8.50035l0 435.015c0,3.17233 0.997826,6.00578 2.99348,8.50035 1.83562,2.50398 5.16799,4.66907 10.0065,6.33525 4.65966,1.83562 10.9949,3.16292 18.6669,4.17016 7.83199,0.997826 17.8291,1.49674 29.8312,1.49674 12.0022,0 21.9992,-0.498913 29.8312,-1.49674 7.67196,-1.00724 14.0072,-2.33454 18.6669,-4.17016 4.83852,-1.66618 8.17088,-3.83128 10.0065,-6.33525 1.99565,-2.49457 2.99348,-5.32801 2.99348,-8.50035l0 -435.015zm10.0065 584.02c0,-24.8327 -4.99854,-41.8334 -15.1651,-51.3316 -10.1665,-9.50759 -28.8428,-14.1672 -56.3395,-14.1672 -27.6661,0 -46.5025,4.49963 -56.0006,13.6683 -9.66762,9.15929 -14.5061,25.6611 -14.5061,49.3359 0,24.8327 5.00796,41.9934 15.005,51.661 9.83706,9.50759 28.664,14.3367 56.4995,14.3367 27.3367,0 46.0035,-4.66907 55.8406,-13.9978 9.82765,-9.1687 14.6662,-25.6705 14.6662,-49.5054z"
+   id="glyph285" />
+   <glyph
+   unicode="n"
+   horiz-adv-x="536"
+   d="M478.015 16.5018c0,-3.17233 -0.997826,-6.00578 -2.99348,-8.50035 -1.83562,-2.50398 -5.16799,-4.49963 -9.66762,-6.16581 -4.66907,-1.50615 -11.0043,-2.83345 -19.0058,-3.67125 -8.00144,-0.828384 -17.8291,-1.16727 -29.5018,-1.16727 -12.1622,0 -22.1687,0.338884 -30.1607,1.16727 -8.00144,0.837797 -14.3367,2.16509 -19.0058,3.67125 -4.49963,1.66618 -7.83199,3.66183 -9.66762,6.16581 -1.99565,2.49457 -3.00289,5.32801 -3.00289,8.50035l0 248.506c0,21.1709 -1.49674,37.8421 -4.65966,49.8348 -3.00289,12.1716 -7.50252,22.5076 -13.3389,31.0079 -5.83634,8.66038 -13.4989,15.3345 -22.6676,20.1636 -9.32873,4.66907 -19.9942,7.00361 -32.3352,7.00361 -15.664,0 -31.328,-5.6669 -47.3308,-17.1701 -15.8334,-11.3338 -32.5047,-28.005 -49.6748,-49.6654l0 -289.68c0,-3.17233 -0.997826,-6.00578 -2.99348,-8.50035 -1.83562,-2.50398 -5.16799,-4.49963 -10.0065,-6.16581 -4.65966,-1.50615 -10.9949,-2.83345 -18.6669,-3.67125 -7.83199,-0.828384 -17.8291,-1.16727 -29.8312,-1.16727 -12.0022,0 -21.9992,0.338884 -29.8312,1.16727 -7.67196,0.837797 -14.0072,2.16509 -18.6669,3.67125 -4.83852,1.66618 -8.17088,3.66183 -10.0065,6.16581 -1.99565,2.49457 -2.99348,5.32801 -2.99348,8.50035l0 436.012c0,3.17233 0.828384,6.00578 2.49457,8.50035 1.50615,2.50398 4.49963,4.49963 8.66979,6.16581 4.33019,1.50615 9.66762,2.83345 16.3323,3.67125 6.66472,0.837797 15.1651,1.16727 25.1716,1.16727 10.496,0 18.9963,-0.329471 25.8305,-1.16727 6.83417,-0.837797 12.1716,-2.16509 16.0029,-3.67125 3.66183,-1.66618 6.33525,-3.66183 8.00144,-6.16581 1.66618,-2.49457 2.49457,-5.32801 2.49457,-8.50035l0 -50.3337c24.0043,26 48.5075,45.3352 73.5097,58.3352 24.8327,13 50.8326,19.5047 77.8304,19.5047 29.6712,0 54.6733,-4.83852 75.0064,-14.6662 20.3331,-9.66762 36.6654,-23.0065 49.3359,-39.8377 12.5011,-16.6712 21.5003,-36.3359 26.9978,-58.8341 5.49746,-22.4982 8.33091,-49.5054 8.33091,-81.0028l0 -269.178z"
+   id="glyph287" />
+  </font>
+  <style
+   type="text/css"
+   id="style290">
+   <![CDATA[
+    @font-face { font-family:"Calibri";font-variant:normal;font-weight:bold;src:url("#FontID0") format(svg)}
+    .fil7 {fill:#FEFEFE}
+    .fil5 {fill:#C5C6C6}
+    .fil3 {fill:#5B5B5B}
+    .fil1 {fill:#F05A28}
+    .fil0 {fill:#FF3C00}
+    .fil8 {fill:#FEFEFE;fill-rule:nonzero}
+    .fil6 {fill:#D9DADA;fill-rule:nonzero}
+    .fil4 {fill:#5B5B5B;fill-rule:nonzero}
+    .fil2 {fill:#231F20;fill-rule:nonzero}
+    .fnt0 {font-weight:bold;font-size:125.47px;font-family:'Calibri'}
+   ]]>
+  </style>
+ </defs>
+ <g
+   id="Слой_x0020_1">
+  <metadata
+   id="CorelCorpID_0Corel-Layer" />
+  
+  <g
+   id="g302"
+   transform="matrix(2.370917,0,0,2.370917,-47.920959,-93.188184)">
+   <path
+   class="fil1"
+   d="M 71.78,95.93 V 49.5 c 25.64,0 46.43,20.79 46.43,46.43 z"
+   id="path299"
+   style="fill:#ff3c00;fill-opacity:1" />
+   <path
+   id="1"
+   class="fil2"
+   d="M 79.31,49.5 V 95.93 H 64.25 V 49.5 l 7.53,-7.53 z m -15.06,0 c 0,-4.16 3.37,-7.53 7.53,-7.53 4.16,0 7.53,3.37 7.53,7.53 z m 53.96,53.95 V 88.4 l -7.53,7.53 -0.05,-2.01 -0.15,-1.98 -0.25,-1.95 -0.34,-1.91 -0.44,-1.88 -0.52,-1.85 -0.61,-1.8 -0.7,-1.76 -0.77,-1.73 -0.86,-1.67 -0.94,-1.63 -1.01,-1.58 -1.09,-1.52 -1.15,-1.47 -1.23,-1.42 -1.29,-1.35 -1.35,-1.29 -1.41,-1.22 -1.47,-1.16 -1.53,-1.08 -1.58,-1.02 -1.63,-0.93 -1.67,-0.86 -1.72,-0.78 -1.77,-0.7 -1.8,-0.61 -1.84,-0.52 -1.88,-0.43 -1.92,-0.35 -1.94,-0.24 -1.98,-0.15 -2.01,-0.05 V 41.97 l 2.77,0.07 2.73,0.21 2.7,0.34 2.66,0.48 2.61,0.6 2.57,0.73 2.51,0.84 2.45,0.97 2.39,1.08 2.33,1.2 2.26,1.3 2.19,1.4 2.11,1.5 2.04,1.6 1.96,1.7 1.87,1.78 1.79,1.88 1.69,1.95 1.6,2.04 1.51,2.11 1.4,2.19 1.3,2.26 1.19,2.33 1.08,2.39 0.97,2.46 0.85,2.51 0.73,2.56 0.6,2.61 0.47,2.66 0.35,2.7 0.2,2.74 0.07,2.77 z m 7.52,-7.52 c 0,4.15 -3.37,7.52 -7.52,7.52 -4.16,0 -7.53,-3.37 -7.53,-7.52 z M 71.78,88.4 h 46.43 v 15.05 H 71.78 l -7.53,-7.52 z m 0,15.05 c -4.16,0 -7.53,-3.37 -7.53,-7.52 0,-4.16 3.37,-7.53 7.53,-7.53 z"
+   style="fill:#f9f9f9" />
+  </g>
+  <g
+   id="g306"
+   transform="matrix(2.370917,0,0,2.370917,-47.920959,-93.188184)">
+   <path
+   class="fil2"
+   d="M 112.56,103.46 H 71.78 V 88.39 h 40.78 l 7.53,7.53 z m 0,-15.07 c 4.16,0 7.53,3.38 7.53,7.53 0,4.16 -3.37,7.54 -7.53,7.54 z m -40.78,55.85 v -15.06 0 l 1.72,-0.04 1.69,-0.13 1.66,-0.21 1.64,-0.29 1.61,-0.37 1.57,-0.45 1.54,-0.52 1.51,-0.6 1.47,-0.66 1.43,-0.74 1.4,-0.8 1.35,-0.86 1.3,-0.93 1.26,-0.99 1.21,-1.05 1.15,-1.1 1.1,-1.15 1.05,-1.21 0.99,-1.26 0.93,-1.3 0.86,-1.35 0.8,-1.4 0.74,-1.43 0.66,-1.47 0.59,-1.51 0.53,-1.54 0.44,-1.58 0.38,-1.6 0.29,-1.64 0.21,-1.66 0.13,-1.7 0.04,-1.72 h 15.06 l -0.06,2.48 -0.19,2.45 -0.31,2.42 -0.42,2.38 -0.54,2.34 -0.65,2.3 -0.76,2.25 -0.87,2.2 -0.97,2.14 -1.07,2.08 -1.16,2.03 -1.26,1.96 -1.34,1.89 -1.44,1.82 -1.51,1.75 -1.6,1.68 -1.68,1.6 -1.75,1.52 -1.82,1.43 -1.9,1.35 -1.96,1.25 -2.02,1.17 -2.08,1.07 -2.15,0.96 -2.19,0.87 -2.25,0.76 -2.29,0.65 -2.35,0.54 -2.37,0.43 -2.42,0.31 -2.45,0.18 z M 23.47,95.92 h 15.06 v 0 l 0.04,1.72 0.13,1.7 0.21,1.66 0.29,1.64 0.38,1.6 0.44,1.58 0.53,1.54 0.59,1.51 0.66,1.47 0.74,1.44 0.8,1.39 0.86,1.35 0.93,1.3 0.99,1.26 1.05,1.21 1.1,1.15 1.15,1.1 1.21,1.05 1.26,0.99 1.3,0.93 1.35,0.86 1.39,0.8 1.44,0.74 1.47,0.66 1.51,0.6 1.54,0.52 1.57,0.45 1.61,0.37 1.64,0.29 1.66,0.21 1.69,0.13 1.72,0.04 v 15.06 l -2.48,-0.06 -2.45,-0.18 -2.42,-0.31 -2.38,-0.43 -2.34,-0.54 -2.29,-0.65 -2.25,-0.76 -2.2,-0.87 -2.14,-0.96 -2.08,-1.07 -2.03,-1.17 -1.95,-1.25 -1.9,-1.35 -1.82,-1.43 -1.75,-1.52 -1.68,-1.6 -1.6,-1.68 -1.51,-1.75 -1.44,-1.82 -1.34,-1.89 -1.26,-1.96 -1.16,-2.03 -1.07,-2.08 -0.97,-2.14 -0.87,-2.2 -0.76,-2.25 -0.65,-2.3 -0.54,-2.34 -0.42,-2.38 -0.31,-2.42 -0.19,-2.45 z M 79.31,55.14 H 64.25 l 7.53,7.53 -1.72,0.04 -1.69,0.13 -1.66,0.21 -1.64,0.29 -1.61,0.37 -1.57,0.45 -1.54,0.52 -1.51,0.6 -1.47,0.66 -1.44,0.74 -1.39,0.8 -1.35,0.86 -1.3,0.93 -1.26,0.99 -1.21,1.05 -1.15,1.1 -1.1,1.15 -1.05,1.21 -0.99,1.26 -0.93,1.31 -0.86,1.35 -0.8,1.39 -0.73,1.43 -0.67,1.47 -0.59,1.51 -0.53,1.54 -0.44,1.58 -0.38,1.6 -0.29,1.64 -0.21,1.66 -0.13,1.7 -0.04,1.71 H 23.47 l 0.06,-2.47 0.19,-2.46 0.31,-2.41 0.42,-2.38 0.54,-2.34 0.65,-2.3 0.76,-2.25 0.87,-2.2 0.97,-2.14 1.07,-2.08 1.16,-2.03 1.26,-1.96 1.34,-1.89 1.43,-1.82 1.52,-1.76 1.6,-1.67 1.68,-1.6 1.75,-1.52 1.82,-1.43 1.9,-1.35 1.95,-1.25 2.03,-1.17 2.08,-1.07 2.14,-0.96 2.2,-0.87 2.25,-0.76 2.29,-0.65 2.34,-0.54 2.38,-0.43 2.42,-0.31 2.45,-0.18 2.48,-0.06 z m -7.53,-7.53 c 4.16,0 7.53,3.37 7.53,7.53 0,4.16 -3.37,7.53 -7.53,7.53 z M 64.25,95.92 V 55.14 h 15.06 v 40.78 l -7.53,7.54 z m 15.06,0 c 0,4.16 -3.37,7.54 -7.53,7.54 -4.16,0 -7.53,-3.38 -7.53,-7.54 z"
+   id="path304"
+   style="fill:#f9f9f9" />
+  </g>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ </g>
+</svg>