Update

.gitignore

@@ -6,4 +6,5 @@ linux-live/minioslib copy
 docker/03-custom.sh
 *.iso
 *.xz
-*.gz
+*.gz
+linux-live/initramfs/initramfs.log

README.md

@@ -35,4 +35,41 @@
 
 Для сборки с помошью докера создайте в домашней папке папку build, поместите туда minios-slax, запустите 01-runme.sh из папки docker. Данное действие установит необходимые программы и создаст образ. Для запуска сборки отредактируйте под себя и запустите 02-build.sh. Пример содержимого файла:
 
-`docker run --rm -it --name mlc --privileged -v /home/user/build:/build local/mlc`
+`docker run --rm -it --name mlc --privileged -v /home/user/build:/build local/mlc /build/minios-slax/install -`
+
+These scripts build a bootable MiniOS ISO image.
+
+For installation use **install** - script for guided installation, **autoinstall** - script for automatic installation.
+
+**Never run scripts from linux-live! They will break your system.**
+
+**Supported commands:** `setup_host build_bootstrap build_chroot build_live build_modules build_iso`
+
+*setup_host* - installing packages required for building on the host
+
+*build_bootstrap* - install a minimal system using debootstrap
+
+*build_chroot* - installation of the rest of the components required to start the system
+
+*build_live* - build initramfs and squashfs image
+
+*build_modules_chroot* - building modules
+
+*build_iso* - build the final ISO image
+
+**Syntax:** `./install [start_cmd] [-] [end_cmd]`
+- launch from start_cmd to end_cmd
+- if start_cmd is omitted, all commands are executed starting from the first
+- if end_cmd is omitted, all commands up to the last are executed
+- enter one command to run a specific command
+- enter '-' as the only argument to run all commands
+
+        Examples: ./install build_bootstrap - build_chroot
+                  ./install - build_chroot
+                  ./install build_bootstrap -
+                  ./install build_iso
+                  ./install -
+
+To build with docker, create a build folder in your home folder, put minios-slax there, run 01-runme.sh from the docker folder. This action will install the required programs and create an image. To start the build, edit for yourself and run 02-build.sh. Sample file content:
+
+`docker run --rm -it --name mlc --privileged -v /home/user/build:/build local/mlc /build/minios-slax/install -`

docker/02-build.sh

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

docker/Dockerfile.py

