update

autoinstall

@@ -19,7 +19,7 @@ set -u
 # don't change! use ./install instead
 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_chroot build_modules_live build_iso)
 
 # =============   main  ================
 

build_install

@@ -0,0 +1,73 @@
+#!/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")")"
+PARENT_DIR="$(dirname "$SCRIPT_DIR")"
+ISO_DIR="$(dirname "$SCRIPT_DIR")"/iso
+
+set +u
+if [ -z $OUTPUT ]; then
+    . $SCRIPT_DIR/linux-live/buildconfig || exit 1
+fi
+set -u
+. $SCRIPT_DIR/linux-live/minioslib || exit 1
+. $SCRIPT_DIR/linux-live/config || exit 1
+
+# don't change! use ./autoinstall instead
+UNATTENDED="0"
+
+CMD=(setup_host build_bootstrap build_chroot build_modules_chroot)
+
+# =============   main  ================
+
+BUILD_DIR=""
+
+common_variables
+
+if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
+    new_run
+fi
+
+console_colours
+
+allow_root_only
+
+create_livekitname_install_symlink
+
+create_completion
+
+create_backup
+
+# check number of args
+if [[ $# == 0 || $# > 3 ]]; then help; fi
+
+# loop through args
+dash_flag=false
+start_index=0
+end_index=${#CMD[*]}
+for ii in "$@"; do
+    if [[ $ii == "-" ]]; then
+        dash_flag=true
+        continue
+    fi
+    find_index $ii
+    if [[ $dash_flag == false ]]; then
+        start_index=$index
+    else
+        end_index=$(($index + 1))
+    fi
+done
+if [[ $dash_flag == false ]]; then
+    end_index=$(($start_index + 1))
+fi
+
+#loop through the commands
+for ((ii = $start_index; ii < $end_index; ii++)); do
+    setup_build_dir
+    ${CMD[ii]}
+done
+
+echo -e "${BOLD}${LIGHTYELLOW}$0${ENDCOLOUR} - ${LIGHTGREEN}Command completed successfully!${ENDCOLOUR}"

build_master

@@ -0,0 +1,73 @@
+#!/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")")"
+PARENT_DIR="$(dirname "$SCRIPT_DIR")"
+ISO_DIR="$(dirname "$SCRIPT_DIR")"/iso
+
+set +u
+if [ -z $OUTPUT ]; then
+    . $SCRIPT_DIR/linux-live/buildconfig || exit 1
+fi
+set -u
+. $SCRIPT_DIR/linux-live/minioslib || exit 1
+. $SCRIPT_DIR/linux-live/config || exit 1
+
+# don't change! use ./autoinstall instead
+UNATTENDED="0"
+
+CMD=(build_live build_modules_live build_iso)
+
+# =============   main  ================
+
+BUILD_DIR=""
+
+common_variables
+
+if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then
+    new_run
+fi
+
+console_colours
+
+allow_root_only
+
+create_livekitname_install_symlink
+
+create_completion
+
+create_backup
+
+# check number of args
+if [[ $# == 0 || $# > 3 ]]; then help; fi
+
+# loop through args
+dash_flag=false
+start_index=0
+end_index=${#CMD[*]}
+for ii in "$@"; do
+    if [[ $ii == "-" ]]; then
+        dash_flag=true
+        continue
+    fi
+    find_index $ii
+    if [[ $dash_flag == false ]]; then
+        start_index=$index
+    else
+        end_index=$(($index + 1))
+    fi
+done
+if [[ $dash_flag == false ]]; then
+    end_index=$(($start_index + 1))
+fi
+
+#loop through the commands
+for ((ii = $start_index; ii < $end_index; ii++)); do
+    setup_build_dir
+    ${CMD[ii]}
+done
+
+echo -e "${BOLD}${LIGHTYELLOW}$0${ENDCOLOUR} - ${LIGHTGREEN}Command completed successfully!${ENDCOLOUR}"

build_modules

@@ -15,12 +15,11 @@ fi
 set -u
 . $SCRIPT_DIR/linux-live/minioslib || exit 1
 . $SCRIPT_DIR/linux-live/config || exit 1
-. $SCRIPT_DIR/linux-live/livekitlib|| exit 1
 
 # don't change! use ./autoinstall instead
 UNATTENDED="0"
 
-CMD=(build_modules)
+CMD=(build_modules_chroot build_modules_live)
 
 # =============   main  ================
 

add_pkg → build_package

@@ -19,7 +19,7 @@ set -u
 # don't change! use ./autoinstall instead
 UNATTENDED="0"
 
-CMD=(add_package)
+CMD=(build_package)
 
 # =============   main  ================
 

docker/01-runme.sh

@@ -0,0 +1,6 @@
+#!/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
+apt install python3-pip
+pip3 install pydocker
+python3 ./Dockerfile.py

docker/02-build.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+#docker run --rm -it --privileged -v /build:/build local/mlc
+#docker run -it --name mlc --privileged -v /build:/build local/mlc
+docker run -d --name mlc --privileged -v /build:/build local/mlc

docker/Dockerfile.minios-live-container

@@ -1,7 +0,0 @@
-
-FROM ubuntu:focal
-COPY Dockerfile.minios-live-container.0@install.sh /opt/install.sh
-RUN chmod +x /opt/install.sh && /opt/install.sh && rm /opt/install.sh
-VOLUME /build
-WORKDIR /build/minios-live
-CMD ["/build/minios-live/autoinstall", "-"]

docker/Dockerfile.minios-live-container.0@install.sh

@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-set -e -o xtrace
-
-function _failure() {
-  echo -e "\r\nERROR: bash script [ /opt/install.sh ] failed at line $1: \"$2\""
-}
-trap '_failure ${LINENO} "$BASH_COMMAND"' ERR
-
-# ############################################################################ #
-
-
-touch /.minios-live-container
-apt-get update -y
-apt-get install -y sudo debootstrap xorriso
-: 'apt-get install -y wget patch sudo debootstrap xorriso
-cd /opt/
-wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb
-dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb
-rm -f /opt/debootstrap_1.0.123ubuntu2_all.deb
-cat <<'EOF' >/usr/share/debootstrap/functions.diff
---- functions	2020-10-23 20:42:16.000000000 +0300
-+++ functions.new	2021-01-16 23:22:25.612064306 +0300
-@@ -1176,7 +1176,9 @@
- 		umount_on_exit /dev/shm
- 		umount_on_exit /proc
- 		umount_on_exit /proc/bus/usb
--		umount "$TARGET/proc" 2>/dev/null || true
-+		if [ ! -h "$TARGET/proc" ]; then
-+			umount "$TARGET/proc" 2>/dev/null || true
-+		fi
- 
- 		# some container environment are used at second-stage, it already treats /proc and so on
- 		if [ -z "$(ls -A "$TARGET/proc")" ]; then
-
-EOF
-cd /usr/share/debootstrap/
-patch </usr/share/debootstrap/functions.diff '
-apt-get clean
-find /var/log/ -type f | xargs rm -f
-rm -f /var/backups/*
-rm -f /var/cache/ldconfig/*
-rm -f /var/cache/debconf/*
-rm -f /var/cache/fontconfig/*
-rm -f /var/cache/apt/archives/*.deb
-rm -f /var/cache/apt/*.bin
-rm -f /var/cache/debconf/*-old
-rm -f /var/lib/apt/extended_states
-rm -f /var/lib/apt/lists/*Packages
-rm -f /var/lib/apt/lists/*Translation*
-rm -f /var/lib/apt/lists/*InRelease
-rm -f /var/lib/apt/lists/deb.*
-rm -f /var/lib/dpkg/*-old

docker/Dockerfile.py

@@ -12,14 +12,14 @@ logging.root.addHandler(logging.StreamHandler(sys.stdout))
 class DockerFile(pydocker.DockerFile):
     """   add here your custom features   """
 
-
-d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
+#d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
+d = DockerFile(base_img='ubuntu:bionic', name='local/mlc:latest')
 
 d.RUN_bash_script('/opt/install.sh', r'''
+touch /.minios-live-container
 apt-get update -y
-apt-get install -y wget patch sudo debootstrap xorriso
-mkdir -p /opt/minios-live
-wget -qO- wget -qO- http://crims0n.ru:33011/minios-live-current.tar.gz | tar xz -C /opt/minios-live
+apt-get install -y wget sudo debootstrap xorriso binutils squashfs-tools grub-pc-bin grub-efi-amd64-bin dosfstools mtools xz-utils liblz4-tool
+: 'apt-get install -y patch
 cd /opt/
 wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb
 dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb
@@ -41,7 +41,7 @@ cat <<'EOF' >/usr/share/debootstrap/functions.diff
 
 EOF
 cd /usr/share/debootstrap/
-patch </usr/share/debootstrap/functions.diff
+patch </usr/share/debootstrap/functions.diff '
 apt-get clean
 find /var/log/ -type f | xargs rm -f
 rm -f /var/backups/*
@@ -52,25 +52,17 @@ rm -f /var/cache/apt/archives/*.deb
 rm -f /var/cache/apt/*.bin
 rm -f /var/cache/debconf/*-old
 rm -f /var/lib/apt/extended_states
-rm -f /var/lib/apt/lists/*Packages
+rm -f /var/lib/apt/lists/*Packages*
 rm -f /var/lib/apt/lists/*Translation*
 rm -f /var/lib/apt/lists/*InRelease
 rm -f /var/lib/apt/lists/deb.*
 rm -f /var/lib/dpkg/*-old
 ''')
 
-d.ENV = 'LOGPATH="/var/log"'
-d.ENV = 'BUILD_TEST_ISO="0"'
-d.ENV = 'DEV_SYSTEM="0"'
-d.ENV = 'CREATE_BACKUP="0"'
-d.ENV = 'DEBIAN_FRONTEND_TYPE="noninteractive"'
-d.ENV = 'APT_CMD="apt-get"'
-d.ENV = 'APT_OPTIONS="-y"'
-
 d.VOLUME = '/build'
 d.WORKDIR = '/build/minios-live'
 
 # d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
-d.CMD = ["/opt/minios-live/autoinstall", "-"]
+d.CMD = ["/build/minios-live/autoinstall", "-"]
 
 d.build_img()

docker/Dockerfile2.py

@@ -1,68 +0,0 @@
-#!/usr/bin/python3
-# Dockerfile.py
-
-import sys
-import logging
-import pydocker  # github.com/jen-soft/pydocker
-
-logging.getLogger('').setLevel(logging.INFO)
-logging.root.addHandler(logging.StreamHandler(sys.stdout))
-
-
-class DockerFile(pydocker.DockerFile):
-    """   add here your custom features   """
-
-
-d = DockerFile(base_img='ubuntu:focal', name='crims0n/minios-live-container:latest')
-
-d.RUN_bash_script('/opt/install.sh', r'''
-touch /.minios-live-container
-apt-get update -y
-apt-get install -y sudo debootstrap xorriso
-: 'apt-get install -y wget patch sudo debootstrap xorriso
-cd /opt/
-wget -c http://ru.archive.ubuntu.com/ubuntu/pool/main/d/debootstrap/debootstrap_1.0.123ubuntu2_all.deb
-dpkg -i /opt/debootstrap_1.0.123ubuntu2_all.deb
-rm -f /opt/debootstrap_1.0.123ubuntu2_all.deb
-cat <<'EOF' >/usr/share/debootstrap/functions.diff
---- functions	2020-10-23 20:42:16.000000000 +0300
-+++ functions.new	2021-01-16 23:22:25.612064306 +0300
-@@ -1176,7 +1176,9 @@
- 		umount_on_exit /dev/shm
- 		umount_on_exit /proc
- 		umount_on_exit /proc/bus/usb
--		umount "$TARGET/proc" 2>/dev/null || true
-+		if [ ! -h "$TARGET/proc" ]; then
-+			umount "$TARGET/proc" 2>/dev/null || true
-+		fi
- 
- 		# some container environment are used at second-stage, it already treats /proc and so on
- 		if [ -z "$(ls -A "$TARGET/proc")" ]; then
-
-EOF
-cd /usr/share/debootstrap/
-patch </usr/share/debootstrap/functions.diff '
-apt-get clean
-find /var/log/ -type f | xargs rm -f
-rm -f /var/backups/*
-rm -f /var/cache/ldconfig/*
-rm -f /var/cache/debconf/*
-rm -f /var/cache/fontconfig/*
-rm -f /var/cache/apt/archives/*.deb
-rm -f /var/cache/apt/*.bin
-rm -f /var/cache/debconf/*-old
-rm -f /var/lib/apt/extended_states
-rm -f /var/lib/apt/lists/*Packages
-rm -f /var/lib/apt/lists/*Translation*
-rm -f /var/lib/apt/lists/*InRelease
-rm -f /var/lib/apt/lists/deb.*
-rm -f /var/lib/dpkg/*-old
-''')
-
-d.VOLUME = '/build'
-d.WORKDIR = '/build/minios-live'
-
-# d.ENTRYPOINT = ["/opt/www-data/entrypoint.sh"]
-d.CMD = ["/build/minios-live/autoinstall", "-"]
-
-d.build_img()

docker/build.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo docker build -t minios-live -f Dockerfile.minios-live .

install

@@ -19,7 +19,7 @@ set -u
 # don't change! use ./autoinstall instead
 UNATTENDED="0"
 
-CMD=(setup_host build_bootstrap build_chroot build_live build_modules build_iso)
+CMD=(setup_host build_bootstrap build_chroot build_live build_modules_chroot build_modules_live build_iso)
 
 # =============   main  ================
 

linux-live/bootfiles-ubuntu/EFI/boot/alternative/readme.txt

@@ -1,5 +0,0 @@
-These uEFI binaries supply a work around for computers that do not like our binaries that bypass Secure boot.
-You'll have to disable Secure Boot in BIOS to use these.
-
-Copy bootx64.efi and grubx64.efi files to EFI/boot.
-Copy the folder x86_64-efi to boot/grub.

linux-live/bootfiles-ubuntu/EFI/boot/alternative/x86_64-efi/command.lst

@@ -1,190 +0,0 @@
-*acpi: acpi
-*all_functional_test: functional_test
-*background_image: gfxterm_background
-*cat: cat
-*cpuid: cpuid
-*crc: hashsum
-*cryptomount: cryptodisk
-*echo: echo
-*extract_syslinux_entries_configfile: syslinuxcfg
-*extract_syslinux_entries_source: syslinuxcfg
-*file: file
-*functional_test: functional_test
-*gettext: gettext
-*hashsum: hashsum
-*hdparm: hdparm
-*hello: hello
-*help: help
-*hexdump: hexdump
-*inb: iorw
-*inl: iorw
-*inw: iorw
-*keystatus: keystatus
-*kfreebsd: bsd
-*knetbsd: bsd
-*kopenbsd: bsd
-*list_env: loadenv
-*load_env: loadenv
-*loopback: loopback
-*ls: ls
-*lsacpi: lsacpi
-*lspci: lspci
-*md5sum: hashsum
-*menuentry: normal
-*pcidump: pcidump
-*probe: probe
-*read_byte: memrw
-*read_dword: memrw
-*read_word: memrw
-*regexp: regexp
-*save_env: loadenv
-*search: search
-*serial: serial
-*setpci: setpci
-*sha1sum: hashsum
-*sha256sum: hashsum
-*sha512sum: hashsum
-*sleep: sleep
-*submenu: normal
-*syslinux_configfile: syslinuxcfg
-*syslinux_source: syslinuxcfg
-*terminfo: terminfo
-*test_blockarg: test_blockarg
-*testspeed: testspeed
-*tr: tr
-*trust: verify
-*verify_detached: verify
-*xnu_splash: xnu
-*zfskey: zfscrypt
-.: configfile
-[: test
-appleloader: appleldr
-authenticate: normal
-background_color: gfxterm_background
-backtrace: backtrace
-badram: mmap
-blocklist: blocklist
-boot: boot
-break: normal
-cat: minicmd
-cbmemc: cbmemc
-chainloader: chain
-clear: normal
-cmp: cmp
-configfile: configfile
-continue: normal
-coreboot_boottime: cbtime
-cutmem: mmap
-date: date
-distrust: verify
-dump: minicmd
-eval: eval
-exit: minicmd
-export: normal
-extract_entries_configfile: configfile
-extract_entries_source: configfile
-extract_legacy_entries_configfile: legacycfg
-extract_legacy_entries_source: legacycfg
-fakebios: loadbios
-false: true
-fix_video: fixvideo
-fwsetup: efifwsetup
-gptsync: gptsync
-halt: halt
-help: minicmd
-hexdump_random: random
-initrd16: linux16
-initrd: linux
-initrdefi: linuxefi
-keymap: keylayouts
-kfreebsd_loadenv: bsd
-kfreebsd_module: bsd
-kfreebsd_module_elf: bsd
-knetbsd_module: bsd
-knetbsd_module_elf: bsd
-kopenbsd_ramdisk: bsd
-legacy_check_password: legacycfg
-legacy_configfile: legacycfg
-legacy_initrd: legacycfg
-legacy_initrd_nounzip: legacycfg
-legacy_kernel: legacycfg
-legacy_password: legacycfg
-legacy_source: legacycfg
-linux16: linux16
-linux: linux
-linuxefi: linuxefi
-list_trusted: verify
-loadbios: loadbios
-loadfont: font
-lscoreboot: cbls
-lsefi: lsefi
-lsefimmap: lsefimmap
-lsefisystab: lsefisystab
-lsfonts: font
-lsmmap: lsmmap
-lsmod: minicmd
-lssal: lssal
-macppcbless: macbless
-mactelbless: macbless
-module2: multiboot2
-module: multiboot
-multiboot2: multiboot2
-multiboot: multiboot
-nativedisk: nativedisk
-net_add_addr: net
-net_add_dns: net
-net_add_route: net
-net_bootp6: net
-net_bootp: net
-net_del_addr: net
-net_del_dns: net
-net_del_route: net
-net_get_dhcp_option: net
-net_ipv6_autoconf: net
-net_ls_addr: net
-net_ls_cards: net
-net_ls_dns: net
-net_ls_routes: net
-net_nslookup: net
-normal: normal
-normal_exit: normal
-outb: iorw
-outl: iorw
-outw: iorw
-parttool: parttool
-password: password
-password_pbkdf2: password_pbkdf2
-play: play
-read: read
-reboot: reboot
-return: normal
-rmmod: minicmd
-search.file: search_fs_file
-search.fs_label: search_label
-search.fs_uuid: search_fs_uuid
-setparams: normal
-shift: normal
-source: configfile
-terminal_input: terminal
-terminal_output: terminal
-test: test
-testload: testload
-time: time
-true: true
-usb: usbtest
-videoinfo: videoinfo
-videotest: videotest
-write_byte: memrw
-write_dword: memrw
-write_word: memrw
-xnu_devprop_load: xnu
-xnu_kernel64: xnu
-xnu_kernel: xnu
-xnu_kext: xnu
-xnu_kextdir: xnu
-xnu_mkext: xnu
-xnu_ramdisk: xnu
-xnu_resume: xnu
-xnu_uuid: xnu_uuid
-zfs-bootfs: zfsinfo
-zfsinfo: zfsinfo

linux-live/bootfiles-ubuntu/EFI/boot/alternative/x86_64-efi/crypto.lst

@@ -1,45 +0,0 @@
-RIJNDAEL: gcry_rijndael
-RIJNDAEL192: gcry_rijndael
-RIJNDAEL256: gcry_rijndael
-AES128: gcry_rijndael
-AES-128: gcry_rijndael
-AES-192: gcry_rijndael
-AES-256: gcry_rijndael
-ADLER32: adler32
-CRC64: crc64
-ARCFOUR: gcry_arcfour
-BLOWFISH: gcry_blowfish
-CAMELLIA128: gcry_camellia
-CAMELLIA192: gcry_camellia
-CAMELLIA256: gcry_camellia
-CAST5: gcry_cast5
-CRC32: gcry_crc
-CRC32RFC1510: gcry_crc
-CRC24RFC2440: gcry_crc
-DES: gcry_des
-3DES: gcry_des
-DSA: gcry_dsa
-IDEA: gcry_idea
-MD4: gcry_md4
-MD5: gcry_md5
-RFC2268_40: gcry_rfc2268
-AES: gcry_rijndael
-AES192: gcry_rijndael
-AES256: gcry_rijndael
-RIPEMD160: gcry_rmd160
-RSA: gcry_rsa
-SEED: gcry_seed
-SERPENT128: gcry_serpent
-SERPENT192: gcry_serpent
-SERPENT256: gcry_serpent
-SHA1: gcry_sha1
-SHA224: gcry_sha256
-SHA256: gcry_sha256
-SHA512: gcry_sha512
-SHA384: gcry_sha512
-TIGER192: gcry_tiger
-TIGER: gcry_tiger
-TIGER2: gcry_tiger
-TWOFISH: gcry_twofish
-TWOFISH128: gcry_twofish
-WHIRLPOOL: gcry_whirlpool

linux-live/bootfiles-ubuntu/EFI/boot/alternative/x86_64-efi/fs.lst

@@ -1,36 +0,0 @@
-affs
-afs
-bfs
-btrfs
-cbfs
-cpio
-cpio_be
-exfat
-ext2
-fat
-hfs
-hfsplus
-iso9660
-jfs
-minix
-minix2
-minix2_be
-minix3
-minix3_be
-minix_be
-newc
-nilfs2
-ntfs
-odc
-procfs
-reiserfs
-romfs
-sfs
-squash4
-tar
-udf
-ufs1
-ufs1_be
-ufs2
-xfs
-zfs