Update

.gitignore

@@ -2,4 +2,8 @@ rootfs/
 build/
 .install_dir
 upload_initrfs
-linux-live/minioslib copy
+linux-live/minioslib copy
+docker/03-custom.sh
+*.iso
+*.xz
+*.gz

buildall

@@ -14,11 +14,12 @@ function build() {
     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
+    sed -i -e "/PACKAGE_VARIANT=/s/=.*/=$PACKAGE_VARIANT/" $SCRIPT_DIR/linux-live/buildconfig
     $SCRIPT_DIR/install -
 }
 
 # bullseye xfce
-: 'DISTRIBUTION_TYPE="debian"
+DISTRIBUTION_TYPE="debian"
 DISTRIBUTION="bullseye"
 DISTRIBUTION_ARCH="amd64"
 DESKTOP_ENVIRONMENT="xfce"
@@ -98,7 +99,7 @@ DISTRIBUTION_ARCH="amd64"
 DESKTOP_ENVIRONMENT="slax"
 PACKAGE_VARIANT="minimal"
 COMP_TYPE="xz"
-build'
+build
 
 # stretch xfce
 DISTRIBUTION_TYPE="debian"
@@ -108,14 +109,14 @@ DESKTOP_ENVIRONMENT="xfce"
 PACKAGE_VARIANT="standard"
 COMP_TYPE="xz"
 build
-: '
+
 DISTRIBUTION_TYPE="debian"
 DISTRIBUTION="stretch"
 DISTRIBUTION_ARCH="i386"
 DESKTOP_ENVIRONMENT="xfce"
 PACKAGE_VARIANT="standard"
 COMP_TYPE="xz"
-build'
+build
 
 DISTRIBUTION_TYPE="debian"
 DISTRIBUTION="stretch"

docker/02-build.sh

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

docker/Dockerfile.py

