Browse Source

Update

master
crims0n 4 years ago
parent
commit
2f58dc1607
  1. 1
      linux-live/basesystem/01-core/minimal.list
  2. 2
      linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-autoinstall
  3. 2
      linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-install
  4. 7
      linux-live/basesystem/01-core/rootcopy-install/etc/hosts
  5. 28
      linux-live/basesystem/01-core/rootcopy-install/etc/issue
  6. 4
      linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso
  7. 74
      linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-autoinstall
  8. 74
      linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-install
  9. 2
      linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-modules-build
  10. 2
      linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-system-repack
  11. 871
      linux-live/basesystem/01-core/rootcopy-install/usr/lib/minioslib
  12. 8
      linux-live/buildconfig
  13. 2
      linux-live/config
  14. 3
      linux-live/initramfs/initramfs_create
  15. BIN
      linux-live/initramfs/minios-modules.tar.xz
  16. 98
      linux-live/initramfs/static/minios-configure
  17. 2
      linux-live/livekitlib
  18. 299
      linux-live/minioslib
  19. 5
      linux-live/modules/minios/01-firmware/install
  20. 0
      linux-live/modules/minios/01-firmware/minimal.list
  21. 0
      linux-live/modules/minios/01-firmware/standard.list
  22. 5
      linux-live/modules/minios/02-xorg/install
  23. 0
      linux-live/modules/minios/02-xorg/minimal.list
  24. 0
      linux-live/modules/minios/02-xorg/postinstall
  25. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.Xresources
  26. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackbox-menu
  27. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackboxrc
  28. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.xinitrc
  29. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service
  30. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service
  31. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax
  32. 0
      linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm
  33. 0
      linux-live/modules/minios/02-xorg/standard.list
  34. 27
      linux-live/modules/minios/03-xfce-desktop/install
  35. 0
      linux-live/modules/minios/03-xfce-desktop/minimal.list
  36. 2
      linux-live/modules/minios/03-xfce-desktop/postinstall
  37. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/default/nodm
  38. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs
  39. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc
  40. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc
  41. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop
  42. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop
  43. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop
  44. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml
  45. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
  46. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
  47. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
  48. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
  49. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
  50. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
  51. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
  52. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc
  53. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xsession
  54. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg
  55. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg
  56. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png
  57. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png
  58. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme
  59. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg
  60. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg
  61. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg
  62. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg
  63. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg
  64. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg
  65. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg
  66. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg
  67. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg
  68. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg
  69. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg
  70. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg
  71. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg
  72. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg
  73. 0
      linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg
  74. 0
      linux-live/modules/minios/03-xfce-desktop/standard.list
  75. 5
      linux-live/modules/minios/04-xfce-apps/install
  76. 0
      linux-live/modules/minios/04-xfce-apps/minimal.list
  77. 4
      linux-live/modules/minios/04-xfce-apps/postinstall
  78. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop
  79. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon
  80. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm
  81. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc
  82. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png
  83. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png
  84. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png
  85. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png
  86. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png
  87. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png
  88. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png
  89. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png
  90. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png
  91. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png
  92. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png
  93. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png
  94. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png
  95. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png
  96. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png
  97. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png
  98. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png
  99. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png
  100. 0
      linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png

1
linux-live/basesystem/01-core/minimal.list

@ -13,7 +13,6 @@ xz-utils
ca-certificates
openssl
acpid
acpi-support-base
powermgmt-base
bzip2
gpart

2
linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-autoinstall

@ -0,0 +1,2 @@
#/usr/bin/env bash
complete -W "build_modules repack_system" minios-autoinstall

2
linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-install

@ -0,0 +1,2 @@
#/usr/bin/env bash
complete -W "build_modules repack_system" minios-install

7
linux-live/basesystem/01-core/rootcopy-install/etc/hosts

@ -1,7 +0,0 @@
127.0.0.1 localhost
127.0.1.1 minios
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters

28
linux-live/basesystem/01-core/rootcopy-install/etc/issue

@ -1,28 +0,0 @@
\l
Thank you for using MiniOS.
Based on Debian GNU/Linux.
Powered by Slax.
:::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: :::::::: 
+:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+: 
+:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ 
+#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++ 
+#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ 
#+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# 
### ### ########### ### #### ########### ######## ######## 
Root login name: root
Password: toor
User login name: live
Password: evil

4
linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso

@ -37,6 +37,10 @@ if [ -e "$SOURCE/data/minios/boot/isolinux.bin" ]; then
MINIOS=$SOURCE/data/minios
fi
if [ -e "$SOURCE/iso/minios/boot/isolinux.bin" ]; then
MINIOS=$SOURCE/iso/slax
fi
if [ -e "$SOURCE/toram/boot/isolinux.bin" ]; then
MINIOS=$SOURCE/toram
fi

74
linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-autoinstall

@ -0,0 +1,74 @@
#!/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")"
CURRENT_DIR="$(pwd)"
ISO_DIR=$CURRENT_DIR/iso
TMP_DIR="/tmp/"
if [ -f $SCRIPT_DIR/minioslib ]; then
. $SCRIPT_DIR/minioslib || exit 1
else
. /usr/lib/minioslib || exit 1
fi
if [ -f $SCRIPT_DIR/config ]; then
. $SCRIPT_DIR/config || exit 1
elif [ -f /etc/minios/config ]; then
. /etc/minios/config || exit 1
else
. /run/initramfs/lib/config || exit 1
fi
if [ -f $CURRENT_DIR/config ]; then
. $CURRENT_DIR/config
fi
# don't change! use ./autoinstall instead
UNATTENDED="1"
CMD=(build_modules repack_system)
# ============= main ================
BUILD_DIR=""
common_variables
console_colours
allow_root_only
create_completion
# 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
${CMD[ii]}
done
echo -e "${BOLD}${LIGHTYELLOW}$0${ENDCOLOUR} - ${LIGHTGREEN}Command completed successfully!${ENDCOLOUR}"

74
linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-install

@ -0,0 +1,74 @@
#!/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")"
CURRENT_DIR="$(pwd)"
ISO_DIR=$CURRENT_DIR/iso
TMP_DIR="/tmp/"
if [ -f $SCRIPT_DIR/minioslib ]; then
. $SCRIPT_DIR/minioslib || exit 1
else
. /usr/lib/minioslib || exit 1
fi
if [ -f $SCRIPT_DIR/config ]; then
. $SCRIPT_DIR/config || exit 1
elif [ -f /etc/minios/config ]; then
. /etc/minios/config || exit 1
else
. /run/initramfs/lib/config || exit 1
fi
if [ -f $CURRENT_DIR/config ]; then
. $CURRENT_DIR/config
fi
# don't change! use ./autoinstall instead
UNATTENDED="0"
CMD=(build_modules repack_system)
# ============= main ================
BUILD_DIR=""
common_variables
console_colours
allow_root_only
create_completion
# 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
${CMD[ii]}
done
echo -e "${BOLD}${LIGHTYELLOW}$0${ENDCOLOUR} - ${LIGHTGREEN}Command completed successfully!${ENDCOLOUR}"

2
linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-modules-build

@ -0,0 +1,2 @@
#!/bin/bash
minios-autoinstall build_modules

2
linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-system-repack

@ -0,0 +1,2 @@
#!/bin/bash
minios-autoinstall repack_system

871
linux-live/basesystem/01-core/rootcopy-install/usr/lib/minioslib