@@ -61,8 +61,9 @@ rm -f /var/lib/dpkg/*-old
 ''')
 
 d.VOLUME = '/build'
-d.WORKDIR = '/build/minios-slax'
+d.WORKDIR = '/build/minios'
+#d.WORKDIR = '/build/minios-slax'
 
-d.CMD = ["/build/minios-slax/install", "-"]
+#d.CMD = ["/build/minios-slax/install", "-"]
 
 d.build_img()

linux-live/buildconfig

@@ -16,7 +16,7 @@ DISTRIBUTION_ARCH=amd64
 
 # окружение рабочего стола
 # desktop environment
-DESKTOP_ENVIRONMENT=xfce
+DESKTOP_ENVIRONMENT=slax-firefox
 
 # тип сжатия
 # compresssion type

linux-live/initramfs/initramfs_create

@@ -6,6 +6,12 @@
 . ../config
 
 INITRAMFS=/tmp/$LIVEKITNAME-initramfs-$$
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+exec 19>$SCRIPT_DIR/initramfs.log
+BASH_XTRACEFD=19
+
+set -x
 
 # copy file to initramfs tree, including
 # all library dependencies (as shown by ldd)

linux-live/initramfs/static/minios-configure

@@ -467,7 +467,7 @@ EOF
         sed -i "s/NODM_USER=live/NODM_USER=$USER_NAME/g" /etc/default/nodm
     fi
     if [ -f /etc/slim.conf ]; then
-        sed -i "s/default_user        live/default_user        $USER_NAME/g" /etc/slim.conf
+        sed -i "s/#default_user        simone/default_user        $USER_NAME/g" /etc/slim.conf
     fi
 fi
 

linux-live/minioslib

@@ -655,6 +655,7 @@ KERNEL_ARCH=$KERNEL_ARCH
 LIVEKITNAME=$LIVEKITNAME
 SYSTEMNAME=$SYSTEMNAME
 DISTRIBUTION_ARCH=$DISTRIBUTION_ARCH
+MODULE=$MODULE
 EOF
 
     cat <<'EOF' >$1/functions
@@ -1226,13 +1227,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 [ $DESKTOP_ENVIRONMENT = "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 [ $DESKTOP_ENVIRONMENT = "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
@@ -1615,14 +1616,14 @@ DISTRIBUTION_TYPE="$DISTRIBUTION_TYPE"
 DISTRIBUTION="$DISTRIBUTION"
 DISTRIBUTION_ARCH="$DISTRIBUTION_ARCH"
 PACKAGE_VARIANT="$PACKAGE_VARIANT"
-DESKTOP_ENVIRONMENT="livekit"
+DESKTOP_ENVIRONMENT="$DESKTOP_ENVIRONMENT"
+COMP_TYPE="xz" # Compression method used for the system and modules.
 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"
 APT_OPTIONS="-y"
 UNION_BUILD_TYPE="overlayfs"
 BEXT="sb"
-COMP_TYPE="xz" # Compression method used for the system and modules.
 EOF
 
     if [ ! -d /etc/NetworkManager ]; then
@@ -2125,12 +2126,6 @@ function build_modules() {
 
                 module_chroot_mount_fs
 
-                #if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
-                #    chroot_run $MODULE_MERGED_DIR $APT_CMD update
-                #else
-                #    chroot_run $MODULE_MERGED_DIR $APT_CMD update >>$OUTPUT 2>&1
-                #fi
-
                 # run pre-install script
                 if [ -f $SCRIPT_DIR/linux-live/modules/$DESKTOP_ENVIRONMENT/$MODULE/preinstall ]; then
                     if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then

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

@@ -82,4 +82,4 @@ CFLAGS="-O2 \
 make >>$OUTPUT 2>&1
 cp cbatticon /squashfs-root/usr/bin >>$OUTPUT 2>&1
 
-dir2sb /squashfs-root /03-desktop.sb >>$OUTPUT 2>&1
+dir2sb /squashfs-root /$MODULE.sb >>$OUTPUT 2>&1

linux-live/module_scripts/03-xfce-desktop/postinstall

@@ -11,11 +11,6 @@ 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

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

@@ -41,4 +41,5 @@ rm -f /squashfs-root/usr/share/applications/nm-applet.desktop >>$OUTPUT 2>&1
 rm -f /squashfs-root/usr/share/applications/nm-connection-editor.desktop >>$OUTPUT 2>&1
 rm -f /squashfs-root/usr/share/applications/lxtask.desktop >>$OUTPUT 2>&1
 
-dir2sb /squashfs-root /04-apps.sb >>$OUTPUT 2>&1
+dir2sb /squashfs-root /$MODULE.sb >>$OUTPUT 2>&1
+#dir2sb /squashfs-root /04-slax-apps.sb >>$OUTPUT 2>&1

linux-live/module_scripts/05-chromium/install

@@ -14,3 +14,19 @@ if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
 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
+TerminalEmulator=xterm
+FileManager=pcmanfm
+WebBrowser=chromium
+
+EOF
+elif [ $PACKAGE_VARIANT = "standard" ]; then
+    cat <<EOF >/etc/skel/.config/xfce4/helpers.rc
+TerminalEmulator=xfce4-terminal
+FileManager=Thunar
+WebBrowser=chromium
+
+EOF
+fi

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

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

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

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

linux-live/modules/slax-firefox/03-slax-desktop

@@ -0,0 +1 @@
+../../module_scripts/03-slax-desktop

linux-live/modules/slax-firefox/04-slax-apps

@@ -0,0 +1 @@
+../../module_scripts/04-slax-apps

linux-live/modules/slax-firefox/05-firefox

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

linux-live/modules/xfce-chromium/01-firmware

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

linux-live/modules/xfce-chromium/02-xorg

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

linux-live/modules/xfce-chromium/03-xfce-desktop

@@ -0,0 +1 @@
+../../module_scripts/03-xfce-desktop

linux-live/modules/xfce-chromium/04-xfce-apps

@@ -0,0 +1 @@
+../../module_scripts/04-xfce-apps

linux-live/modules/xfce-chromium/05-chromium

@@ -0,0 +1 @@
+../../module_scripts/05-chromium