@@ -11,9 +11,10 @@ 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:latest')
+#d = DockerFile(base_img='ubuntu:focal', name='local/mlc-focal:latest')
-d = DockerFile(base_img='ubuntu:bionic', name='local/mlc:latest')
+d = DockerFile(base_img='ubuntu:bionic', name='local/mlc-bionic:latest')
-#d = DockerFile(base_img='debian:buster', name='local/mlc:latest')
+#d = DockerFile(base_img='debian:buster', name='local/mlc-bullseye:latest')
+#d = DockerFile(base_img='debian:buster', name='local/mlc-buster:latest')
 
 d.RUN_bash_script('/opt/install.sh', r'''
 touch /.minios-live-container

docker/scripts/mlc-bionic-amd64.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-bionic-amd64 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="ubuntu" \
+    -e DISTRIBUTION_TYPE="ubuntu" \
--e DISTRIBUTION="bionic" \
+    -e DISTRIBUTION="bionic" \
--e DISTRIBUTION_ARCH="amd64" \
+    -e DISTRIBUTION_ARCH="amd64" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-bionic-i386.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-bionic-i386 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="ubuntu" \
+    -e DISTRIBUTION_TYPE="ubuntu" \
--e DISTRIBUTION="bionic" \
+    -e DISTRIBUTION="bionic" \
--e DISTRIBUTION_ARCH="i386" \
+    -e DISTRIBUTION_ARCH="i386" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-bullseye-amd64.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-bullseye-amd64 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="debian" \
+    -e DISTRIBUTION_TYPE="debian" \
--e DISTRIBUTION="bullseye" \
+    -e DISTRIBUTION="bullseye" \
--e DISTRIBUTION_ARCH="amd64" \
+    -e DISTRIBUTION_ARCH="amd64" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-bullseye-i386.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-bullseye-i386 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="debian" \
+    -e DISTRIBUTION_TYPE="debian" \
--e DISTRIBUTION="bullseye" \
+    -e DISTRIBUTION="bullseye" \
--e DISTRIBUTION_ARCH="i386" \
+    -e DISTRIBUTION_ARCH="i386" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-buster-amd64.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-buster-amd64 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="debian" \
+    -e DISTRIBUTION_TYPE="debian" \
--e DISTRIBUTION="buster" \
+    -e DISTRIBUTION="buster" \
--e DISTRIBUTION_ARCH="amd64" \
+    -e DISTRIBUTION_ARCH="amd64" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-buster-i386.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-buster-i386 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="debian" \
+    -e DISTRIBUTION_TYPE="debian" \
--e DISTRIBUTION="buster" \
+    -e DISTRIBUTION="buster" \
--e DISTRIBUTION_ARCH="i386" \
+    -e DISTRIBUTION_ARCH="i386" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-focal-amd64.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-focal-amd64 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="ubuntu" \
+    -e DISTRIBUTION_TYPE="ubuntu" \
--e DISTRIBUTION="focal" \
+    -e DISTRIBUTION="focal" \
--e DISTRIBUTION_ARCH="amd64" \
+    -e DISTRIBUTION_ARCH="amd64" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-focal-i386.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-focal-i386 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="ubuntu" \
+    -e DISTRIBUTION_TYPE="ubuntu" \
--e DISTRIBUTION="focal" \
+    -e DISTRIBUTION="focal" \
--e DISTRIBUTION_ARCH="i386" \
+    -e DISTRIBUTION_ARCH="i386" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-stretch-amd64.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-stretch-amd64 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="debian" \
+    -e DISTRIBUTION_TYPE="debian" \
--e DISTRIBUTION="stretch" \
+    -e DISTRIBUTION="stretch" \
--e DISTRIBUTION_ARCH="amd64" \
+    -e DISTRIBUTION_ARCH="amd64" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

docker/scripts/mlc-stretch-i386.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
 docker run -d --name mlc-stretch-i386 --privileged -v /build:/build \
--e DISTRIBUTION_TYPE="debian" \
+    -e DISTRIBUTION_TYPE="debian" \
--e DISTRIBUTION="stretch" \
+    -e DISTRIBUTION="stretch" \
--e DISTRIBUTION_ARCH="i386" \
+    -e DISTRIBUTION_ARCH="i386" \
--e DISTRIBUTION_VARIANT="minbase" \
+    -e DESKTOP_ENVIRONMENT="xfce" \
--e PACKAGE_VARIANT="standard" \
+    -e COMP_TYPE="xz" \
--e LOGPATH="/var/log" \
+    -e DISTRIBUTION_VARIANT="minbase" \
--e OUTPUT="/dev/stdout" \
+    -e PACKAGE_VARIANT="standard" \
--e BUILD_TEST_ISO="0" \
+    -e LOGPATH="/var/log" \
--e CREATE_BACKUP="0" \
+    -e OUTPUT="/dev/stdout" \
--e DEV_SYSTEM="0" \
+    -e BUILD_TEST_ISO="0" \
--e DEBIAN_FRONTEND_TYPE="noninteractive" \
+    -e CREATE_BACKUP="0" \
--e APT_CMD="apt-get" \
+    -e DEV_SYSTEM="0" \
--e APT_OPTIONS="-y" \
+    -e DEBIAN_FRONTEND_TYPE="noninteractive" \
--e LIVE_TYPE="livekit" \
+    -e APT_CMD="apt-get" \
--e BOOT_TYPE="hybrid" \
+    -e APT_OPTIONS="-y" \
--e UNION_BUILD_TYPE="overlayfs" \
+    -e BOOT_TYPE="hybrid" \
--e SYSTEMNAME="MiniOS" \
+    -e UNION_BUILD_TYPE="overlayfs" \
--e SYSTEMVER="2021" \
+    -e SYSTEMNAME="MiniOS" \
--e USE_BOOTSTRAP="1" \
+    -e USE_BOOTSTRAP="1" \
--e USE_ROOTFS="1" \
+    -e USE_ROOTFS="1" \
--e ROOT_PASSWORD="toor" \
+    local/mlc
--e USER_NAME="live" \
--e USER_PASSWORD="evil" \
-local/mlc

install

@@ -7,7 +7,7 @@ set -u          # treat unset variable as error
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 BUILD_DIR="$SCRIPT_DIR/build"
 ISO_DIR="$BUILD_DIR/iso"
-#ISO_DIR=/build/template/iso
+#ISO_DIR=/build/share
 
 . $SCRIPT_DIR/linux-live/minioslib || exit 1
 . $SCRIPT_DIR/linux-live/config || exit 1
@@ -20,7 +20,7 @@ set -u
 # change this for unattended installation
 UNATTENDED="1"
 
-CMD=(setup_host build_bootstrap build_chroot build_live build_modules build_iso)
+CMD=(setup_host build_bootstrap build_chroot build_live build_modules build_iso remove_sources)
 
 # =============   main  ================
 

linux-live/buildconfig

@@ -2,11 +2,11 @@
 
 # distribution type
 # тип дистрибутива
-DISTRIBUTION_TYPE=ubuntu
+DISTRIBUTION_TYPE=debian
 
 # distribution
 # дистрибутив
-DISTRIBUTION=focal
+DISTRIBUTION=buster
 
 # distribution arch
 # note: stretch only works with amd64
@@ -32,7 +32,7 @@ DISTRIBUTION_VARIANT="minbase"
 
 # system variant, indicates the used list of packages in modules
 # вариант системы, указывает на используемый список пакетов в модулях
-PACKAGE_VARIANT="standard"
+PACKAGE_VARIANT=minimal
 
 # путь файла лога
 LOGPATH="/var/log"
@@ -80,9 +80,4 @@ USE_BOOTSTRAP="1"
 # использование готового файла rootfs при установке. Если отсутствует, то скачивается и упаковывается. При последующих сборках распаковывается существующий файл rootfs.
 USE_ROOTFS="1"
 
-#ROOT_PASSWORD="uG5TYt5sIzHe"
+REMOVE_SOURCES="false"
-#ROOT_PASSWORD="toor"
-#USER_NAME="live"
-#USER_PASSWORD="evil"
-
-# CMDLINE_PARSER="true"

linux-live/initramfs/static/minios-configure

@@ -460,6 +460,7 @@ After=systemd-user-sessions.service
 
 [Service]
 ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" $USER_NAME
+
 EOF
     fi
     if [ -f /etc/default/nodm ]; then

linux-live/minioslib

@@ -275,7 +275,7 @@ function create_completion() {
     if [ -d /etc/bash_completion.d ]; then
         if [ ! -f /etc/bash_completion.d/$LIVEKITNAME-install ] || ! grep "${CMD[*]}" /etc/bash_completion.d/$LIVEKITNAME-install >/dev/null 2>&1; then
             cat <<EOF >/etc/bash_completion.d/$LIVEKITNAME-install
-#/usr/bin/env bash
+#!/usr/bin/env bash
 complete -W "${CMD[*]}" $LIVEKITNAME-install
 EOF
         fi
@@ -392,16 +392,16 @@ function check_install_dir() {
 function setup_install_dir() {
     echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
     if [ "$UNATTENDED" = "1" ] && [ "$INSTALL_DIR" = "" ]; then
-        INSTALL_DIR="$BUILD_DIR/$DISTRIBUTION"
+        INSTALL_DIR="$BUILD_DIR/$DISTRIBUTION-$DISTRIBUTION_ARCH"
         check_install_dir
     else
         if [ "$INSTALL_DIR" = "" ]; then
             if [ ! -f "$SCRIPT_DIR/.install_dir" ]; then
                 echo "Enter the address of the working directory where we will build the system"
-                read -r -p "$(echo -e "(Default is ${MAGENTA}$BUILD_DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response
+                read -r -p "$(echo -e "(Default is ${MAGENTA}$BUILD_DIR/$DISTRIBUTION-$DISTRIBUTION_ARCH${ENDCOLOUR}): ")" response
                 INSTALL_DIR=${response,,}
                 if [ "$INSTALL_DIR" = "" ]; then
-                    INSTALL_DIR=$BUILD_DIR/$DISTRIBUTION
+                    INSTALL_DIR="$BUILD_DIR/$DISTRIBUTION-$DISTRIBUTION_ARCH"
                 fi
                 check_install_dir
             else
@@ -411,10 +411,10 @@ function setup_install_dir() {
                 response=${response,,}
                 if [[ "$response" =~ ^(no|n)$ ]]; then
                     echo "Enter the address of the working directory where we will build the system"
-                    read -r -p "$(echo -e "(Default is ${MAGENTA}$BUILD_DIR/$DISTRIBUTION${ENDCOLOUR}): ")" response
+                    read -r -p "$(echo -e "(Default is ${MAGENTA}$BUILD_DIR/$DISTRIBUTION-$DISTRIBUTION_ARCH${ENDCOLOUR}): ")" response
                     INSTALL_DIR=${response,,}
                     if [ "$INSTALL_DIR" = "" ]; then
-                        INSTALL_DIR=$BUILD_DIR/$DISTRIBUTION
+                        INSTALL_DIR="$BUILD_DIR/$DISTRIBUTION-$DISTRIBUTION_ARCH"
                     fi
                     check_install_dir
                 else
@@ -454,7 +454,31 @@ function cleanup() {
                 exit 1
             fi
         fi
+    elif [ "${CMD[ii]}" = "remove_sources" ]; then
+        if [ $REMOVE_SOURCES = "true" ]; then
+            if [ "$UNATTENDED" = "1" ]; then
+                check_mounted
+                rm -rf $INSTALL_DIR
+                if [ -d "$INSTALL_DIR" ]; then
+                    cleanup
+                fi
+            else
+                read -r -p "$(echo -e ""Do you want to ${BOLD}${RED}completely remove content${ENDCOLOUR} of ${MAGENTA}$INSTALL_DIR${ENDCOLOUR}? [y/${BOLD}${GREEN}N${ENDCOLOUR}])" response
+                response=${response,,}
+                if [[ "$response" =~ ^(yes|y)$ ]]; then
+                    check_mounted
+                    rm -rf $INSTALL_DIR
+                    if [ -d "$INSTALL_DIR" ]; then
+                        cleanup
+                    fi
+                else
+                    echo -e "${MAGENTA}$INSTALL_DIR${ENDCOLOUR} should be empty to continue."
+                    exit 1
+                fi
+            fi
+        fi
     fi
+
 }
 
 # =================================================================
@@ -605,8 +629,11 @@ function new_run() {
     echo "=================================================================" >>$OUTPUT 2>&1
     echo "========== Distributution: $DISTRIBUTION" >>$OUTPUT 2>&1
     echo "========== Desktop Environment: $DESKTOP_ENVIRONMENT" >>$OUTPUT 2>&1
+    echo "========== Package Variant: $PACKAGE_VARIANT" >>$OUTPUT 2>&1
     echo "========== Arch: $DISTRIBUTION_ARCH" >>$OUTPUT 2>&1
     echo "========== Compression: $COMP_TYPE" >>$OUTPUT 2>&1
+    echo "=================================================================" >>$OUTPUT 2>&1
+    echo "=================================================================" >>$OUTPUT 2>&1
     echo ""
 }
 
@@ -1059,7 +1086,7 @@ function build_live() {
 
     build_boot
 
-    if [ $DISTRIBUTION = "stretch" ]; then
+    if [ $DISTRIBUTION_ARCH = "i386" ]; then
         MKMOD="bin etc home lib opt root sbin srv usr var"
     fi
 
@@ -1228,7 +1255,7 @@ function build_iso() {
     check_install_dir
 
     if [ "$UNATTENDED" = "1" ]; then
-        INSTALL_DIR="$BUILD_DIR/$DISTRIBUTION"
+        INSTALL_DIR="$BUILD_DIR/$DISTRIBUTION-$DISTRIBUTION_ARCH"
     fi
     if [ "$INSTALL_DIR" = "" ]; then
         LAST_INSTALL_DIR=$(cat "$SCRIPT_DIR/.install_dir") >>$OUTPUT 2>&1
@@ -1278,11 +1305,13 @@ function build_iso() {
     VER="$SYSTEMNAME"
 
     if [ $REMOVE_OLD_ISO = "1" ]; then
+        set +e
         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
         done
+        set -e
         #rm -f $ISO_DIR/*
     fi
 
@@ -1316,6 +1345,14 @@ function build_iso() {
             echo ">>> $ISO_DIR/$LIVEKITNAME.iso created"
         fi
     fi
+
+    #exit 0
+}
+
+function remove_sources() {
+    if [ $REMOVE_SOURCES = "true" ]; then
+        cleanup
+    fi
     exit 0
 }
 

linux-live/modules/xfce/02-xorg/install → linux-live/module_scripts/02-xorg/install

@@ -26,3 +26,5 @@ After=systemd-user-sessions.service
 ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live
 
 EOF
+
+ln -s /usr/lib/systemd/system/xorg.service /etc/systemd/system/display-manager.service