fix for the stretch slax build

.gitignore

@@ -8,4 +8,5 @@ docker/03-custom.sh
 *.xz
 *.gz
 linux-live/initramfs/initramfs.log
-*.deb
+*.deb
+upload

docker/01-runme.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 # Several packages need to be installed to use Dockerfile.py
 # It creates a local container that you can use to build minios-live
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 apt update && apt install -y docker.io python3-pip
 systemctl start docker
 systemctl enable docker
 pip3 install pydocker
-python3 ./Dockerfile.py
+python3 $SCRIPT_DIR/Dockerfile.py

docker/02-build.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -d --name mlc --privileged -v /build:/build local/mlc /build/install -
+docker run -d --name mlc --privileged -v /build:/build local/mlc /build/minios-live/install -

docker/Dockerfile.py

@@ -11,8 +11,8 @@ logging.root.addHandler(logging.StreamHandler(sys.stdout))
 class DockerFile(pydocker.DockerFile):
     """   add here your custom features   """
 
-#d = DockerFile(base_img='ubuntu:focal', name='local/mlc-focal:latest')
-d = DockerFile(base_img='ubuntu:bionic', name='local/mlc-bionic:latest')
+d = DockerFile(base_img='ubuntu:focal', name='local/mlc-focal:latest')
+#d = DockerFile(base_img='ubuntu:bionic', name='local/mlc-bionic:latest')
 #d = DockerFile(base_img='debian:buster', name='local/mlc-bullseye:latest')
 #d = DockerFile(base_img='debian:buster', name='local/mlc-buster:latest')
 
@@ -61,9 +61,8 @@ rm -f /var/lib/dpkg/*-old
 ''')
 
 d.VOLUME = '/build'
-d.WORKDIR = '/build/minios'
-#d.WORKDIR = '/build/minios-slax'
+d.WORKDIR = '/build/minios-live'
 
-#d.CMD = ["/build/minios-slax/install", "-"]
+d.CMD = ["/build/minios-live/install", "-"]
 
 d.build_img()

linux-live/buildconfig

@@ -6,7 +6,7 @@ DISTRIBUTION_TYPE=debian
 
 # distribution
 # дистрибутив
-DISTRIBUTION=buster
+DISTRIBUTION=stretch
 
 # distribution arch
 # архитектура дистрибутива

linux-live/module_scripts/03-slax-desktop/install

@@ -18,3 +18,7 @@ apt-get install --no-install-recommends --yes \
     scrot >>$OUTPUT 2>&1
 
 (cd /rootcopy-install && cp --parents -afr * /)
+
+if [ $DISTRIBUTION = "stretch" ]; then
+    sed -i "s,chromium chromium-sandbox,chromium,g" /usr/bin/fbliveapp
+fi

linux-live/module_scripts/04-slax-apps/install2

@@ -24,7 +24,7 @@ if [ $DISTRIBUTION = "stretch" ]; then
     cd pcmanfm-1.2.5
 elif [ $DISTRIBUTION = "bullseye" ]; then
     cd pcmanfm-1.3.2
-else
+elif [ $DISTRIBUTION = "buster" ]; then
     cd pcmanfm-1.3.1
 fi
 dpkg-buildpackage -us -uc >>$OUTPUT 2>&1

linux-live/module_scripts/05-chromium/install

@@ -7,26 +7,34 @@ set -u          # treat unset variable as error
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 
 # install packages
-if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
+if [ $DISTRIBUTION = "stretch" ]; then
+    $APT_CMD update >>$OUTPUT 2>&1 &&
+        $APT_CMD install $APT_OPTIONS chromium
+elif [ -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 [ ! -d /etc/chromium.d/ ]; then
+    mkdir /etc/chromium.d
+fi
 echo 'export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disk-cache-dir=/dev/null --disk-cache-size=1"' >>/etc/chromium.d/default-flags
 
-if [ $PACKAGE_VARIANT = "minimal" ]; then
-    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+if [ $DESKTOP_ENVIRONMENT = "xfce" ]; then
+    if [ $PACKAGE_VARIANT = "minimal" ]; then
+        cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
 TerminalEmulator=xterm
 FileManager=pcmanfm
 WebBrowser=chromium
 
 EOF
-elif [ $PACKAGE_VARIANT = "standard" ]; then
-    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+    elif [ $PACKAGE_VARIANT = "standard" ]; then
+        cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
 TerminalEmulator=xfce4-terminal
 FileManager=Thunar
 WebBrowser=chromium
 
 EOF
-fi
+    fi
+fi