@ -0,0 +1,871 @@
#!/bin/bash
# Functions library :: for install scripts
# Author: crims0n. <http://minios.ru>
#
# =================================================================
# =================================================================
# ========================= VARIABLES =============================
# =================================================================
# =================================================================
function common_variables() {
if [ $DISTRIBUTION_ARCH = "amd64" ]; then
KERNEL_ARCH="amd64"
#PACKAGE_VARIANT="standard"
elif [ $DISTRIBUTION_ARCH = "i386" ]; then
KERNEL_ARCH="686-pae"
#PACKAGE_VARIANT="minimal"
elif [ $DISTRIBUTION_ARCH = "arm64" ]; then
KERNEL_ARCH="arm64"
fi
}
# =================================================================
# =================================================================
# ===================== COMMON FUNCTIONS ==========================
# =================================================================
# =================================================================
function current_process() {
echo -e "${LIGHTYELLOW}=====> running ${CYAN}${CMD[ii]}${ENDCOLOUR}${LIGHTYELLOW} ...${ENDCOLOUR}"
}
# =================================================================
# beautiful console
# красивая консоль
# =================================================================
function console_colours() {
RED="\e[31m"
GREEN="\e[32m"
YELLOW="\e[33m"
BLUE="\e[34m"
MAGENTA="\e[35m"
CYAN="\e[36m"
LIGHTGRAY="\e[37m"
DARKGRAY="\e[90m"
LIGHTRED="\e[91m"
LIGHTGREEN="\e[92m"
LIGHTYELLOW="\e[93m"
LIGHTBLUE="\e[94m"
LIGHTMAGENTA="\e[95m"
LIGHTCYAN="\e[96m"
BOLD="\e[1m"
DIM="\e[2m"
UNDERLINED="\e[4m"
BLINK="\e[5m"
REVERSE="\e[7m"
HIDDEN="\e[8m"
ENDCOLOUR="\e[0m"
}
# =================================================================
# help functions
# функции помощи
# =================================================================
function help() {
# if $1 is set, use $1 as headline message in help()
if [ -f /etc/default/locale ]; then
if grep -q 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
if [ -z ${1+x} ]; then
echo -e "${LIGHTYELLOW}Этот скрипт собирает модули для $SYSTEMNAME.${ENDCOLOUR}"
echo -e
else
echo -e $1
echo
fi
echo -e "Поддерживаемые команды : ${CYAN}${CMD[*]}${ENDCOLOUR}"
echo -e
echo -e "Синтаксис: ${MAGENTA}$0${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
if [ -L /usr/bin/$LIVEKITNAME-install ] && [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
echo -e "\t${CYAN}$LIVEKITNAME-install${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
fi
echo -e "\tзапуск от start_cmd до end_cmd"
echo -e "\tесли start_cmd опущен, выполняются все команды, начиная с первой"
echo -e "\tесли end_cmd опущен, выполняются все команды до последней"
echo -e "\tвведите одну команду, чтобы запустить определенную команду"
echo -e "\tвведите '-' как единственный аргумент для запуска всех команд"
echo -e "\t"
echo -e "\tСкрипты установки должны находиться в папке с именем будущего модуля."
echo -e "\tНапример, чтобы собрать модуль с именем 06-vscode, скрипты сборки"
echo -e "\tдолжны находиться по следующему пути: ${LIGHTYELLOW}$CURRENT_DIR/modules/06-vscode${ENDCOLOUR}"
echo -e "\tПримеры:"
echo -e "\t${LIGHTYELLOW}$0 build_modules${ENDCOLOUR} сборка модулей"
echo -e "\t${LIGHTYELLOW}$0 repack_system${ENDCOLOUR} перепаковка системы с типом сжатия, указанным"
echo -e "\tв /etc/$LIVEKITNAME/config в переменной COMP_TYPE"
echo -e "\t${LIGHTYELLOW}$0 -${ENDCOLOUR} эта команда запустит обе функции поочерёдно"
exit 0
else
if [ -z ${1+x} ]; then
echo -e "${LIGHTYELLOW}This script builds modules for $SYSTEMNAME.${ENDCOLOUR}"
echo -e
else
echo -e $1
echo
fi
echo -e "Supported commands : ${CYAN}${CMD[*]}${ENDCOLOUR}"
echo -e
echo -e "Syntax: ${MAGENTA}$0${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
if [ -L /usr/bin/$LIVEKITNAME-install ] && [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
echo -e "\t${CYAN}$LIVEKITNAME-install${ENDCOLOUR} [start_cmd] [-] [end_cmd]"
fi
echo -e "\trun from start_cmd to end_cmd"
echo -e "\tif start_cmd is omitted, start from first command"
echo -e "\tif end_cmd is omitted, end with last command"
echo -e "\tenter single cmd to run the specific command"
echo -e "\tenter '-' as only argument to run all commands"
echo -e "\t"
echo -e "\tThe installation scripts must be in the folder with the"
echo -e "\tname of the future module. For example, to build a module"
echo -e "\tnamed 06-vscode, build scripts should be in the following"
echo -e "\tpath: ${LIGHTYELLOW}$CURRENT_DIR/modules/06-vscode${ENDCOLOUR}"
echo -e "\tExamples:"
echo -e "\t${LIGHTYELLOW}$0 build_modules ${ENDCOLOUR} build modules"
echo -e "\t${LIGHTYELLOW}$0 repack_system ${ENDCOLOUR} repack the system with the"
echo -e "\tcompression type specified by /etc/$LIVEKITNAME/config in COMP_TYPE variable"
echo -e "\t${LIGHTYELLOW}$0 - ${ENDCOLOUR} this command will run both functions alternately"
exit 0
fi
fi
}
# =================================================================
# parsing input commands
# разбор входных команд
# =================================================================
function find_index() {
local ret
local i
for ((i = 0; i < ${#CMD[*]}; i++)); do
if [ "${CMD[i]}" == "$1" ]; then
index=$i
return
fi
done
help "Command not found : $1"
}
# =================================================================
# creating a symbolic link to the executable file for using
# autocompletion on the command line
# создание символической ссылки на исполняемый файл для
# использования автодополнения в командной строке
# =================================================================
function create_livekitname_install_symlink() {
if [ -L /usr/bin/$LIVEKITNAME-install ]; then
if [ "$(readlink /usr/bin/$LIVEKITNAME-install)" != "$SCRIPT_DIR/install" ]; then
rm -f /usr/bin/$LIVEKITNAME-install
ln -s $SCRIPT_DIR/install /usr/bin/$LIVEKITNAME-install
if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
echo -e "Символическая ссылка ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} была обновлена."
echo -e "Теперь она указывает на ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
else
echo -e "The ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} symbolic link has been updated."
echo -e "It now points to ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
fi
fi
if [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
echo -e "Вы можете использовать команду ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} для запуска этой программы."
else
echo -e "You can use the ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} command to run this program."
fi
fi
else
ln -s $SCRIPT_DIR/install /usr/bin/$LIVEKITNAME-install
if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
echo -e "Символическая ссылка ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} была добавлена"
echo -e "для ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
else
echo -e "The ${MAGENTA}/usr/bin/$LIVEKITNAME-install${ENDCOLOUR} symbolic link has been added"
echo -e "for ${MAGENTA}$SCRIPT_DIR/install${ENDCOLOUR}."
fi
fi
}
# =================================================================
# creating autocompletion on the command line
# создание автодополнения в командной строке
# =================================================================
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 >>$OUTPUT; then
cat <<EOF >/etc/bash_completion.d/$LIVEKITNAME-install
#/usr/bin/env bash
complete -W "${CMD[*]}" $LIVEKITNAME-install
EOF
fi
if [ "$0" != "/usr/bin/$LIVEKITNAME-install" ]; then
if grep 'LANG="ru_RU.UTF-8"' /etc/default/locale >>$OUTPUT; then
echo -e "Дополнение команд работает только при использовании команды ${CYAN}$LIVEKITNAME-install${ENDCOLOUR}."
echo -e
else
echo -e "Command completion only works when using the ${CYAN}$LIVEKITNAME-install${ENDCOLOUR} command."
echo -e
fi
fi
fi
}
# =================================================================
# only allow 'root' to run the script
# разрешаем запуск скрипта только пользователю 'root'
# =================================================================
function allow_root_only() {
if [ $(id -u) -ne 0 ]; then
echo -e "${BOLD}${RED}This script should be run as 'root'!${ENDCOLOUR}"
exit 1
fi
export HOME=/root
export LC_ALL=C
}
# =================================================================
# check that we are inside chroot
# проверяем, что мы внутри chroot
# =================================================================
function check_is_in_chroot() {
if [ $(stat -c %i /)="2" ]; then
echo -e "${BOLD}${RED}This script should be run inside chroot only!${ENDCOLOUR}"
exit 1
fi
}
# Unzip gzipped files (man pages), so LZMA can compress 2times better.
# First we fix symlinks, then uncompress files
# $1 = search directory
uncompress_files() {
local LINK LINE
find "$1" -type l -name "*.gz" | while read LINE; do
LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
ln -sfn "$LINK" "$FILE"
rm -f "$LINE"
done
find "$1" -type f -name "*.gz" | xargs -r gunzip
}
# remove broken links
# $1 = search directory
remove_broken_links() {
find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf
}
function add_chroot_configuration_files() {
cat <<EOF >$1/$LIVEKITNAME.conf
OUTPUT=$OUTPUT
LOGPATH=$LOGPATH
BUILD_TEST_ISO=$BUILD_TEST_ISO
CREATE_BACKUP=$CREATE_BACKUP
DEBIAN_FRONTEND_TYPE=$DEBIAN_FRONTEND_TYPE
APT_CMD=$APT_CMD
APT_OPTIONS=$APT_OPTIONS
LIVE_TYPE=$LIVE_TYPE
DISTRIBUTION=$DISTRIBUTION
DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE
PACKAGE_VARIANT=$PACKAGE_VARIANT
COMP_TYPE=$COMP_TYPE
KERNEL_ARCH=$KERNEL_ARCH
LIVEKITNAME=$LIVEKITNAME
SYSTEMNAME=$SYSTEMNAME
DISTRIBUTION_ARCH=$DISTRIBUTION_ARCH
EOF
cat <<'EOF' >$1/functions
#!/bin/bash
# =================================================================
# beautiful console
# красивая консоль
# =================================================================
function console_colours() {
RED="\e[31m"
GREEN="\e[32m"
YELLOW="\e[33m"
BLUE="\e[34m"
MAGENTA="\e[35m"
CYAN="\e[36m"
LIGHTGRAY="\e[37m"
DARKGRAY="\e[90m"
LIGHTRED="\e[91m"
LIGHTGREEN="\e[92m"
LIGHTYELLOW="\e[93m"
LIGHTBLUE="\e[94m"
LIGHTMAGENTA="\e[95m"
LIGHTCYAN="\e[96m"
BOLD="\e[1m"
DIM="\e[2m"
UNDERLINED="\e[4m"
BLINK="\e[5m"
REVERSE="\e[7m"
HIDDEN="\e[8m"
ENDCOLOUR="\e[0m"
}
# =================================================================
# reading configuration file
# чтение конфигурационного файла
# =================================================================
function read_config() { # read_config file.cfg var_name1 var_name2
# ref: https://stackoverflow.com/a/20815951
shopt -s extglob # needed the "one of these"-match below
local configfile="${1?No configuration file given}"
local keylist="${@:2}" # positional parameters 2 and following
if [[ ! -f "$configfile" ]]; then
echo >&2 "\"$configfile\" is not a file!"
exit 1
fi
if [[ ! -r "$configfile" ]]; then
echo >&2 "\"$configfile\" is not readable!"
exit 1
fi
keylist="${keylist// /|}" # this will generate a regex 'one of these'
# lhs : "left hand side" : Everything left of the '='
# rhs : "right hand side": Everything right of the '='
#
# "lhs" will hold the name of the key you want to read.
# The value of "rhs" will be assigned to that key.
while IFS='= ' read -r lhs rhs; do
# IF lhs in keylist
# AND rhs not empty
if [[ "$lhs" =~ ^($keylist)$ ]] && [[ -n $rhs ]]; then
rhs="${rhs%\"*}" # Del opening string quotes
rhs="${rhs#\"*}" # Del closing string quotes
rhs="${rhs%\'*}" # Del opening string quotes
rhs="${rhs#\'*}" # Del closing string quotes
eval $lhs=\"$rhs\" # The magic happens here
fi
# tr used as a safeguard against dos line endings
done <<<$(tr -d '\r' <$configfile)
shopt -u extglob # Switching it back off after use
}
# Unzip gzipped files (man pages), so LZMA can compress 2times better.
# First we fix symlinks, then uncompress files
# $1 = search directory
uncompress_files() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
local LINK LINE
find "$1" -type l -name "*.gz" | while read LINE; do
LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
ln -sfn "$LINK" "$FILE"
rm -f "$LINE"
done
find "$1" -type f -name "*.gz" | xargs -r gunzip
}
# remove broken links
# $1 = search directory
remove_broken_links() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf
}
EOF
}
function remove_chroot_configuration_files() {
rm -f $1/$LIVEKITNAME.conf
rm -f $1/functions
}
function chroot_run() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
add_chroot_configuration_files $1
chroot $1 /bin/bash <<EOF
. /functions
read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
${@:2}
EOF
remove_chroot_configuration_files $1
}
# =================================================================
# =================================================================
# ======================= MODULES FUNCTIONS =======================
# =================================================================
# =================================================================
# =================================================================
#
#
# =================================================================
function module_check_mounted() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if grep -qs "$MODULE_MERGED_DIR" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/dev" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/run" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/proc" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/sys" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/dev/pts" /proc/mounts || grep -qs "$MODULE_MERGED_DIR/tmp" /proc/mounts; then
echo -e "${BOLD}${LIGHTYELLOW}Chroot contains mounted filesystems.${ENDCOLOUR}"
if [ "$UNATTENDED" = "1" ]; then
module_chroot_umount_fs
else
read -r -p "$(echo -e ""Do you want to ${GREEN}unmount them${ENDCOLOUR}? [${BOLD}${GREEN}Y${ENDCOLOUR}/n])" response
response=${response,,}
if [[ "$response" =~ ^(no|n)$ ]]; then
exit 1
else
module_chroot_umount_fs
fi
fi
fi
}
# =================================================================
#
#
# =================================================================
function module_check_build_dir() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ "$UNATTENDED" = "1" ]; then
#echo -e "${RED}!!!Unattended installation!!!${ENDCOLOUR}"
echo -e "The working directory is ${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR}."
if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
module_cleanup
module_check_mounted
fi
else
# ▼ должно быть только перенаправление ошибки!
if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} is not empty."
module_cleanup
module_check_mounted
echo -e "The working directory is ${MAGENTA}$MODULE_MERGED_DIR${ENDCOLOUR}."
else
module_check_mounted
echo -e "The working directory is ${MAGENTA}$MODULE_MERGED_DIR${ENDCOLOUR}."
fi
fi
}
# =================================================================
#
#
# =================================================================
function module_chroot_mount_fs() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
local MODULES MODULE_LOWER_DIR
module_check_mounted
mkdir -p $MODULES_DIR
mount -t tmpfs none $MODULES_DIR
MODULES_LIST=""
MODULES=(/run/initramfs/memory/bundles/*.$BEXT)
for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do
MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT)
mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
mount -o bind ${MODULES[$i]} $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower
MODULES_LIST=$MODULES_LIST":""$MODULES_DIR/lower/$MODULE_LOWER_DIR-lower"
done
MODULES_LIST=${MODULES_LIST:1}
mkdir -p $MODULE_UPPER_DIR $MODULE_WORK_DIR $MODULE_MERGED_DIR
mount -t overlay overlay -o lowerdir=$MODULES_LIST,upperdir=$MODULE_UPPER_DIR,workdir=$MODULE_WORK_DIR $MODULE_MERGED_DIR
if [ ! -d $MODULE_MERGED_DIR/dev ]; then
mkdir -p $MODULE_MERGED_DIR/dev
fi
if [ ! -d $MODULE_MERGED_DIR/run ]; then
mkdir -p $MODULE_MERGED_DIR/run
fi
if [ ! -d $MODULE_MERGED_DIR/proc ]; then
mkdir -p $MODULE_MERGED_DIR/proc
fi
if [ ! -d $MODULE_MERGED_DIR/sys ]; then
mkdir -p $MODULE_MERGED_DIR/sys
fi
if [ ! -d $MODULE_MERGED_DIR/tmp ]; then
mkdir -p $MODULE_MERGED_DIR/tmp
fi
mount --bind /dev $MODULE_MERGED_DIR/dev
echo "nameserver 8.8.8.8" >$MODULE_MERGED_DIR/etc/resolv.conf
mount none -t proc $MODULE_MERGED_DIR/proc
mount none -t sysfs $MODULE_MERGED_DIR/sys
mount none -t devpts $MODULE_MERGED_DIR/dev/pts
mount none -t tmpfs $MODULE_MERGED_DIR/tmp
}
# =================================================================
#
#
# =================================================================
function module_chroot_umount_fs() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
local MODULES MODULE_LOWER_DIR
set +e
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
umount $MODULE_MERGED_DIR/proc
umount $MODULE_MERGED_DIR/sys
umount $MODULE_MERGED_DIR/dev/pts
umount $MODULE_MERGED_DIR/tmp
umount $MODULE_MERGED_DIR/dev
rm -f $MODULE_UPPER_DIR/etc/resolv.conf
umount $MODULE_MERGED_DIR
umount $MODULES_DIR/lower/*
umount $MODULES_DIR
else
umount $MODULE_MERGED_DIR/proc >>$OUTPUT 2>&1
umount $MODULE_MERGED_DIR/sys >>$OUTPUT 2>&1
umount $MODULE_MERGED_DIR/dev/pts >>$OUTPUT 2>&1
umount $MODULE_MERGED_DIR/tmp >>$OUTPUT 2>&1
umount $MODULE_MERGED_DIR/dev >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/etc/resolv.conf >>$OUTPUT 2>&1
umount $MODULE_MERGED_DIR >>$OUTPUT 2>&1
umount $MODULES_DIR/lower/* >>$OUTPUT 2>&1
umount $MODULES_DIR >>$OUTPUT 2>&1
fi
set -e
module_check_mounted
}
# =================================================================
#
#
# =================================================================
function module_cleanup() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ "$UNATTENDED" = "1" ]; then
module_check_mounted
rm -rf $MODULE_UPPER_DIR
if [ -d "$MODULE_UPPER_DIR" ]; then
module_cleanup
fi
else
read -r -p "$(echo -e ""Do you want to ${BOLD}${RED}completely remove content${ENDCOLOUR} of ${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR}? [y/${BOLD}${GREEN}N${ENDCOLOUR}])" response
response=${response,,}
if [[ "$response" =~ ^(yes|y)$ ]]; then
module_check_mounted
rm -rf $MODULE_UPPER_DIR
if [ -d "$MODULE_UPPER_DIR" ]; then
module_cleanup
fi
else
echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} should be empty to continue."
exit 1
fi
fi
}
# =================================================================
#
#
# =================================================================
function module_chroot_finish_up() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
chroot $MODULE_MERGED_DIR /bin/bash -x <<EOF
truncate -s 0 /etc/machine-id
EOF
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot $MODULE_MERGED_DIR /bin/bash -x <<EOF
rm /sbin/initctl
dpkg-divert --rename --remove /sbin/initctl
EOF
else
chroot $MODULE_MERGED_DIR /bin/bash -x <<EOF
rm /sbin/initctl >>$OUTPUT 2>&1
dpkg-divert --rename --remove /sbin/initctl >>$OUTPUT 2>&1
EOF
fi
if [ -d $MODULE_UPPER_DIR/home/live ]; then
chown 1000:1000 $MODULE_UPPER_DIR/home/live
chown -R 1000:1000 $MODULE_UPPER_DIR/home/live
fi
}
function chroot_cleanup() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
set +eu
rm -f $1/functions
rm -f $1/$LIVEKITNAME.conf
rm -f $1/preinstall
rm -f $1/install
rm -f $1/install2
rm -f $1/cleanup
rm -f $1/$PACKAGE_VARIANT.list
rm -f $1/postinstall
rm -rf $1/rootcopy-install
rm -rf $1/rootcopy
rm -rf $1/patches
rm -f $1/etc/fstab
rm -f $1/etc/mtab
rm -f $1/etc/apt/sources.list~
rm -Rf $1/etc/systemd/system/timers.target.wants
rm -f $1/etc/systemd/system/multi-user.target.wants/ssh.service
rm -f $1/etc/systemd/system/multi-user.target.wants/dnsmasq.service
rm -f $1/etc/ssh/ssh_host*
rm -f $1/var/backups/*
rm -f $1/var/cache/ldconfig/*
rm -f $1/var/cache/debconf/*
rm -f $1/var/cache/fontconfig/*
rm -f $1/var/lib/apt/extended_states
rm -f $1/var/lib/systemd/random-seed
rm -f $1/var/lib/apt/lists/deb.*
rm -Rf $1/root/.local/share/mc
rm -Rf $1/root/.cache
rm -f $1/root/.wget-hsts
rm -f $1/var/lib/dpkg/*-old
rm -f $1/var/log/*
rm -f $1/var/log/*/*
rm -f $1/var/log/*/*/*
rm -f $1/var/cache/apt/archives/*.deb
rm -f $1/var/cache/apt/*.bin
rm -f $1/var/cache/debconf/*-old
rm -f $1/var/lib/dhcp/dhclient.leases
rm -f $1/root/.bash_history
rm -f $1/root/.wget-hsts
rm -Rf $1/usr/share/doc/*
rm -Rf $1/usr/share/info/*
rm -f $1/usr/share/images/fluxbox/debian-squared.jpg
rm -Rf $1/usr/share/fluxbox/nls/??*
rm -Rf $1/usr/share/gnome/help
rm -Rf $1/usr/share/locale/??
rm -Rf $1/usr/share/locale/??_*
rm -Rf $1/usr/share/locale/??@*
rm -Rf $1/usr/share/locale/???
rm -Rf $1/usr/share/i18n/locales/*_*
rm -Rf $1/usr/share/man/??
rm -Rf $1/usr/share/man/*_*
rm -Rf $1/usr/share/icons/elementaryXubuntu-dark
rm -Rf $1/usr/share/icons/gnome/256x256
rm $1/usr/share/applications/compton.desktop
rm $1/usr/share/applications/debian-uxterm.desktop
rm $1/usr/share/applications/debian-xterm.desktop
rm $1/usr/share/applications/htop.desktop
rm $1/usr/share/applications/mc.desktop
rm $1/usr/share/applications/mcedit.desktop
rm $1/usr/share/applications/pcmanfm-desktop-pref.desktop
rm $1/usr/share/applications/python2.7.desktop
rm $1/usr/share/applications/python3.7.desktop
rm $1/usr/share/applications/vim.desktop
if [ -z $1 ]; then
uncompress_files $1/etc/alternatives
uncompress_files $1/usr/share/man
remove_broken_links $1/etc/alternatives
remove_broken_links $1/usr/share/man
fi
set -eu
}
# =================================================================
#
#
# =================================================================
function module_build_cleanup() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot_cleanup $MODULE_UPPER_DIR
else
chroot_cleanup $MODULE_UPPER_DIR >>$OUTPUT 2>&1
fi
}
# =================================================================
#
#
# =================================================================
function build_modules() {
current_process
MODULES_DIR=$CURRENT_DIR/build
if [ -d $CURRENT_DIR/modules ]; then
cd $CURRENT_DIR/modules
else
help
fi
for MODULE in *; do
MODULE_UPPER_DIR="$MODULES_DIR/$MODULE-upper"
MODULE_WORK_DIR="$MODULES_DIR/$MODULE-work"
MODULE_MERGED_DIR="$MODULES_DIR/$MODULE-merged"
module_check_build_dir
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/$MODULE/preinstall ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot_run $MODULE_MERGED_DIR /preinstall
else
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot_run $MODULE_MERGED_DIR /preinstall >>$OUTPUT 2>&1
fi
fi
# copy files
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-install)" != "" ]; then
(cd $CURRENT_DIR/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
else
if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
(cd $CURRENT_DIR/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
fi
# run install script
if [ -f $CURRENT_DIR/modules/$MODULE/install ]; then
cp $CURRENT_DIR/modules/$MODULE/install $MODULE_MERGED_DIR/install
chmod +x $MODULE_MERGED_DIR/install
if [ -f $CURRENT_DIR/modules/$MODULE/cleanup ]; then
cp $CURRENT_DIR/modules/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup
fi
if [ -f $CURRENT_DIR/modules/$MODULE/$PACKAGE_VARIANT.list ]; then
cp $CURRENT_DIR/modules/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
fi
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot_run $MODULE_MERGED_DIR /install
else
chroot_run $MODULE_MERGED_DIR /install >>$OUTPUT 2>&1
fi
fi
# run install2 script
if [ -f $CURRENT_DIR/modules/$MODULE/install2 ]; then
cp $CURRENT_DIR/modules/$MODULE/install2 $MODULE_MERGED_DIR/install2
chmod +x $MODULE_MERGED_DIR/install2
if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then
mkdir $MODULE_MERGED_DIR/patches
(cd $CURRENT_DIR/modules/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/)
fi
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot_run $MODULE_MERGED_DIR /install2
else
chroot_run $MODULE_MERGED_DIR /install2 >>$OUTPUT 2>&1
fi
fi
# copy files
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall)" != "" ]; then
(cd $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
else
if [ "$(ls -A $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
(cd $CURRENT_DIR/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
fi
# run post-install script
if [ -f $CURRENT_DIR/modules/$MODULE/postinstall ]; then
cp $CURRENT_DIR/modules/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
chmod +x $MODULE_MERGED_DIR/postinstall
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot_run $MODULE_MERGED_DIR /postinstall
else
chroot_run $MODULE_MERGED_DIR /postinstall >>$OUTPUT 2>&1
fi
fi
set +e
chroot_run $MODULE_MERGED_DIR uncompress_files /etc/alternatives
chroot_run $MODULE_MERGED_DIR uncompress_files /usr/share/man
chroot_run $MODULE_MERGED_DIR remove_broken_links /etc/alternatives
chroot_run $MODULE_MERGED_DIR remove_broken_links /usr/share/man
set -e
module_chroot_finish_up
module_build_cleanup
if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
mksquashfs $MODULE_UPPER_DIR $CURRENT_DIR/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
else
echo -e "${MAGENTA}$MODULE_UPPER_DIR${ENDCOLOUR} ${RED}is empty${ENDCOLOUR}. Nothing to do."
fi
module_chroot_umount_fs
done
}
function repack_module() {
cd $CURRENT_DIR
OLD_MODULE=$MODULE
MODULE=${MODULE%"-$OLD_COMP_TYPE.$BEXT"}
if [ $COMP_TYPE = $OLD_COMP_TYPE ]; then
echo "The module is already in the required compression format." && exit
fi
if (ls $CURRENT_DIR/*.$BEXT | grep -q $MODULE 2>/dev/null); then
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
echo -e "Please remove $CURRENT_DIR/$MODULE-$COMP_TYPE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}."
echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}"
else
mksquashfs /run/initramfs/memory/bundles/$OLD_MODULE $CURRENT_DIR/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit
fi
}
function repack_system() {
current_process
cd /run/initramfs/memory/bundles/
for MODULE in *; do
if (ls /run/initramfs/memory/bundles/*-xz.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
OLD_COMP_TYPE="xz"
repack_module
elif (ls /run/initramfs/memory/bundles/*-lz4.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
OLD_COMP_TYPE="lz4"
repack_module
elif (ls /run/initramfs/memory/bundles/*-zstd.$BEXT | grep -q $MODULE >>/dev/null 2>&1); then
OLD_COMP_TYPE="zstd"
repack_module
fi
done
}

8
linux-live/buildconfig

@ -6,13 +6,13 @@ DISTRIBUTION_TYPE="debian"
# distribution
# дистрибутив
DISTRIBUTION="bullseye"
DISTRIBUTION="stretch"
# distribution arch
# note: stretch only works with amd64
# архитектура дистрибутива
# для заметки: stretch работает только с amd64
DISTRIBUTION_ARCH="amd64"
DISTRIBUTION_ARCH="i386"
COMP_TYPE="xz"
@ -62,6 +62,10 @@ APT_OPTIONS="-y"
#LIVE_TYPE="casper"
LIVE_TYPE="livekit"
#MODULES_TYPE="minios"
#MODULES_TYPE="slax"
MODULES_TYPE="minios"
# тип iso
BOOT_TYPE="hybrid"
#BOOT_TYPE=""

2
linux-live/config

@ -43,7 +43,7 @@ MKMOD="bin etc home lib lib64 opt root sbin srv usr var"
# To enable, set to true
NETWORK=true
# If you need support for VM drivers at boot time (QEMU KVM, VMware
# If you need support for VM drivers at boot time (QEMU KVM, VMware
# ESXi), you can enable it here.
# This is disabled by default since most people won't need it.
# To enable, set to true

3
linux-live/initramfs/initramfs_create

@ -44,7 +44,7 @@ copy_including_deps() {
}
rm -Rf $INITRAMFS
mkdir -p $INITRAMFS/{bin,dev,etc,lib,lib64,mnt,opt,proc,root,run,sys,tmp,usr,var/log}
mkdir -p $INITRAMFS/{bin,dev,etc,lib,lib64,mnt,proc,root,run,sys,tmp,usr,var/log}
ln -s bin $INITRAMFS/sbin
#cp static/bash $INITRAMFS/bin
@ -197,7 +197,6 @@ ln -s ../init $INITRAMFS/bin/init
cp ../livekitlib $INITRAMFS/lib/
cp ../config $INITRAMFS/lib/
cp ../buildconfig $INITRAMFS/lib/
cp minios-modules.tar.xz $INITRAMFS/opt/
cd $INITRAMFS
find . -print | cpio -o -H newc 2>/dev/null | xz -f --extreme --check=crc32 >$INITRAMFS.img

BIN
linux-live/initramfs/minios-modules.tar.xz

Binary file not shown.

98
linux-live/initramfs/static/minios-configure

@ -4,15 +4,45 @@
# Author: crims0n. <http://minios.ru>
#
exec 19>/var/log/minios/boot.log
BASH_XTRACEFD=19
set -x
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
function console_colours() {
RED="\e[31m"
GREEN="\e[32m"
YELLOW="\e[33m"
BLUE="\e[34m"
MAGENTA="\e[35m"
CYAN="\e[36m"
LIGHTGRAY="\e[37m"
DARKGRAY="\e[90m"
LIGHTRED="\e[91m"
LIGHTGREEN="\e[92m"
LIGHTYELLOW="\e[93m"
LIGHTBLUE="\e[94m"
LIGHTMAGENTA="\e[95m"
LIGHTCYAN="\e[96m"
BOLD="\e[1m"
DIM="\e[2m"
UNDERLINED="\e[4m"
BLINK="\e[5m"
REVERSE="\e[7m"
HIDDEN="\e[8m"
ENDCOLOUR="\e[0m"
}
function help() {
# if $1 is set, use $1 as headline message in help()
if [ -z ${1+x} ]; then
echo -e "${LIGHTYELLOW}This script allows you to configure some parameters of $SYSTEMNAME.${ENDCOLOUR}"
echo -e
else
echo -e $1
echo
fi
echo -e "Syntax: ${MAGENTA}$0${ENDCOLOUR} parameter=value"
if [ -L /usr/bin/$LIVEKITNAME-configure ] && [ "$0" != "/usr/bin/$LIVEKITNAME-configure" ]; then
echo -e "\t${CYAN}$LIVEKITNAME-configure${ENDCOLOUR} parameter=value"
fi
echo -e "root_password - root password."
echo -e "user_name - username. If you specify the username root , then the user profile will not be created, the user_password parameter will be ignored."
echo -e "user_password - user password."
@ -21,8 +51,7 @@ function help() {
echo -e "ssh - enable ssh."
echo -e "cloud - special mode to run as a cloud-init host."
echo -e ""
echo -e "Example: ${MAGENTA}$0${ENDCOLOUR} root_password=toor user_name=live user_password=evil"
echo -e "Example: ${LIGHTYELLOW}$0${ENDCOLOUR} root_password=toor user_name=live user_password=evil"
exit 0
}
@ -114,8 +143,17 @@ function read_config() { # read_config file.cfg var_name1 var_name2
shopt -u extglob # Switching it back off after use
}
console_colours
allow_root_only
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
if [ "$SCRIPT_DIR" != "/usr/bin" ]; then
exec 19>/var/log/minios/boot.log
BASH_XTRACEFD=19
set -x
fi
CURRENT_USER_NAME=$(id -nu 1000)
CURRENT_USER_GROUP=$(id -ng 1000)
@ -238,34 +276,38 @@ if [ "$CLOUD" != "true" ]; then
groupmod -n $USER_GROUP $CURRENT_USER_GROUP
fi
fi
fi
if [ -z "$USER_PASSWORD" ]; then
if [ "$SCRIPT_DIR" != "/usr/bin" ]; then
if [ "$USER_NAME" != "$CURRENT_USER_NAME" ]; then
if [ -f /etc/$LIVEKITNAME.conf ]; then
read_config /etc/$LIVEKITNAME.conf USER_PASSWORD
fi
if [ -z "$USER_PASSWORD" ]; then
USER_PASSWORD="evil"
if [ -z "$USER_PASSWORD" ]; then
if [ "$SCRIPT_DIR" != "/usr/bin" ]; then
if [ "$USER_NAME" != "$CURRENT_USER_NAME" ]; then
if [ -f /etc/$LIVEKITNAME.conf ]; then
read_config /etc/$LIVEKITNAME.conf USER_PASSWORD
fi
if [ -z "$USER_PASSWORD" ]; then
USER_PASSWORD="evil"
fi
fi
fi
fi
fi
if [ ! -z "$USER_PASSWORD" ]; then
# Set up password for user
if [ "$USER_NAME_CHANGE_PENDING" = "true" ]; then
echo $CURRENT_USER_NAME:$USER_PASSWORD | chpasswd
else
if [ -z "$USER_NAME" ]; then
if [ ! -z "$CURRENT_USER_NAME" ]; then
echo $CURRENT_USER_NAME:$USER_PASSWORD | chpasswd
if [ ! -z "$USER_PASSWORD" ]; then
# Set up password for user
if [ "$USER_NAME_CHANGE_PENDING" = "true" ]; then
echo $CURRENT_USER_NAME:$USER_PASSWORD | chpasswd
else
if [ -z "$USER_NAME" ]; then
if [ ! -z "$CURRENT_USER_NAME" ]; then
echo $CURRENT_USER_NAME:$USER_PASSWORD | chpasswd
else
echo "Username not specified"
fi
else
echo "Username not specified"
echo $USER_NAME:$USER_PASSWORD | chpasswd
fi
else
echo $USER_NAME:$USER_PASSWORD | chpasswd
fi
fi
else
if [ -z "$CURRENT_USER_NAME" ]; then
adduser --uid 1000 --gecos '' guest --disabled-password
fi
fi
else
USER_NAME="root"

2
linux-live/livekitlib

@ -861,7 +861,7 @@ change_root() {
# accessible on union without any further lookup down, else httpfs locks
if [ "$(network_device)" != "" ]; then
touch "/net.up.flag"
touch "$1/etc/resolv.conf"
touch "$1/etc/resolv.conf" 2>/dev/null
touch "$1/etc/hosts"
touch "$1/etc/gai.conf"
fi

299
linux-live/minioslib

@ -46,6 +46,10 @@ function common_variables() {
KERNEL_ARCH="arm64"
fi
if [ $MODULES_TYPE = "slax" ]; then
PACKAGE_VARIANT="minimal"
fi
if [ $CLOUD = "true" ]; then
PACKAGE_VARIANT="cloud"
fi
@ -620,6 +624,9 @@ DISTRIBUTION_TYPE=$DISTRIBUTION_TYPE
PACKAGE_VARIANT=$PACKAGE_VARIANT
COMP_TYPE=$COMP_TYPE
KERNEL_ARCH=$KERNEL_ARCH
LIVEKITNAME=$LIVEKITNAME
SYSTEMNAME=$SYSTEMNAME
DISTRIBUTION_ARCH=$DISTRIBUTION_ARCH
EOF
cat <<'EOF' >$1/functions
@ -696,6 +703,29 @@ function read_config() { # read_config file.cfg var_name1 var_name2
shopt -u extglob # Switching it back off after use
}
# Unzip gzipped files (man pages), so LZMA can compress 2times better.
# First we fix symlinks, then uncompress files
# $1 = search directory
uncompress_files() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
local LINK LINE
find "$1" -type l -name "*.gz" | while read LINE; do
LINK="$(readlink "$LINE" | sed -r 's/.gz$//')"
FILE="$(echo "$LINE" | sed -r 's/.gz$//')"
ln -sfn "$LINK" "$FILE"
rm -f "$LINE"
done
find "$1" -type f -name "*.gz" | xargs -r gunzip
}
# remove broken links
# $1 = search directory
remove_broken_links() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf
}
EOF
}
@ -729,8 +759,8 @@ function get_vars() {
set +u
add_chroot_configuration_files $1
. /functions
read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH
export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH
read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
set -u
}
@ -739,10 +769,11 @@ function chroot_run() {
add_chroot_configuration_files $1
chroot $1 /bin/bash <<EOF
. /functions
read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH
export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH
read_config /$LIVEKITNAME.conf OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
export OUTPUT LOGPATH BUILD_TEST_ISO CREATE_BACKUP DEBIAN_FRONTEND_TYPE APT_CMD APT_OPTIONS LIVE_TYPE DISTRIBUTION DISTRIBUTION_TYPE PACKAGE_VARIANT COMP_TYPE KERNEL_ARCH LIVEKITNAME SYSTEMNAME DISTRIBUTION_ARCH
${@:2}
EOF
remove_chroot_configuration_files $1
}
# Unzip gzipped files (man pages), so LZMA can compress 2times better.
@ -1027,6 +1058,10 @@ function build_live() {
build_boot
if [ $DISTRIBUTION = "stretch" ]; then
MKMOD="bin etc home lib opt root sbin srv usr var"
fi
# create compressed 01-core.sb
cd $INSTALL_DIR
COREFS=""
@ -1163,11 +1198,18 @@ 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 [ $MODULES_TYPE = "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 [ $MODULES_TYPE = "slax" ]; then
sed -i 's/quiet/quiet user_name=root/g' $BUILD_DIR/image/boot/grub/grub.cfg
fi
fi
fi
}
# =================================================================
#
@ -1324,8 +1366,9 @@ function chroot_cleanup() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
set +eu
rm -f $1/functions
rm -f $1/$LIVEKITNAME.conf
rm -f $1/functions
rm -f $1/preinstall
rm -f $1/install
rm -f $1/install2
@ -1394,11 +1437,13 @@ function chroot_cleanup() {
rm $1/usr/share/applications/python3.7.desktop
rm $1/usr/share/applications/vim.desktop
uncompress_files $1/etc/alternatives
uncompress_files $1/usr/share/man
if [ -z $1 ]; then
uncompress_files $1/etc/alternatives
uncompress_files $1/usr/share/man
remove_broken_links $1/etc/alternatives
remove_broken_links $1/usr/share/man
remove_broken_links $1/etc/alternatives
remove_broken_links $1/usr/share/man
fi
set -eu
}
@ -1478,7 +1523,7 @@ function main_pkg_list() {
chmod +x /linux-live/basesystem/01-core/preinstall
/linux-live/basesystem/01-core/preinstall
fi
: ' if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy-install)" != "" ]; then
: 'if [ "$(ls -A /linux-live/basesystem/01-core/rootcopy-install)" != "" ]; then
(cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /)
fi'
if [ -f /linux-live/basesystem/01-core/install ]; then
@ -1510,118 +1555,38 @@ function chroot_pkg_install() {
}
# =================================================================
# No longer used, it will be cleaned after successful testing.
# Больше не используется, будет убрано после успешного тестирования.
#
#
# =================================================================
function chroot_configure_unused_part() {
function chroot_configure() {
current_process
(cd /linux-live/basesystem/01-core/rootcopy-install && cp --parents -afr * /)
if [ "$CMDLINE_PARSER" = "true" ]; then
#echo "Enable cmdline-parser.service autostart." >>$OUTPUT 2>&1
#systemctl enable cmdline-parser.service >>$OUTPUT 2>&1
echo "Set up password for user 'root'" >>$OUTPUT 2>&1
echo root:$ROOT_PASSWORD | chpasswd >>$OUTPUT 2>&1
else
if [ $CLOUD != "true" ]; then
echo "Set up password for user 'root'" >>$OUTPUT 2>&1
echo root:$ROOT_PASSWORD | chpasswd >>$OUTPUT 2>&1
echo "Set up user '$USER_NAME'" >>$OUTPUT 2>&1
adduser --uid 1000 --gecos '' $USER_NAME --disabled-password >>$OUTPUT 2>&1
echo "Set up password for user '$USER_NAME'" >>$OUTPUT 2>&1
echo $USER_NAME:$USER_PASSWORD | chpasswd >>$OUTPUT 2>&1
usermod -a -G sudo $USER_NAME
: 'if [ ! -d /home/$USER_NAME ]; then
mkdir -p /home/$USER_NAME
fi
cp -r /etc/skel/* /home/$USER_NAME
chown $USER_NAME:$USER_NAME /home/$USER_NAME
chown -R $USER_NAME:$USER_NAME /home/$USER_NAME'
cat <<EOF >/etc/sudoers.d/90-minios
# live user is default user in minios.
# It needs passwordless sudo functionality.
$USER_NAME ALL=(ALL) NOPASSWD:ALL
EOF
cat <<EOF >/etc/issue
\l
Thank you for using MiniOS.
Based on Debian GNU/Linux.
Powered by Slax.
:::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: :::::::: 
+:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+: 
+:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ 
+#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++ 
+#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ 
#+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# 
### ### ########### ### #### ########### ######## ######## 
Root login name: root
Password: $ROOT_PASSWORD
User login name: $USER_NAME
Password: $USER_PASSWORD
EOF
else
echo "Set up password for user 'root'" >>$OUTPUT 2>&1
echo root:$ROOT_PASSWORD | chpasswd >>$OUTPUT 2>&1
rm -rf /home/live
cat <<EOF >/etc/issue
\l
Thank you for using MiniOS.
Based on Debian GNU/Linux.
Powered by Slax.
:::: :::: ::::::::::: :::: ::: ::::::::::: :::::::: :::::::: 
+:+:+: :+:+:+ :+: :+:+: :+: :+: :+: :+: :+: :+: 
+:+ +:+:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ 
+#+ +:+ +#+ +#+ +#+ +:+ +#+ +#+ +#+ +:+ +#++:++#++ 
+#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ 
#+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# 
### ### ########### ### #### ########### ######## ######## 
User login name set by
cloud-init. You must use
your ssh key to login.
Root login name: root
Password: $ROOT_PASSWORD
EOF
fi
# minios-install setup
if [ ! -d /etc/$LIVEKITNAME ]; then
mkdir -p /etc/$LIVEKITNAME
fi
}
cat <<EOF >/etc/$LIVEKITNAME/config
#!/bin/bash
# This is a config file for MiniOS-Live build script and Linux Live Kit boot script.
# !!! You shouldn't need to change anything expect PACKAGE_VARIANT OUTPUT COMP_TYPE !!!
LIVEKITNAME="$LIVEKITNAME"
SYSTEMNAME="$SYSTEMNAME"
DISTRIBUTION_TYPE="$DISTRIBUTION_TYPE"
DISTRIBUTION="$DISTRIBUTION"
DISTRIBUTION_ARCH="$DISTRIBUTION_ARCH"
PACKAGE_VARIANT="$PACKAGE_VARIANT"
LIVE_TYPE="livekit"
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
function chroot_configure() {
current_process
if [ ! -d /etc/NetworkManager ]; then
echo "Enable dhclient.service autostart." >>$OUTPUT 2>&1
cat <<EOF >/usr/lib/systemd/system/dhclient.service
@ -2007,11 +1972,6 @@ EOF
dpkg-divert --rename --remove /sbin/initctl >>$OUTPUT 2>&1
EOF
fi
if [ -d $MODULE_UPPER_DIR/home/live ]; then
chown 1000:1000 $MODULE_UPPER_DIR/home/live
chown -R 1000:1000 $MODULE_UPPER_DIR/home/live
fi
}
# =================================================================
@ -2020,6 +1980,7 @@ EOF
# =================================================================
function module_chroot_cleanup() {
echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
set +e
# clean up useless stuff
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
rm -rf $MODULE_UPPER_DIR/boot $MODULE_UPPER_DIR/dev $MODULE_UPPER_DIR/proc $MODULE_UPPER_DIR/sys $MODULE_UPPER_DIR/rmp $MODULE_UPPER_DIR/run
@ -2075,6 +2036,7 @@ function module_chroot_cleanup() {
rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1
rm -rf $MODULE_UPPER_DIR/rootcopy-install >>$OUTPUT 2>&1
rm -f $MODULE_UPPER_DIR/machine-id >>$OUTPUT 2>&1
set -e
fi
}
@ -2109,7 +2071,7 @@ function build_modules() {
MODULES_DIR=$BUILD_DIR/modules
cd $SCRIPT_DIR/linux-live/modules
cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE
for MODULE in *; do
if (ls $BUILD_DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then
@ -2125,59 +2087,59 @@ 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
#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/$MODULE/preinstall ]; then
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot_run $MODULE_MERGED_DIR /preinstall
else
cp $SCRIPT_DIR/linux-live/modules/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/preinstall $MODULE_MERGED_DIR/preinstall
chmod +x $MODULE_MERGED_DIR/preinstall
chroot_run $MODULE_MERGED_DIR /preinstall >>$OUTPUT 2>&1
fi
fi
# copy files
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ]; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
else
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
fi
else
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ]; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ]; then
mkdir $MODULE_MERGED_DIR/rootcopy-install
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
fi
else
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install)" != "" ] >>$OUTPUT 2>&1; then
mkdir $MODULE_MERGED_DIR/rootcopy-install
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-install && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-install/)
fi
fi
fi
# run install script
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/install ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/install $MODULE_MERGED_DIR/install
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install $MODULE_MERGED_DIR/install
chmod +x $MODULE_MERGED_DIR/install
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/cleanup ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/cleanup ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/cleanup $MODULE_MERGED_DIR/cleanup
fi
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/$PACKAGE_VARIANT.list ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/$PACKAGE_VARIANT.list $MODULE_MERGED_DIR/$PACKAGE_VARIANT.list
fi
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot_run $MODULE_MERGED_DIR /install
@ -2186,7 +2148,7 @@ function build_modules() {
fi
fi
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
module_chroot_umount_fs
module_build_cleanup
@ -2209,12 +2171,12 @@ function build_modules() {
fi
# run install2 script
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/install2 ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/install2 $MODULE_MERGED_DIR/install2
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install2 ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/install2 $MODULE_MERGED_DIR/install2
chmod +x $MODULE_MERGED_DIR/install2
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/patches)" != "" ] >>$OUTPUT 2>&1; then
mkdir $MODULE_MERGED_DIR/patches
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/)
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/)
fi
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot_run $MODULE_MERGED_DIR /install2
@ -2224,33 +2186,33 @@ function build_modules() {
fi
# copy files
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ]; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ]; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
else
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/)
fi
fi
else
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ]; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ]; then
mkdir $MODULE_MERGED_DIR/rootcopy-postinstall
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
fi
else
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall)" != "" ] >>$OUTPUT 2>&1; then
mkdir $MODULE_MERGED_DIR/rootcopy-postinstall
(cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
(cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/rootcopy-postinstall && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy-postinstall/)
fi
fi
fi
# run post-install script
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/postinstall ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/postinstall ]; then
cp $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/postinstall $MODULE_MERGED_DIR/postinstall
chmod +x $MODULE_MERGED_DIR/postinstall
if [ $OUTPUT = "/dev/stdout" ] && [ ! -f /dev/stdout ]; then
chroot_run $MODULE_MERGED_DIR /postinstall
@ -2259,8 +2221,17 @@ function build_modules() {
fi
fi
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
set +e
chroot_run $MODULE_MERGED_DIR uncompress_files /etc/alternatives
chroot_run $MODULE_MERGED_DIR uncompress_files /usr/share/man
chroot_run $MODULE_MERGED_DIR remove_broken_links /etc/alternatives
chroot_run $MODULE_MERGED_DIR remove_broken_links /usr/share/man
set -e
fi
# run external actions
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
cp $MODULE_UPPER_DIR/$MODULE.$BEXT $BUILD_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT >>$OUTPUT 2>&1
fi
@ -2268,13 +2239,13 @@ function build_modules() {
module_chroot_umount_fs
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
module_build_cleanup
fi
module_chroot_cleanup
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then
if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE/$MODULE/is_internal_build ]; then
if [ ! -f $BUILD_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT ]; then
if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then
if [ $COMP_TYPE = "zstd" ]; then
@ -2312,7 +2283,7 @@ function build_modules_live() {
MODULES_DIR=$BUILD_DIR/modules
cd $SCRIPT_DIR/linux-live/modules
cd $SCRIPT_DIR/linux-live/modules/$MODULES_TYPE
for MODULE in *; do

5
linux-live/modules/01-firmware/install → linux-live/modules/minios/01-firmware/install

@ -9,21 +9,20 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
echo "firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true" | debconf-set-selections
echo "b43-fwcutter b43-fwcutter/install-unconditional boolean true" | debconf-set-selections
$APT_CMD update >>$OUTPUT 2>&1
# install packages
if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then
if [ $DISTRIBUTION = "focal" ] || [ $DISTRIBUTION = "bionic" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
linux-firmware firmware-b43-installer firmware-ath9k-htc >>$OUTPUT 2>&1
else
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
#linux-firmware >>$OUTPUT 2>&1 #firmware-b43-installer
linux-image-generic
fi
else
if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
fi

0
linux-live/modules/01-firmware/minimal.list → linux-live/modules/minios/01-firmware/minimal.list

0
linux-live/modules/01-firmware/standard.list → linux-live/modules/minios/01-firmware/standard.list

5
linux-live/modules/02-xorg/install → linux-live/modules/minios/02-xorg/install

@ -8,9 +8,10 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
echo "keyboard-configuration keyboard-configuration/variant select English (US)" | debconf-set-selections
$APT_CMD update >>$OUTPUT 2>&1
# install packages
if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
fi
@ -24,4 +25,4 @@ After=systemd-user-sessions.service
[Service]
ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live
EOF
EOF

0
linux-live/modules/02-xorg/minimal.list → linux-live/modules/minios/02-xorg/minimal.list

0
linux-live/modules/02-xorg/postinstall → linux-live/modules/minios/02-xorg/postinstall

0
linux-live/modules/02-xorg/rootcopy-install/etc/skel/.Xresources → linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.Xresources

0
linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackbox-menu → linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackbox-menu

0
linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackboxrc → linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackboxrc

0
linux-live/modules/02-xorg/rootcopy-install/etc/skel/.xinitrc → linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.xinitrc

0
linux-live/modules/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service → linux-live/modules/minios/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service

0
linux-live/modules/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service → linux-live/modules/minios/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service

0
linux-live/modules/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax → linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax

0
linux-live/modules/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm → linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm

0
linux-live/modules/02-xorg/standard.list → linux-live/modules/minios/02-xorg/standard.list

27
linux-live/modules/03-xfce-desktop/install → linux-live/modules/minios/03-xfce-desktop/install

@ -8,12 +8,14 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
GTKUI="2"
$APT_CMD update >>$OUTPUT 2>&1
if [ $DISTRIBUTION = "buster" ] && [ $GTKUI = "3" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
gnupg curl >>$OUTPUT 2>&1
echo "deb http://mxrepo.com/mx/repo/ temp main" >>/etc/apt/sources.list
curl -L https://cyber-x.ru/wp-content/upload/mx19/mx19.gpg | sudo apt-key add -
$APT_CMD update >>$OUTPUT 2>&1
fi
echo "nodm nodm/enabled boolean true" | debconf-set-selections
@ -21,36 +23,27 @@ echo "samba-common samba-common/dhcp boolean false" | debconf-set-selections
# install packages
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 \
$(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
$APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
fi
# install packages
if [ $DISTRIBUTION = "stretch" ]; then
wget -c http://ftp.ru.debian.org/debian/pool/main/e/elementary-xfce/elementary-xfce-icon-theme_0.15.2-1_all.deb
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 &&
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
./elementary-xfce-icon-theme_0.15.2-1_all.deb >>$OUTPUT 2>&1
$APT_CMD install $APT_OPTIONS \
./elementary-xfce-icon-theme_0.15.2-1_all.deb >>$OUTPUT 2>&1
rm -f ./elementary-xfce-icon-theme_0.15.2-1_all.deb >>$OUTPUT 2>&1
else
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD update >>$OUTPUT 2>&1 &&
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
elementary-xfce-icon-theme >>$OUTPUT 2>&1
$APT_CMD install $APT_OPTIONS \
elementary-xfce-icon-theme >>$OUTPUT 2>&1
fi
if [ $DISTRIBUTION = "buster" ] && [ $GTKUI = "3" ]; then
sed -i "s,deb http://mxrepo.com/mx/repo/ temp main,#deb http://mxrepo.com/mx/repo/ temp main,g" /etc/apt/sources.list
$APT_CMD update >>$OUTPUT 2>&1
fi
if [ $DISTRIBUTION = "bullseye" ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
librsvg2-common >>$OUTPUT 2>&1
fi

0
linux-live/modules/03-xfce-desktop/minimal.list → linux-live/modules/minios/03-xfce-desktop/minimal.list

2
linux-live/modules/03-xfce-desktop/postinstall → linux-live/modules/minios/03-xfce-desktop/postinstall

@ -182,5 +182,3 @@ fi
rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1
rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/default/nodm

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc

0
linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xsession

0
linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 77 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme → linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg

Before

Width:  |  Height:  |  Size: 857 B

After

Width:  |  Height:  |  Size: 857 B

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg

Before

Width:  |  Height:  |  Size: 711 B

After

Width:  |  Height:  |  Size: 711 B

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg → linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
linux-live/modules/03-xfce-desktop/standard.list → linux-live/modules/minios/03-xfce-desktop/standard.list

5
linux-live/modules/04-xfce-apps/install → linux-live/modules/minios/04-xfce-apps/install

@ -6,9 +6,10 @@ set -u # treat unset variable as error
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
$APT_CMD update >>$OUTPUT 2>&1
# install packages
if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1
fi
@ -17,11 +18,9 @@ if [ $PACKAGE_VARIANT = "standard" ]; then
if [ $DISTRIBUTION = "stretch" ]; then
echo 'deb http://ftp.debian.org/debian stretch-backports main' | sudo tee --append /etc/apt/sources.list.d/stretch-backports.list >>$OUTPUT 2>&1
$APT_CMD update >>$OUTPUT 2>&1
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install -t stretch-backports $APT_OPTIONS \
remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1
else
#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \
$APT_CMD install $APT_OPTIONS \
remmina remmina-plugin-rdp remmina-plugin-vnc >>$OUTPUT 2>&1

0
linux-live/modules/04-xfce-apps/minimal.list → linux-live/modules/minios/04-xfce-apps/minimal.list

4
linux-live/modules/04-xfce-apps/postinstall → linux-live/modules/minios/04-xfce-apps/postinstall

@ -8,3 +8,7 @@ rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1
rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1
rm -Rf /usr/share/icons/Adwaita/256x256 >>$OUTPUT 2>&1
rm -Rf /usr/share/icons/Adwaita/512x512 >>$OUTPUT 2>&1
if [ $PACKAGE_VARIANT = "standard" ]; then
update-alternatives --set x-terminal-emulator /usr/bin/xfce4-terminal >>$OUTPUT 2>&1
fi

0
linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop → linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop

0
linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon → linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon

0
linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm → linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm

0
linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc → linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png → linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save