Update

4 years ago · 5b92c18153
20 changed files with 224 additions and 251 deletions
--- a/linux-live/basesystem/01-core/minimal.list
+++ b/linux-live/basesystem/01-core/minimal.list
@ -40,4 +40,5 @@ usb-modeswitch
 pm-utils
 wget
 gnupg
+openssh-server
 network-manager
--- a/linux-live/basesystem/01-core/rootcopy/etc/issue
+++ b/linux-live/basesystem/01-core/rootcopy/etc/issue
@ -8,14 +8,15 @@

                           Thank you for using MiniOS.
                           Based on Debian GNU/Linux.
-
-        ::::    ::::  ::::::::::: ::::    ::: ::::::::::: ::::::::   ::::::::  
-        +:+:+: :+:+:+     :+:     :+:+:   :+:     :+:    :+:    :+: :+:    :+: 
-        +:+ +:+:+ +:+     +:+     :+:+:+  +:+     +:+    +:+    +:+ +:+        
-        +#+  +:+  +#+     +#+     +#+ +:+ +#+     +#+    +#+    +:+ +#++:++#++ 
-        +#+       +#+     +#+     +#+  +#+#+#     +#+    +#+    +#+        +#+ 
-        #+#       #+#     #+#     #+#   #+#+#     #+#    #+#    #+# #+#    #+# 
-        ###       ### ########### ###    #### ########### ########   ########  
+                           Powered by [1;32mSlax[0;29m.
+
+        [1;31m::::    ::::  ::::::::::: ::::    ::: ::::::::::: ::::::::   ::::::::  [0;29m
+        [1;31m+:+:+: :+:+:+     :+:     :+:+:   :+:     :+:    :+:    :+: :+:    :+: [0;29m
+        [1;31m+:+ +:+:+ +:+     +:+     :+:+:+  +:+     +:+    +:+    +:+ +:+        [0;29m
+        [1;31m+#+  +:+  +#+     +#+     +#+ +:+ +#+     +#+    +#+    +:+ +#++:++#++ [0;29m
+        [1;31m+#+       +#+     +#+     +#+  +#+#+#     +#+    +#+    +#+        +#+ [0;29m
+        [1;31m#+#       #+#     #+#     #+#   #+#+#     #+#    #+#    #+# #+#    #+# [0;29m
+        [1;31m###       ### ########### ###    #### ########### ########   ########  [0;29m 

                          :                           :
                          :   Root login name: [1;33mroot[0;29m   :
--- a/linux-live/basesystem/01-core/standard.list
+++ b/linux-live/basesystem/01-core/standard.list
@ -1,5 +1,6 @@
 mc
 bash-completion
+ncdu
 squashfs-tools
 genisoimage
 zip
--- a/linux-live/buildconfig
+++ b/linux-live/buildconfig
@ -4,7 +4,7 @@
 DISTRIBUTION_TYPE="debian"

 #
-DISTRIBUTION="bullseye"
+DISTRIBUTION="buster"

 #
 DISTRIBUTION_ARCH="amd64"
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@ -1048,6 +1048,8 @@ function chroot_configure() {
 	addgroup live adm >>$OUTPUT 2>&1
 	addgroup live sudo >>$OUTPUT 2>&1
 	addgroup live audio >>$OUTPUT 2>&1
+	addgroup live users >>$OUTPUT 2>&1
+	addgroup live live >>$OUTPUT 2>&1

 	(cd /linux-live/basesystem/01-core/rootcopy && cp --parents -afr * /)

@ -1138,15 +1140,15 @@ EOF

                           Thank you for using MiniOS.
                           Based on Debian GNU/Linux.
-                           Powered by Slax.
-
-        ::::    ::::  ::::::::::: ::::    ::: ::::::::::: ::::::::   ::::::::  
-        +:+:+: :+:+:+     :+:     :+:+:   :+:     :+:    :+:    :+: :+:    :+: 
-        +:+ +:+:+ +:+     +:+     :+:+:+  +:+     +:+    +:+    +:+ +:+        
-        +#+  +:+  +#+     +#+     +#+ +:+ +#+     +#+    +#+    +:+ +#++:++#++ 
-        +#+       +#+     +#+     +#+  +#+#+#     +#+    +#+    +#+        +#+ 
-        #+#       #+#     #+#     #+#   #+#+#     #+#    #+#    #+# #+#    #+# 
-        ###       ### ########### ###    #### ########### ########   ########  
+                           Powered by [1;32mSlax[0;29m.
+
+        [1;1m::::    ::::  ::::::::::: ::::    ::: ::::::::::: ::::::::   ::::::::  [0;29m
+        [1;1m+:+:+: :+:+:+     :+:     :+:+:   :+:     :+:    :+:    :+: :+:    :+: [0;29m
+        [1;1m+:+ +:+:+ +:+     +:+     :+:+:+  +:+     +:+    +:+    +:+ +:+        [0;29m
+        [1;1m+#+  +:+  +#+     +#+     +#+ +:+ +#+     +#+    +#+    +:+ +#++:++#++ [0;29m
+        [1;1m+#+       +#+     +#+     +#+  +#+#+#     +#+    +#+    +#+        +#+ [0;29m
+        [1;1m#+#       #+#     #+#     #+#   #+#+#     #+#    #+#    #+# #+#    #+# [0;29m
+        [1;1m###       ### ########### ###    #### ########### ########   ########  [0;29m 

                          :                           :
                          :   Root login name: [1;33mroot[0;29m   :
--- a/linux-live/modules/03-xfce-desktop/install
+++ b/linux-live/modules/03-xfce-desktop/install
@ -94,7 +94,7 @@ show-command-logout=true
 command-menueditor=menulibre
 show-command-menueditor=true
 command-profile=mugshot
-show-command-profile=true
+show-command-profile=false
 search-actions=5

 [action0]
@ -176,7 +176,7 @@ show-command-logout=true
 command-menueditor=menulibre
 show-command-menueditor=true
 command-profile=mugshot
-show-command-profile=true
+show-command-profile=false
 search-actions=5

 [action0]
@ -258,7 +258,7 @@ show-command-logout=true
 command-menueditor=menulibre
 show-command-menueditor=true
 command-profile=mugshot
-show-command-profile=true
+show-command-profile=false
 search-actions=5

 [action0]
@ -575,3 +575,44 @@ EOF
  #echo $MINIMAL_PANEL >>/root/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
  #echo $MINIMAL_PANEL >>/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 fi
+
+if [ $PACKAGE_VARIANT = "minimal" ]; then
+    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=
+
+EOF
+    cat <<EOF >/home/live/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=
+
+EOF
+    cat <<EOF >/root/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=
+
+EOF
+
+elif [ $PACKAGE_VARIANT = "standard" ]; then
+    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=Thunar
+WebBrowser=
+
+EOF
+    cat <<EOF >/home/live/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=Thunar
+WebBrowser=
+
+EOF
+    cat <<EOF >/root/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=Thunar
+WebBrowser=
+
+EOF
+fi
--- a/linux-live/modules/03-xfce-desktop/postinstall
+++ b/linux-live/modules/03-xfce-desktop/postinstall
@ -8,11 +8,13 @@ for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; d
    mkdir -p /root/$dir >>$OUTPUT 2>&1
 done

-#if [ $DISTRIBUTION = "bullseye" ]; then
 rm -f /usr/share/backgrounds/xfce/*
 ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-verticals.png
 ln -s /usr/share/backgrounds/MiniOS-wallpaper.svg /usr/share/backgrounds/xfce/xfce-teal.jpg
-#fi
+
+if [ $PACKAGE_VARIANT = "standard" ]; then
+    rm -f /usr/share/applications/pavucontrol.desktop
+fi

 rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1

--- a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/helpers.rc
+++ b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/helpers.rc
@ -1,3 +0,0 @@
-TerminalEmulator=
-FileManager=
-WebBrowser=
--- a/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
+++ b/linux-live/modules/03-xfce-desktop/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc
@ -1,80 +0,0 @@
-favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop
-recent=
-button-icon=/usr/share/pixmaps/MiniOS-white.svg
-button-single-row=false
-show-button-title=false
-show-button-icon=true
-launcher-show-name=true
-launcher-show-description=false
-launcher-show-tooltip=true
-item-icon-size=2
-hover-switch-category=false
-category-show-name=true
-category-icon-size=1
-load-hierarchy=false
-view-as-icons=false
-default-category=0
-recent-items-max=10
-favorites-in-recent=true
-position-search-alternate=true
-position-commands-alternate=false
-position-categories-alternate=true
-stay-on-focus-out=false
-confirm-session-command=true
-menu-width=450
-menu-height=500
-menu-opacity=100
-command-settings=xfce4-settings-manager
-show-command-settings=false
-command-lockscreen=xflock4
-show-command-lockscreen=false
-command-switchuser=dm-tool switch-to-greeter
-show-command-switchuser=false
-command-logoutuser=xfce4-session-logout --logout --fast
-show-command-logoutuser=false
-command-restart=xfce4-session-logout --reboot --fast
-show-command-restart=false
-command-shutdown=xfce4-session-logout --halt --fast
-show-command-shutdown=false
-command-suspend=xfce4-session-logout --suspend
-show-command-suspend=false
-command-hibernate=xfce4-session-logout --hibernate
-show-command-hibernate=false
-command-logout=xfce4-session-logout
-show-command-logout=true
-command-menueditor=menulibre
-show-command-menueditor=true
-command-profile=mugshot
-show-command-profile=true
-search-actions=5
-
-[action0]
-name=Man Pages
-pattern=#
-command=exo-open --launch TerminalEmulator man %s
-regex=false
-
-[action1]
-name=Web Search
-pattern=?
-command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
-regex=false
-
-[action2]
-name=Wikipedia
-pattern=!w
-command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
-regex=false
-
-[action3]
-name=Run in Terminal
-pattern=!
-command=exo-open --launch TerminalEmulator %s
-regex=false
-
-[action4]
-name=Open URI
-pattern=^(file|http|https):\\/\\/(.*)$
-command=exo-open \\0
-regex=true
-
--- a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/helpers.rc
+++ b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/helpers.rc
@ -1,3 +0,0 @@
-TerminalEmulator=
-FileManager=
-WebBrowser=
--- a/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc
+++ b/linux-live/modules/03-xfce-desktop/rootcopy/home/live/.config/xfce4/panel/whiskermenu-1.rc
@ -45,7 +45,7 @@ show-command-logout=true
 command-menueditor=menulibre
 show-command-menueditor=true
 command-profile=mugshot
-show-command-profile=true
+show-command-profile=false
 search-actions=5

 [action0]
--- a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/helpers.rc
+++ b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/helpers.rc
@ -1,3 +0,0 @@
-TerminalEmulator=
-FileManager=
-WebBrowser=
--- a/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/whiskermenu-1.rc
+++ b/linux-live/modules/03-xfce-desktop/rootcopy/root/.config/xfce4/panel/whiskermenu-1.rc
@ -1,80 +0,0 @@
-favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop
-recent=
-button-icon=/usr/share/pixmaps/MiniOS-white.svg
-button-single-row=false
-show-button-title=false
-show-button-icon=true
-launcher-show-name=true
-launcher-show-description=false
-launcher-show-tooltip=true
-item-icon-size=2
-hover-switch-category=false
-category-show-name=true
-category-icon-size=1
-load-hierarchy=false
-view-as-icons=false
-default-category=0
-recent-items-max=10
-favorites-in-recent=true
-position-search-alternate=true
-position-commands-alternate=false
-position-categories-alternate=true
-stay-on-focus-out=false
-confirm-session-command=true
-menu-width=450
-menu-height=500
-menu-opacity=100
-command-settings=xfce4-settings-manager
-show-command-settings=false
-command-lockscreen=xflock4
-show-command-lockscreen=false
-command-switchuser=dm-tool switch-to-greeter
-show-command-switchuser=false
-command-logoutuser=xfce4-session-logout --logout --fast
-show-command-logoutuser=false
-command-restart=xfce4-session-logout --reboot --fast
-show-command-restart=false
-command-shutdown=xfce4-session-logout --halt --fast
-show-command-shutdown=false
-command-suspend=xfce4-session-logout --suspend
-show-command-suspend=false
-command-hibernate=xfce4-session-logout --hibernate
-show-command-hibernate=false
-command-logout=xfce4-session-logout
-show-command-logout=true
-command-menueditor=menulibre
-show-command-menueditor=true
-command-profile=mugshot
-show-command-profile=true
-search-actions=5
-
-[action0]
-name=Man Pages
-pattern=#
-command=exo-open --launch TerminalEmulator man %s
-regex=false
-
-[action1]
-name=Web Search
-pattern=?
-command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
-regex=false
-
-[action2]
-name=Wikipedia
-pattern=!w
-command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
-regex=false
-
-[action3]
-name=Run in Terminal
-pattern=!
-command=exo-open --launch TerminalEmulator %s
-regex=false
-
-[action4]
-name=Open URI
-pattern=^(file|http|https):\\/\\/(.*)$
-command=exo-open \\0
-regex=true
-
--- a/linux-live/modules/04-xfce-apps/install
+++ b/linux-live/modules/04-xfce-apps/install
@ -15,8 +15,43 @@ if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
            $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
 fi

-if [ $PACKAGE_VARIANT = "standard" ]; then
-    wget -c https://github.com/VSCodium/vscodium/releases/download/1.57.1/codium_1.57.1-1623975230_amd64.deb &&
-        $APT_CMD install $APT_OPTIONS ./codium_1.57.1-1623975230_amd64.deb &&
-        rm -f ./codium_1.57.1-1623975230_amd64.deb
+if [ $PACKAGE_VARIANT = "minimal" ]; then
+    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/home/live/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/root/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=firefox
+
+EOF
+
+elif [ $PACKAGE_VARIANT = "standard" ]; then
+    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/home/live/.config/xfce4/helpers.rc
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/root/.config/xfce4/helpers.rc
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
+WebBrowser=firefox
+
+EOF
 fi
--- a/linux-live/modules/04-xfce-apps/standard.list
+++ b/linux-live/modules/04-xfce-apps/standard.list
@ -8,10 +8,12 @@ xfce4-screenshooter
 remmina
 remmina-plugin-rdp
 remmina-plugin-vnc
-remmina-plugin-nx
-remmina-plugin-xdmcp
-remmina-plugin-www
-remmina-plugin-spice
-remmina-plugin-exec
-remmina-plugin-secret
-remmina-plugin-kiosk
+#remmina-plugin-nx
+#remmina-plugin-xdmcp
+#remmina-plugin-www
+#remmina-plugin-spice
+#remmina-plugin-exec
+#remmina-plugin-secret
+#remmina-plugin-kiosk
+vlc
+gparted
--- a/linux-live/modules/05-firefox-esr/install
+++ b/linux-live/modules/05-firefox-esr/install
@ -14,3 +14,44 @@ if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
        $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
            $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
 fi
+
+if [ $PACKAGE_VARIANT = "minimal" ]; then
+    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/home/live/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/root/.config/xfce4/helpers.rc
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=firefox
+
+EOF
+
+elif [ $PACKAGE_VARIANT = "standard" ]; then
+    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/home/live/.config/xfce4/helpers.rc
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
+WebBrowser=firefox
+
+EOF
+    cat <<EOF >/root/.config/xfce4/helpers.rc
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
+WebBrowser=firefox
+
+EOF
+fi
--- a/linux-live/unusedmodules/05-onlyoffice/install
+++ b/linux-live/unusedmodules/05-onlyoffice/install
@ -17,10 +17,10 @@ $APT_CMD autoremove $APT_OPTIONS $APT_OPTIONS2 \
    software-properties-common >>$OUTPUT 2>&1

 # install packages
-if [ -f $SCRIPT_DIR/package.list ]; then
+if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
    #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
    $APT_CMD update >>$OUTPUT 2>&1 &&
        #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
        $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
-            $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1
+            $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
 fi
--- a/linux-live/unusedmodules/05-vscode/install
+++ b/linux-live/unusedmodules/05-vscode/install
@ -12,10 +12,10 @@ sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/trusted.gpg.d/packag
 rm -f packages.microsoft.gpg

 # install packages
-if [ -f $SCRIPT_DIR/package.list ]; then
+if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
    #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
    $APT_CMD update >>$OUTPUT 2>&1 &&
        #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
        $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \
-            $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1
+            $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
 fi
--- a/linux-live/unusedmodules/06-codium/install
+++ b/linux-live/unusedmodules/06-codium/install
@ -0,0 +1,13 @@
+#!/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")")"
+
+if [ $PACKAGE_VARIANT = "standard" ]; then
+    wget -c https://github.com/VSCodium/vscodium/releases/download/1.57.1/codium_1.57.1-1623975230_amd64.deb &&
+        $APT_CMD install $APT_OPTIONS ./codium_1.57.1-1623975230_amd64.deb &&
+        rm -f ./codium_1.57.1-1623975230_amd64.deb
+fi
--- a/linux-live/unusedmodules/06-codium/postinstall
+++ b/linux-live/unusedmodules/06-codium/postinstall
@ -0,0 +1,3 @@
+#!/bin/bash
+
+rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1