diff --git a/linux-live/basesystem/01-core/minimal.list b/linux-live/basesystem/01-core/minimal.list index 1ac4b36..044f098 100644 --- a/linux-live/basesystem/01-core/minimal.list +++ b/linux-live/basesystem/01-core/minimal.list @@ -13,7 +13,6 @@ xz-utils ca-certificates openssl acpid -acpi-support-base powermgmt-base bzip2 gpart diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-autoinstall b/linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-autoinstall new file mode 100644 index 0000000..433716c --- /dev/null +++ b/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 diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-install b/linux-live/basesystem/01-core/rootcopy-install/etc/bash_completion.d/minios-install new file mode 100644 index 0000000..83cf917 --- /dev/null +++ b/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 diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/hosts b/linux-live/basesystem/01-core/rootcopy-install/etc/hosts deleted file mode 100644 index 892092a..0000000 --- a/linux-live/basesystem/01-core/rootcopy-install/etc/hosts +++ /dev/null @@ -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 diff --git a/linux-live/basesystem/01-core/rootcopy-install/etc/issue b/linux-live/basesystem/01-core/rootcopy-install/etc/issue deleted file mode 100644 index b67e63b..0000000 --- a/linux-live/basesystem/01-core/rootcopy-install/etc/issue +++ /dev/null @@ -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 - - - - diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso index c7d5859..86fd9ac 100755 --- a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/genminiosiso +++ b/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 diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-autoinstall b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-autoinstall new file mode 100755 index 0000000..e559582 --- /dev/null +++ b/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}" diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-install b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-install new file mode 100755 index 0000000..88a4150 --- /dev/null +++ b/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}" diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-modules-build b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-modules-build new file mode 100755 index 0000000..296bd09 --- /dev/null +++ b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-modules-build @@ -0,0 +1,2 @@ +#!/bin/bash +minios-autoinstall build_modules \ No newline at end of file diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-system-repack b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-system-repack new file mode 100755 index 0000000..7b7c226 --- /dev/null +++ b/linux-live/basesystem/01-core/rootcopy-install/usr/bin/minios-system-repack @@ -0,0 +1,2 @@ +#!/bin/bash +minios-autoinstall repack_system \ No newline at end of file diff --git a/linux-live/basesystem/01-core/rootcopy-install/usr/lib/minioslib b/linux-live/basesystem/01-core/rootcopy-install/usr/lib/minioslib new file mode 100644 index 0000000..27831a8 --- /dev/null +++ b/linux-live/basesystem/01-core/rootcopy-install/usr/lib/minioslib @@ -0,0 +1,871 @@ +#!/bin/bash + +# Functions library :: for install scripts +# Author: crims0n. +# + +# ================================================================= +# ================================================================= +# ========================= 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 </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 <$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 < 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 <>$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 +} diff --git a/linux-live/buildconfig b/linux-live/buildconfig index a1ec538..892df84 100644 --- a/linux-live/buildconfig +++ b/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="" diff --git a/linux-live/config b/linux-live/config index 28eb0e9..70ee3f9 100644 --- a/linux-live/config +++ b/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 diff --git a/linux-live/initramfs/initramfs_create b/linux-live/initramfs/initramfs_create index 8e509ce..e526399 100755 --- a/linux-live/initramfs/initramfs_create +++ b/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 diff --git a/linux-live/initramfs/minios-modules.tar.xz b/linux-live/initramfs/minios-modules.tar.xz deleted file mode 100644 index 8ae87be..0000000 Binary files a/linux-live/initramfs/minios-modules.tar.xz and /dev/null differ diff --git a/linux-live/initramfs/static/minios-configure b/linux-live/initramfs/static/minios-configure index 9207f50..ab9333e 100755 --- a/linux-live/initramfs/static/minios-configure +++ b/linux-live/initramfs/static/minios-configure @@ -4,15 +4,45 @@ # Author: crims0n. # -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" diff --git a/linux-live/livekitlib b/linux-live/livekitlib index 70502d6..94b77a1 100644 --- a/linux-live/livekitlib +++ b/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 diff --git a/linux-live/minioslib b/linux-live/minioslib index 4384697..edcba49 100644 --- a/linux-live/minioslib +++ b/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 < 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 </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 </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 </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 </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 </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 diff --git a/linux-live/modules/01-firmware/install b/linux-live/modules/minios/01-firmware/install similarity index 85% rename from linux-live/modules/01-firmware/install rename to linux-live/modules/minios/01-firmware/install index fe8b92b..0ea3419 100644 --- a/linux-live/modules/01-firmware/install +++ b/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 diff --git a/linux-live/modules/01-firmware/minimal.list b/linux-live/modules/minios/01-firmware/minimal.list similarity index 100% rename from linux-live/modules/01-firmware/minimal.list rename to linux-live/modules/minios/01-firmware/minimal.list diff --git a/linux-live/modules/01-firmware/standard.list b/linux-live/modules/minios/01-firmware/standard.list similarity index 100% rename from linux-live/modules/01-firmware/standard.list rename to linux-live/modules/minios/01-firmware/standard.list diff --git a/linux-live/modules/02-xorg/install b/linux-live/modules/minios/02-xorg/install similarity index 93% rename from linux-live/modules/02-xorg/install rename to linux-live/modules/minios/02-xorg/install index cbe45b9..dde6edf 100644 --- a/linux-live/modules/02-xorg/install +++ b/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 \ No newline at end of file +EOF diff --git a/linux-live/modules/02-xorg/minimal.list b/linux-live/modules/minios/02-xorg/minimal.list similarity index 100% rename from linux-live/modules/02-xorg/minimal.list rename to linux-live/modules/minios/02-xorg/minimal.list diff --git a/linux-live/modules/02-xorg/postinstall b/linux-live/modules/minios/02-xorg/postinstall similarity index 100% rename from linux-live/modules/02-xorg/postinstall rename to linux-live/modules/minios/02-xorg/postinstall diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.Xresources b/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.Xresources similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.Xresources rename to linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.Xresources diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackbox-menu b/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackbox-menu similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackbox-menu rename to linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackbox-menu diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackboxrc b/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackboxrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.blackboxrc rename to linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.blackboxrc diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.xinitrc similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/etc/skel/.xinitrc rename to linux-live/modules/minios/02-xorg/rootcopy-install/etc/skel/.xinitrc diff --git a/linux-live/modules/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service b/linux-live/modules/minios/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service rename to linux-live/modules/minios/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service diff --git a/linux-live/modules/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service b/linux-live/modules/minios/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service rename to linux-live/modules/minios/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service diff --git a/linux-live/modules/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax b/linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax rename to linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax diff --git a/linux-live/modules/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm similarity index 100% rename from linux-live/modules/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm rename to linux-live/modules/minios/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm diff --git a/linux-live/modules/02-xorg/standard.list b/linux-live/modules/minios/02-xorg/standard.list similarity index 100% rename from linux-live/modules/02-xorg/standard.list rename to linux-live/modules/minios/02-xorg/standard.list diff --git a/linux-live/modules/03-xfce-desktop/install b/linux-live/modules/minios/03-xfce-desktop/install similarity index 90% rename from linux-live/modules/03-xfce-desktop/install rename to linux-live/modules/minios/03-xfce-desktop/install index e1a8694..70e2d28 100644 --- a/linux-live/modules/03-xfce-desktop/install +++ b/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 diff --git a/linux-live/modules/03-xfce-desktop/minimal.list b/linux-live/modules/minios/03-xfce-desktop/minimal.list similarity index 100% rename from linux-live/modules/03-xfce-desktop/minimal.list rename to linux-live/modules/minios/03-xfce-desktop/minimal.list diff --git a/linux-live/modules/03-xfce-desktop/postinstall b/linux-live/modules/minios/03-xfce-desktop/postinstall similarity index 98% rename from linux-live/modules/03-xfce-desktop/postinstall rename to linux-live/modules/minios/03-xfce-desktop/postinstall index 45b14e0..97d26cf 100644 --- a/linux-live/modules/03-xfce-desktop/postinstall +++ b/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 diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/default/nodm similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/default/nodm rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/default/nodm diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/user-dirs.dirs diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/battery-10.rc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-3/TerminalEmulator.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-4/FileManager.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/panel/launcher-5/WebBrowser.desktop diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xinitrc diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xsession similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/etc/skel/.xsession rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/etc/skel/.xsession diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/backgrounds/MiniOS-wallpaper.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/pixmaps/MiniOS-white.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/background.png diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/panel.png diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme b/linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-install/usr/share/slim/themes/minios/slim.theme diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-ac-adapter.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-charging.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution-symbolic.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-caution.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty-charging.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-empty.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charged.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full-charging.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-full.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good-charging.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-good.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-charging.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low-symbolic.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-low.svg diff --git a/linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg b/linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg similarity index 100% rename from linux-live/modules/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg rename to linux-live/modules/minios/03-xfce-desktop/rootcopy-postinstall/usr/share/icons/hicolor/scalable/apps/xfce4-battery-missing.svg diff --git a/linux-live/modules/03-xfce-desktop/standard.list b/linux-live/modules/minios/03-xfce-desktop/standard.list similarity index 100% rename from linux-live/modules/03-xfce-desktop/standard.list rename to linux-live/modules/minios/03-xfce-desktop/standard.list diff --git a/linux-live/modules/04-xfce-apps/install b/linux-live/modules/minios/04-xfce-apps/install similarity index 88% rename from linux-live/modules/04-xfce-apps/install rename to linux-live/modules/minios/04-xfce-apps/install index 26b6336..d5c1f59 100644 --- a/linux-live/modules/04-xfce-apps/install +++ b/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 diff --git a/linux-live/modules/04-xfce-apps/minimal.list b/linux-live/modules/minios/04-xfce-apps/minimal.list similarity index 100% rename from linux-live/modules/04-xfce-apps/minimal.list rename to linux-live/modules/minios/04-xfce-apps/minimal.list diff --git a/linux-live/modules/04-xfce-apps/postinstall b/linux-live/modules/minios/04-xfce-apps/postinstall similarity index 73% rename from linux-live/modules/04-xfce-apps/postinstall rename to linux-live/modules/minios/04-xfce-apps/postinstall index 2ef8054..3e8d13e 100644 --- a/linux-live/modules/04-xfce-apps/postinstall +++ b/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 diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/autostart/volumeicon.desktop diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/volumeicon/volumeicon diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/accels.scm diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/etc/skel/.config/xfce4/terminal/terminalrc diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png diff --git a/linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png b/linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png similarity index 100% rename from linux-live/modules/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png rename to linux-live/modules/minios/04-xfce-apps/rootcopy-install/usr/share/pixmaps/qalculate.png diff --git a/linux-live/modules/04-xfce-apps/standard.list b/linux-live/modules/minios/04-xfce-apps/standard.list similarity index 100% rename from linux-live/modules/04-xfce-apps/standard.list rename to linux-live/modules/minios/04-xfce-apps/standard.list diff --git a/linux-live/modules/05-firefox/install b/linux-live/modules/minios/05-firefox/install similarity index 95% rename from linux-live/modules/05-firefox/install rename to linux-live/modules/minios/05-firefox/install index f8d7784..fc13e57 100644 --- a/linux-live/modules/05-firefox/install +++ b/linux-live/modules/minios/05-firefox/install @@ -6,6 +6,8 @@ set -u # treat unset variable as error SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" +$APT_CMD update >>$OUTPUT 2>&1 + # install packages if [ $DISTRIBUTION_TYPE = "ubuntu" ]; then $APT_CMD install $APT_OPTIONS \ diff --git a/linux-live/modules/05-firefox/postinstall b/linux-live/modules/minios/05-firefox/postinstall similarity index 100% rename from linux-live/modules/05-firefox/postinstall rename to linux-live/modules/minios/05-firefox/postinstall diff --git a/linux-live/modules/slax/01-firmware/install b/linux-live/modules/slax/01-firmware/install new file mode 100644 index 0000000..0ea3419 --- /dev/null +++ b/linux-live/modules/slax/01-firmware/install @@ -0,0 +1,29 @@ +#!/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")")" + +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 + $APT_CMD install $APT_OPTIONS \ + linux-firmware firmware-b43-installer firmware-ath9k-htc >>$OUTPUT 2>&1 + else + $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 + $APT_CMD install $APT_OPTIONS \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 + fi +fi diff --git a/linux-live/modules/slax/01-firmware/minimal.list b/linux-live/modules/slax/01-firmware/minimal.list new file mode 100644 index 0000000..b8cb39c --- /dev/null +++ b/linux-live/modules/slax/01-firmware/minimal.list @@ -0,0 +1,13 @@ +firmware-linux-free +firmware-linux-nonfree +firmware-atheros +firmware-iwlwifi +firmware-zd1211 +firmware-realtek +firmware-bnx2 +firmware-brcm80211 +firmware-cavium +firmware-ipw2x00 +firmware-libertas +firmware-ti-connectivity +firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/slax/01-firmware/standard.list b/linux-live/modules/slax/01-firmware/standard.list new file mode 100644 index 0000000..b8cb39c --- /dev/null +++ b/linux-live/modules/slax/01-firmware/standard.list @@ -0,0 +1,13 @@ +firmware-linux-free +firmware-linux-nonfree +firmware-atheros +firmware-iwlwifi +firmware-zd1211 +firmware-realtek +firmware-bnx2 +firmware-brcm80211 +firmware-cavium +firmware-ipw2x00 +firmware-libertas +firmware-ti-connectivity +firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/install b/linux-live/modules/slax/02-xorg/install new file mode 100644 index 0000000..dde6edf --- /dev/null +++ b/linux-live/modules/slax/02-xorg/install @@ -0,0 +1,28 @@ +#!/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")")" + +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 + $APT_CMD install $APT_OPTIONS \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 +fi + +cat </usr/lib/systemd/system/xorg.service +[Unit] +Description=X-Window +ConditionKernelCommandLine=!text +After=systemd-user-sessions.service + +[Service] +ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live + +EOF diff --git a/linux-live/modules/slax/02-xorg/minimal.list b/linux-live/modules/slax/02-xorg/minimal.list new file mode 100644 index 0000000..5b401b4 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/minimal.list @@ -0,0 +1,14 @@ +xserver-xorg +xserver-xorg-video-all +xserver-xorg-video-intel +xinit +xterm +blackbox +libxcursor1 +breeze-cursor-theme +x11-utils +wmctrl +xdotool +libdrm-intel1 +libgl1-mesa-dri +libglu1-mesa \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/postinstall b/linux-live/modules/slax/02-xorg/postinstall new file mode 100644 index 0000000..5358a85 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/postinstall @@ -0,0 +1,24 @@ +#!/bin/bash + +# Set setuid bit on xorg binary, so it can be started by guest user +chmod u+s /usr/lib/xorg/Xorg + +# use only white cursors. There were some troubles if the other cursors +# was left behind, installing gtk apps reverted the cursor from white to gray, +# so we're going to nuke it to leave only Snow cursors active. +rm -Rf /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1 +mv /usr/share/icons/Breeze_Snow /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1 + +(cd /rootcopy-install && cp --parents -afr * /) + +# install x11 server utils, apt-get would add cpp dependency, bullshit! +cd /tmp +apt-get download x11-xserver-utils >>$OUTPUT 2>&1 +ls -la +dpkg -x x11-xserver-utils*.deb /tmp/x11utils >>$OUTPUT 2>&1 +cd /tmp/x11utils +cp -aR * / >>$OUTPUT 2>&1 + +rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 + +update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.Xresources b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.Xresources new file mode 100644 index 0000000..a6d2cc5 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.Xresources @@ -0,0 +1,32 @@ +! this are Xresources to make xterm look good +! put into ~/.Xresources +! after changing contents, run xrdb -merge .Xresources +! gentoo has a bug so that it doesnt read it when X starts, so add above +! command to /etc/xfce4/xinitrc (top) and be happy. + +XTerm*termName: xterm-256color +XTerm*foreground: white +XTerm*background: rgb:22/22/22 +XTerm*cursorColor: rgb:00/ff/00 +XTerm*borderColor: black +XTerm*scrollColor: black +XTerm*visualBell: true +XTerm*saveLines: 1000 +XTerm*allowSendEvents: true +XTerm*sessionMgt: false +XTerm*scrollBar: true +XTerm*rightScrollBar: true +XTerm*eightBitInput: false +XTerm*faceName: DejaVu Sans Mono: size=9 +XTerm*boldFont: DejaVu Sans Mono Bold: size=9 +XTerm*renderFont: true +XTerm*activeIcon: true +XTerm*iconPixmap: /usr/share/icons/locolor/16x16/apps/xterm.xbm +XTerm*fullscreen: never +XTerm*selectToClipboard: true +Xft.dpi: 96 +Xft.antialias: true +Xft.hinting: true +Xft.hintstyle: hintlight +Xft.lcdfilter: lcddefault +Xft.rgba: rgb \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackbox-menu b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackbox-menu new file mode 100644 index 0000000..093ae2a --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackbox-menu @@ -0,0 +1,4 @@ +[begin] ( Menu ) + [exec] (Terminal) { xterm -ls -title Terminal } + [exit] (Exit) +[end] diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackboxrc b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackboxrc new file mode 100644 index 0000000..a39f965 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.blackboxrc @@ -0,0 +1,6 @@ +session.screen0.toolbar.widthPercent: 100 +session.screen0.strftimeFormat: %H:%M +session.edgeSnapThreshold: 10 +session.menuFile: /root/.blackbox-menu +session.styleFile: /usr/share/blackbox/styles/Slax +session.changeWorkspaceWithMouseWheel: False diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.xinitrc new file mode 100644 index 0000000..5118998 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/skel/.xinitrc @@ -0,0 +1,2 @@ +xrdb -merge .Xresources +blackbox \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service new file mode 120000 index 0000000..d31ece8 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service @@ -0,0 +1 @@ +/lib/systemd/system/xorg.service \ No newline at end of file diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service new file mode 100644 index 0000000..3928ee8 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service @@ -0,0 +1,7 @@ +[Unit] +Description=X-Window +ConditionKernelCommandLine=!text +After=systemd-user-sessions.service + +[Service] +ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax new file mode 100644 index 0000000..aefe9ef --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax @@ -0,0 +1,79 @@ +*.appearance: flat solid + +*button.pressed.appearance: sunken solid +*button.pressed.backgroundColor: rgb:69/c1/f1 +*button.appearance: parentrelative + +*.focus.backgroundColor: rgb:69/c1/f1 +*.unfocus.backgroundColor: rgb:28/28/28 + +*font: Bitstream Vera Sans-9 + +menu.title.appearance: flat solid +menu.title.backgroundColor: rgb:69/c1/f1 +menu.title.textColor: rgb:28/28/28 +menu.title.alignment: center +menu.title.marginWidth: 6 + +menu.frame.appearance: flat gradient border +menu.frame.textColor: rgb:28/28/28 +menu.frame.foregroundColor: grey40 +menu.frame.borderColor: rgb:69/c1/f1 +menu.frame.borderWidth: 6 +menu.frame.disabledColor: darkgrey +menu.frame.alignment: left +menu.frame.marginWidth: 2 + +menu.active.appearance: flat solid border +menu.active.backgroundColor: rgb:69/c1/f1 +menu.active.borderWidth: 4 +menu.active.borderColor: rgb:69/c1/f1 +menu.active.textColor: rgb:38/38/38 + +rootCommand: bsetroot -solid rgb:77/90/aa + +slit.appearance: raised solid +slit.backgroundColor: rgb:77/90/aa +slit.marginWidth: 3 + +toolbar.appearance: flat gradient border +toolbar.alignment: center +toolbar*textColor: rgb:28/28/28 +toolbar.label.appearance: parentrelative +toolbar.clock.appearance: parentrelative +toolbar.windowLabel.appearance: parentrelative + +window.title.focus.appearance: flat solid +window.title.focus.backgroundColor: rgb:69/c1/f1 +window.title.unfocus.appearance: flat solid +window.title.unfocus.backgroundColor: rgb:d6/d6/d6 +window.title.marginWidth: 5 + +window.label.focus.appearance: parentrelative +window.label.focus.textColor: rgb:28/28/28 +window.label.unfocus.appearance: parentrelative +window.label.unfocus.textColor: rgb:28/28/28 +window.label.marginWidth: 1 + +window.button.focus.appearance: parentrelative +window.button.focus.foregroundColor: white + +window.button.unfocus.appearance: parentrelative +window.button.unfocus.foregroundColor: darkgrey + +window.handle.focus.appearance: flat solid +window.handle.focus.backgroundColor: rgb:69/c1/f1 +window.handle.unfocus.appearance: flat solid +window.handle.unfocus.backgroundColor: rgb:d6/d6/d6 + +window.grip.focus.appearance: flat solid +window.grip.focus.backgroundColor: rgb:69/c1/f1 +window.grip.unfocus.appearance: flat solid +window.grip.unfocus.backgroundColor: rgb:d6/d6/d6 + +window*alignment: center + +window.handleHeight: 7 +window.frame.borderWidth: 7 +window.frame.focus.borderColor: rgb:69/c1/f1 +window.frame.unfocus.borderColor: rgb:d6/d6/d6 diff --git a/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm new file mode 100644 index 0000000..0cd329e --- /dev/null +++ b/linux-live/modules/slax/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm @@ -0,0 +1,6 @@ +#define command2_width 16 +#define command2_height 16 +static unsigned char command2_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff, + 0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1, + 0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/linux-live/modules/slax/02-xorg/standard.list b/linux-live/modules/slax/02-xorg/standard.list new file mode 100644 index 0000000..dcb6662 --- /dev/null +++ b/linux-live/modules/slax/02-xorg/standard.list @@ -0,0 +1,15 @@ +xserver-xorg +xserver-xorg-video-all +xserver-xorg-video-intel +xinit +xterm +blackbox +libxcursor1 +breeze-cursor-theme +x11-utils +wmctrl +xdotool +libdrm-intel1 +libgl1-mesa-dri +libglu1-mesa +open-vm-tools-desktop \ No newline at end of file diff --git a/linux-live/modules/slax/03-desktop/install b/linux-live/modules/slax/03-desktop/install new file mode 100644 index 0000000..5f2c856 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/install @@ -0,0 +1,20 @@ +#!/bin/bash + +CWD=$(dirname $(readlink -f $0)) + +NAME=fluxbox +VERSION=1.3.5 + +# first install stock version + +apt-get update >>$OUTPUT 2>&1 +apt-get install --no-install-recommends --yes \ + $NAME \ + feh \ + compton \ + volumeicon-alsa \ + murrine-themes \ + libnotify4 \ + scrot >>$OUTPUT 2>&1 + +(cd /rootcopy-install && cp --parents -afr * /) diff --git a/linux-live/modules/slax/03-desktop/install2 b/linux-live/modules/slax/03-desktop/install2 new file mode 100644 index 0000000..eb9395d --- /dev/null +++ b/linux-live/modules/slax/03-desktop/install2 @@ -0,0 +1,85 @@ +#!/bin/bash + +CWD=$(dirname $(readlink -f $0)) + +NAME=fluxbox +VERSION=1.3.5 + +cd / + +REBUILD=/tmp/$NAME-rebuild-$$ + +apt-get update >>$OUTPUT 2>&1 +apt-get --yes build-dep $NAME >>$OUTPUT 2>&1 + +mkdir -p $REBUILD >>$OUTPUT 2>&1 +cd $REBUILD + +apt-get source $NAME >>$OUTPUT 2>&1 + +cd $NAME-$VERSION + +cat $CWD/patches/fluxbox-slax.diff > debian/patches/fluxbox-slax.diff +echo fluxbox-slax.diff >> debian/patches/series + +dpkg-buildpackage -us -uc >>$OUTPUT 2>&1 + +rm -Rf debian/$NAME/DEBIAN >>$OUTPUT 2>&1 +rm -Rf debian/$NAME/usr/share/doc >>$OUTPUT 2>&1 +rm -Rf debian/$NAME/usr/share/images >>$OUTPUT 2>&1 + +cp debian/$NAME/usr/bin/fluxbox /squashfs-root/usr/bin >>$OUTPUT 2>&1 + + +# add xlunch from sources +wget -O /tmp/xlunch.tar.gz https://github.com/Tomas-M/xlunch/archive/v4.5.3.tar.gz >>$OUTPUT 2>&1 +cd /tmp +tar -xf xlunch.tar.gz >>$OUTPUT 2>&1 +cd xlunch-4.5.3 +make >>$OUTPUT 2>&1 +cp xlunch /squashfs-root/usr/bin >>$OUTPUT 2>&1 +cp extra/gentriesquick /squashfs-root/usr/bin/xlunch_genquick >>$OUTPUT 2>&1 +mkdir -p /squashfs-root/usr/share/icons/hicolor/48x48/apps/ >>$OUTPUT 2>&1 +cp extra/ghost.png /squashfs-root/usr/share/icons/hicolor/48x48/apps/xlunch_ghost.png + +# add tray icon launcher +wget -O /tmp/systrayiconlauncher.tar.gz https://github.com/Tomas-M/SystrayIconLauncher/archive/master.tar.gz >>$OUTPUT 2>&1 +cd /tmp +tar -xf systrayiconlauncher.tar.gz >>$OUTPUT 2>&1 +cd SystrayIconLauncher-master +apt-get install --yes libgtk2.0-dev >>$OUTPUT 2>&1 +make >>$OUTPUT 2>&1 +cp systrayicon /squashfs-root/usr/bin >>$OUTPUT 2>&1 + + +# add gtkdialog +wget -O /tmp/gtkdialog.tar.gz https://github.com/Tomas-M/GTKdialog/archive/master.tar.gz >>$OUTPUT 2>&1 +cd /tmp +tar -xf gtkdialog.tar.gz >>$OUTPUT 2>&1 +cd GTKdialog-master +make >>$OUTPUT 2>&1 +cp gtkdialog /squashfs-root/usr/bin >>$OUTPUT 2>&1 + + +# battery icon app +cd /tmp +wget https://github.com/valr/cbatticon/archive/1.6.7.tar.gz >>$OUTPUT 2>&1 +tar -xf 1.6.7.tar.gz >>$OUTPUT 2>&1 +cd cbatticon-1.6.7 +cp -R /usr/include/glib-2.0/* /usr/include >>$OUTPUT 2>&1 +cp -R /usr/include/gtk-2.0/* /usr/include >>$OUTPUT 2>&1 +apt install --yes libnotify-dev >>$OUTPUT 2>&1 +sed -i "s/WITH_GTK3 = 1/WITH_GTK3 = 0/" Makefile +CFLAGS="-O2 \ +-I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ \ +-I/usr/lib/x86_64-linux-gnu/gtk-2.0/include/ \ +-I/usr/include/gdk-pixbuf-2.0/ \ +-I/usr/include/atk-1.0/ \ +-I/usr/include/cairo \ +-I/usr/include/pango-1.0 \ +-I/usr/include/glib-2.0 \ +-I/usr/include/gtk-2.0" \ +make >>$OUTPUT 2>&1 +cp cbatticon /squashfs-root/usr/bin >>$OUTPUT 2>&1 + +dir2sb /squashfs-root /03-desktop.sb >>$OUTPUT 2>&1 \ No newline at end of file diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/chromium/First Run b/linux-live/modules/slax/03-desktop/is_internal_build similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/chromium/First Run rename to linux-live/modules/slax/03-desktop/is_internal_build diff --git a/linux-live/modules/slax/03-desktop/patches/fluxbox-slax.diff b/linux-live/modules/slax/03-desktop/patches/fluxbox-slax.diff new file mode 100644 index 0000000..e76174e --- /dev/null +++ b/linux-live/modules/slax/03-desktop/patches/fluxbox-slax.diff @@ -0,0 +1,97 @@ +--- a/src/Window.cc 2013-02-13 05:04:05.000000000 -0500 ++++ b/src/Window.cc 2017-11-05 17:31:37.516503305 -0500 +@@ -2745,6 +2745,14 @@ + m_button_grab_x = x - frame().x() - frame().window().borderWidth(); + m_button_grab_y = y - frame().y() - frame().window().borderWidth(); + ++ // If mouse clicked on the border, start window resize instead of move ++ if (m_button_grab_x <= 0 || m_button_grab_x >= (int)frame().window().width() ++ || m_button_grab_y >= (int)frame().window().height() ) { ++ ReferenceCorner dir = getResizeDirection(m_button_grab_x,m_button_grab_y,EDGEORCORNERRESIZE,frame().window().borderWidth(),frame().window().borderWidth()); ++ startResizing(m_button_grab_x, m_button_grab_y, dir); ++ return; ++ } ++ + moving = true; + + Fluxbox *fluxbox = Fluxbox::instance(); +@@ -2752,7 +2760,7 @@ + // freely map and unmap the window we're moving. + grabPointer(screen().rootWindow().window(), False, ButtonMotionMask | + ButtonReleaseMask, GrabModeAsync, GrabModeAsync, +- screen().rootWindow().window(), frame().theme()->moveCursor(), CurrentTime); ++ screen().rootWindow().window(), None, CurrentTime); + + if (menu().isVisible()) + menu().hide(); +--- a/src/FbTk/FbDrawable.hh ++++ b/src/FbTk/FbDrawable.hh +@@ -52,7 +52,8 @@ public: + LEFT, + RIGHT, + UP, +- DOWN ++ DOWN, ++ MENU + }; + + // x, y, width and height define a space within which we're drawing a triangle +--- a/src/ToolFactory.cc 2013-02-13 05:04:05.000000000 -0500 ++++ b/src/ToolFactory.cc 2017-10-31 12:11:20.000000000 -0400 +@@ -101,6 +101,8 @@ + cmd_str += " (workspace=[current])"; + } + ++ if (name.find("menu") != std::string::npos) cmd_str = "Exec fbappselect"; ++ + FbTk::RefCount > cmd(FbTk::CommandParser::instance().parse(cmd_str)); + if (cmd == 0) // we need a command + return 0; +@@ -110,6 +112,9 @@ + if (name.find("prev") != std::string::npos) + arrow_type = FbTk::FbDrawable::LEFT; + ++ if (name.find("menu") != std::string::npos) ++ arrow_type = FbTk::FbDrawable::MENU; ++ + ArrowButton *win = new ArrowButton(arrow_type, parent, + 0, 0, + button_size, button_size); +--- a/src/FbTk/FbDrawable.cc 2017-10-19 06:06:08.000000000 -0400 ++++ a/src/FbTk/FbDrawable.cc 2017-10-19 06:06:57.013131070 -0400 +@@ -96,7 +96,7 @@ + if (drawable() == 0 || gc == 0 || width == 0 || height == 0) + return; + +- XPoint pts[3]; ++ XPoint pts[4]; + + if (scale < 100) scale = 100; // not bigger than the space allowed + else if (scale > 10000) scale = 10000; // not too small... +@@ -115,6 +115,26 @@ + } + + switch (type) { ++ case FbTk::FbDrawable::MENU: ++ { ++ int s=7; int m=2; int d=2; int sh=-1; //size margin distance ++ pts[0].x=m+sh; pts[0].y=m+sh; pts[1].x=m+s+sh; pts[1].y=m+sh; ++ pts[2].x=m+s+sh; pts[2].y=m+s+sh; pts[3].x=m+sh; pts[3].y=m+s+sh; ++ fillPolygon(gc, pts, 4, Convex, CoordModeOrigin); ++ ++ pts[0].x=m+s+d+sh; pts[0].y=m+sh; pts[1].x=m+s+d+s+sh; pts[1].y=m+sh; ++ pts[2].x=m+s+d+s+sh; pts[2].y=m+s+sh; pts[3].x=m+s+d+sh; pts[3].y=m+s+sh; ++ fillPolygon(gc, pts, 4, Convex, CoordModeOrigin); ++ ++ pts[0].x=m+sh; pts[0].y=m+s+d+sh; pts[1].x=m+s+sh; pts[1].y=m+s+d+sh; ++ pts[2].x=m+s+sh; pts[2].y=m+s+d+s+sh; pts[3].x=m+sh; pts[3].y=m+s+d+s+sh; ++ fillPolygon(gc, pts, 4, Convex, CoordModeOrigin); ++ ++ pts[0].x=m+s+d+sh; pts[0].y=m+s+d+sh; pts[1].x=m+s+d+s+sh; pts[1].y=m+s+d+sh; ++ pts[2].x=m+s+d+s+sh; pts[2].y=m+s+d+s+sh; pts[3].x=m+s+d+sh; pts[3].y=m+s+d+s+sh; ++ fillPolygon(gc, pts, 4, Convex, CoordModeOrigin); ++ return; ++ } + case FbTk::FbDrawable::LEFT: + // start at the tip + pts[0].x = (width / 2) - (ax / 2); pts[0].y = height / 2; diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/chromium/Default/Preferences b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/chromium/Default/Preferences similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/chromium/Default/Preferences rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/chromium/Default/Preferences diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/fbrun_history b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/chromium/First Run similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/fbrun_history rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/chromium/First Run diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/volumeicon/volumeicon b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/volumeicon/volumeicon similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/volumeicon/volumeicon rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/volumeicon/volumeicon diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.config/xarchiver/xarchiverrc diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/apps b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/apps similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/apps rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/apps diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/fbrun_history b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/fbrun_history similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/fbrun_history rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/fbrun_history diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/init b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/init similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/init rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/init diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/kblayout b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/kblayout similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/kblayout rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/kblayout diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/keys b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/keys similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/keys rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/keys diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/lastwallpaper b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/lastwallpaper similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/lastwallpaper rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/lastwallpaper diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/menu b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/menu similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/menu rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/menu diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/overlay b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/overlay similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/overlay rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/overlay diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/slitlist b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/slitlist similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/slitlist rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/slitlist diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/startup b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/startup similarity index 82% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/startup rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/startup index b725d66..1fefdb5 100644 --- a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/startup +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/startup @@ -20,7 +20,7 @@ gtk-bookmarks-update # because some apps like chromium must be running under guest for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do if ! mountpoint /root/$dir; then - mount --bind /home/live/$dir /root/$dir + mount --bind /home/guest/$dir /root/$dir fi done @@ -36,13 +36,16 @@ xset -dpms volumeicon & # preload compton and fluxbox to cache -(compton --help; fluxbox --help) >/dev/null 2>&1 +( + compton --help + fluxbox --help +) >/dev/null 2>&1 # Keep black screen for first second while the sound plays. # This slows startup a little, but it is nicer effect. SND=/usr/share/sounds/startup.wav if [ -r $SND ]; then - cat $SND > /dev/null # preload + cat $SND >/dev/null # preload aplay $SND & sleep 1 & SOUNDPID=$! @@ -51,9 +54,9 @@ fi # Debian-local change: # - fbautostart has been added with a quick hack to check to see if it # exists. If it does, we'll start it up by default. -which fbautostart > /dev/null +which fbautostart >/dev/null if [ $? -eq 0 ]; then - fbautostart + fbautostart fi # We need to postpone compton after fluxbox starts, else it won't set @@ -73,9 +76,16 @@ rm -f $SIGNAL2 2>/dev/null done touch $SIGNAL2 - (sleep 1; (echo; sleep 10; echo :quit) | xlunch --window --xposition 20 --yposition -30 \ - --width 195 --height 53 --noscroll --noprompt --backgroundcolor ffffff00 \ - --multiple --desktop --button "/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png;;0,0;fbappselect" & ) & + ( + sleep 1 + ( + echo + sleep 10 + echo :quit + ) | xlunch --window --xposition 20 --yposition -30 \ + --width 195 --height 53 --noscroll --noprompt --backgroundcolor ffffff00 \ + --multiple --desktop --button "/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png;;0,0;fbappselect" & + ) & exec compton --sw-opti -e 0.9 --shadow-exclude 'class_g="xlunch-windowed"' --fade-exclude 'role*="fluxbox-toolbar"' --opacity-rule '70:role*="fluxbox-toolbar"' --no-fading-destroyed-argb -D 5 -c -f -l -2 -t -2 -r 0 -o 1 -z --shadow-exclude 'bounding_shaped' ) & @@ -98,8 +108,8 @@ rm -f $SIGNAL2 2>/dev/null ) & # gen screen resolutions to fluxbox menu -xrandr 2>/dev/null | fgrep x | fgrep . | sort -n | tr -s " " | cut -d " " -f 2 \ -| sed -r "s:(.*):[exec] (\\1) {fbscreensize \\1}:" > ~/.fluxbox/menu_resolution +xrandr 2>/dev/null | fgrep x | fgrep . | sort -n | tr -s " " | cut -d " " -f 2 | + sed -r "s:(.*):[exec] (\\1) {fbscreensize \\1}:" >~/.fluxbox/menu_resolution # In all cases, wait for the sound sleeper. # If startup took longer (sound completed already), no extra wait diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/windowmenu b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/windowmenu similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/windowmenu rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.fluxbox/windowmenu diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.gtkrc-2.0 b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.gtkrc-2.0 similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.gtkrc-2.0 rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.gtkrc-2.0 diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.xinitrc b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.xinitrc similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.xinitrc rename to linux-live/modules/slax/03-desktop/rootcopy-install/etc/skel/.xinitrc diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/etc/xlunch/entries.dsv b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/xlunch/entries.dsv new file mode 100644 index 0000000..c5bce20 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/xlunch/entries.dsv @@ -0,0 +1,4 @@ +Terminal;/usr/share/icons/hicolor/128x128/apps/terminal.png;xterm -title Terminal +Web Browser;/usr/share/icons/hicolor/128x128/apps/chromium.png;chromium +Text Editor;/usr/share/icons/hicolor/128x128/apps/editor.png;leafpad +Calculator;/usr/share/icons/hicolor/128x128/apps/calculator.png;qalculate diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/etc/xlunch/logout.dsv b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/xlunch/logout.dsv new file mode 100644 index 0000000..40a9f82 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/etc/xlunch/logout.dsv @@ -0,0 +1,3 @@ +Logout;/usr/share/icons/hicolor/128x128/actions/logout.png;logout +Restart;/usr/share/icons/hicolor/128x128/actions/restart.png;restart +Shut down;/usr/share/icons/hicolor/128x128/actions/shutdown.png;shutdown diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbappselect b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbappselect new file mode 100755 index 0000000..890b2eb --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbappselect @@ -0,0 +1,39 @@ +#!/bin/bash + +COMMAND=$( + xlunch_genquick 64 --desktop | \ + xlunch --border 7% --sideborder 10% --borderratio 100 --sideborderratio 50 \ + --background /usr/share/wallpapers/slax_wallpaper.jpg --bgfill --font DejaVuSans/11 \ + --voidclickterminate --iconpadding 40 --textpadding 10 \ + --leastmargin 6 --hidemissing --iconsize 64 \ + --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \ + --outputonly +) + +if [ "$COMMAND" = "" ]; then + exit +fi + +fbstartupnotify + +# if command is a .desktop file, parse it +if [[ "$COMMAND" =~ \.desktop ]]; then + NoTerm="$(cat "$COMMAND" | grep Terminal\\s*= | grep -i "Terminal\\s*=\\s*false")" + COMMAND="$(cat "$COMMAND" | grep Exec\\s*= | head -n 1 | sed -r s/.*=// | sed -r "s/%[^%]+//g")" +fi + +cmd="$(echo $COMMAND | sed -r "s/\\s.*//")" +whi="$(which $cmd | head -n 1)" +Xdep=$(ldd $whi | grep libX11) +Ndep=$(ldd $whi | grep libncurses) + +WAIT='echo "--------------------------------------------------"; read -n 1 -s -r -p "Command finished. Press any key to close window..."' +if [ "$Ndep" != "" -o "$cmd" = "man" -o "$cmd" = "mc" ]; then + WAIT="" +fi + +if [ "$Xdep" = "" -a "$cmd" != "chromium" -a "$cmd" != "wicd-manager" -a "$cmd" != "fbliveapp" -a "$NoTerm" = "" ]; then + exec xterm -ls -e bash --login -c -- "echo $USER@$HOSTNAME:$PWD# '$COMMAND'; $COMMAND; $WAIT" +else + exec $COMMAND +fi diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbliveapp b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbliveapp new file mode 100755 index 0000000..23ffbc4 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbliveapp @@ -0,0 +1,85 @@ +#!/bin/bash + +. /etc/minios.conf + +if [ "$1" = "votecoin" ]; then + NAME="VoteCoin Wallet" + ABOUT="VoteCoin Wallet is a crypto currency wallet, +forked from ZCash, which itslef forked from Bitcoin. +It supports fully anonymous transactions and voting. +Receive free 10 VOT coins for installing the wallet. +In the future, VoteCoin will be used for decision +funding in Slax." + TMP="/tmp/votecoin.tar.gz" + EXECUTABLE="/opt/VoteCoin Wallet-linux-x64/VoteCoin Wallet" + PREINSTALL="apt update" + INSTALL="wget -O $TMP 'https://votecoin.site/download.php?os=linux' && tar -xf $TMP -C /opt && rm -f $TMP && apt install --yes libxss1 libgconf-2-4 libnss3" + POSTINSTALL="" + ONLY64=true +fi + +if [ "$1" = "vlc" ]; then + NAME="VLC Video Player" + ABOUT="VLC Video Player is a free and open source multimedia player +and framework that plays most multimedia files as well as DVDs, +Audio CDs, CVDs, and various streaming protocols." + EXECUTABLE="/usr/bin/vlc" + PREINSTALL="apt update" + INSTALL="apt install --yes vlc" + POSTINSTALL="rm /usr/share/applications/vlc.desktop; mkdir /home/guest/.config/vlc; echo '[qt4] +qt-privacy-ask=0' > /home/guest/.config/vlc/vlcrc;" + GUEST=true +fi + +if [ "$1" = "chromium" ]; then + NAME="Chromium Web Browser" + ABOUT="Chromium is a free and open source version of +the famous Chrome browser, developed by Google." + EXECUTABLE="/usr/bin/chromium" + PREINSTALL="apt update" + INSTALL="apt install --yes chromium chromium-sandbox" + POSTINSTALL="rm -f /usr/share/applications/chromium.desktop" + GUEST=true +fi + +shift + +# ------------------------------------------------ +# do not touch anything below this line +# ------------------------------------------------ + +if [ "$ABOUT" != "" ]; then + ABOUT="$ABOUT + +" +fi + +if [ "$EXECUTABLE" = "" ]; then + exit +fi + +if [ ! -f "$EXECUTABLE" ]; then + + if [ $(uname -m) != 'x86_64' -a "$ONLY64" = "true" ]; then + gtkdialog -i /usr/share/icons/gnome/16x16/status/dialog-warning.png -t Error -m "$NAME only works in 64bit version of Slax" -y OK + exit 1 + fi + + if gtkdialog -i /usr/share/icons/gnome/16x16/status/dialog-question.png -t Question -m "$ABOUT$NAME is not yet installed. +Do you like to download and install it now?" -y Yes -n No; then + xterm -ls -e bash --login -c -- "$PREINSTALL; $INSTALL; $POSTINSTALL" + fi +fi + +if [ -f "$EXECUTABLE" ]; then + + fbstartupnotify + + if [ "$GUEST" = "true" -a "$EUID" -eq 0 ]; then + xhost + >/dev/null 2>/dev/null + exec su -c "$EXECUTABLE "$@"" guest + fi + + exec "$EXECUTABLE" "$@" + +fi diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fblogout b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fblogout new file mode 100755 index 0000000..1538120 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fblogout @@ -0,0 +1,31 @@ +#!/bin/bash + +COMMAND=$( + xlunch --input /etc/xlunch/logout.dsv --noprompt --border auto --sideborder auto --columns 3 --rows 1 \ + --background /usr/share/wallpapers/slax_wallpaper.jpg --bgfill --font DejaVuSans/11 \ + --voidclickterminate --iconpadding 30 --textpadding 10 \ + --leastmargin 10 --hidemissing --iconsize 128 \ + --highlight /usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png \ + --outputonly +) + +SND=/usr/share/sounds/shutdown.wav + +if [ "$COMMAND" != "" -a -r $SND ]; then + # blank desktop with smooth effect (if compton still running) + xlunch --noprompt --input /dev/null --bc 111111ff & + # play shutdown sound + aplay $SND +fi + +if [ "$COMMAND" = "logout" ]; then + killall Xorg +fi + +if [ "$COMMAND" = "restart" ]; then + reboot +fi + +if [ "$COMMAND" = "shutdown" ]; then + poweroff +fi diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbprintscreen b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbprintscreen new file mode 100755 index 0000000..2fa57c9 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbprintscreen @@ -0,0 +1,18 @@ +#!/bin/bash + +PICTURES=~/Pictures +mkdir -p $PICTURES +cd $PICTURES + +# make screenshot +SCREENSHOT=$(scrot -e 'echo $f') + +if [ "$SCREENSHOT" = "" ]; then + exit 1 +fi + +# open screenshot in 2/3 window +read W H X <<< $(xrandr 2>/dev/null | fgrep '*' | tr -s " " | tr "x" " ") +W=$(($W*2/3)) +H=$(($H*2/3)) +exec feh --geometry $W"x"$H $SCREENSHOT diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbscreensize b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbscreensize new file mode 100755 index 0000000..b51e329 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbscreensize @@ -0,0 +1,17 @@ +#!/bin/bash + +SIGNAL=~/.fehbg +rm -f $SIGNAL + +OUTPUT=$(xrandr 2>/dev/null | grep -iv disconnected | grep -i 'connected' | head -n 1 | cut -d " " -f 1) +MODE=$1 + +xrandr --output $OUTPUT --mode $MODE -s $MODE + +while [ -e $SIGNAL ]; do + sleep 0.1 +done + +sleep 1 + +killall -SIGUSR1 compton diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbsetkb b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbsetkb new file mode 100755 index 0000000..4e08683 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbsetkb @@ -0,0 +1,4 @@ +#!/bin/bash + +setxkbmap $1 +echo $1 > ~/.fluxbox/kblayout diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbstartupnotify b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbstartupnotify new file mode 100755 index 0000000..aa6a9a6 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/bin/fbstartupnotify @@ -0,0 +1,18 @@ +#!/bin/bash + +CURSORSDIR=/usr/share/icons/breeze_cursors/cursors/ +SIZE=16 + +# Set cursor to wait. As soon as new window is detected, change cursor back +xsetroot -xcf $CURSORSDIR/left_ptr_watch $SIZE +export WINDOWS="$(wmctrl -l)" + +( + sleep 0.2 + until diff <(echo "$WINDOWS") <(wmctrl -l) | egrep -q "^[>]"; do + sleep 0.5 + done + xsetroot -xcf $CURSORSDIR/left_ptr $SIZE +) & + +exit 0 diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/1terminal.desktop b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/1terminal.desktop new file mode 100644 index 0000000..4005587 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/1terminal.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Icon=terminal +Name=Terminal +Exec=xterm -ls +Terminal=false diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/5chromium.desktop b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/5chromium.desktop new file mode 100644 index 0000000..bcc3636 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/5chromium.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Web Browser +GenericName=Web Browser +Exec=fbliveapp chromium %U +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=chromium.png +Categories=Network;WebBrowser; +MimeType=audio/*;image/*;video/*;application/pdf;application/x-pdf;text/html;text/xml;application/xhtml_xml;application/x-mimearchive;x-scheme-handler/http;x-scheme-handler/https; +StartupWMClass=chromium +StartupNotify=true diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/feh.desktop b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/feh.desktop new file mode 100644 index 0000000..6f6988d --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/feh.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Name=Image viewer +GenericName=Image viewer +Exec=feh %U +Terminal=false +X-MultipleArgs=false +Type=Application +Icon=none.png +Categories=ImageViewer; +MimeType=image/*; +StartupWMClass=feh +StartupNotify=true +Hidden=true diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/mimeapps.list b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/mimeapps.list new file mode 100644 index 0000000..8217417 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/mimeapps.list @@ -0,0 +1,132 @@ +[Default Applications] +application/pdf=chromium.desktop; +application/x-pdf=chromium.desktop; +audio/3gpp=chromium.desktop; +audio/ac3=chromium.desktop; +audio/flac=chromium.desktop; +audio/mp4=chromium.desktop; +audio/mpeg=chromium.desktop; +audio/mpegurl=chromium.desktop; +audio/ogg=chromium.desktop; +audio/x-flac=chromium.desktop; +audio/x-gsm=chromium.desktop; +audio/x-it=chromium.desktop; +audio/x-m4a=chromium.desktop; +audio/x-matroska=chromium.desktop; +audio/x-mod=chromium.desktop; +audio/x-mp3=chromium.desktop; +audio/x-mpeg=chromium.desktop; +audio/x-mpegurl=chromium.desktop; +audio/x-pn-wav=chromium.desktop;; +audio/x-tta=chromium.desktop; +audio/x-vorbis=chromium.desktop; +audio/x-vorbis+ogg=chromium.desktop; +audio/x-wav=chromium.desktop; +audio/x-wavpack=chromium.desktop; +audio/x-xm=chromium.desktop; +application/ogg=chromium.desktop; +application/x-extension-m4a=chromium.desktop; +application/x-extension-mp4=chromium.desktop; +application/x-flac=chromium.desktop; +application/x-flash-video=chromium.desktop; +application/x-ogg=chromium.desktop; +image/bmp=feh.desktop; +image/gif=feh.desktop; +image/jpeg=feh.desktop; +image/jpg=feh.desktop; +image/pjpeg=feh.desktop; +image/png=feh.desktop; +image/svg+xml=chromium.desktop; +image/svg+xml-compressed=chromium.desktop; +image/x-bmp=feh.desktop; +image/x-gray=chromium.desktop; +image/x-icb=chromium.desktop; +image/x-ico=chromium.desktop; +image/x-pcx=chromium.desktop; +image/x-png=feh.desktop; +image/x-portable-anymap=chromium.desktop; +image/x-portable-bitmap=chromium.desktop; +image/x-portable-graymap=chromium.desktop; +image/x-portable-pixmap=chromium.desktop; +image/x-xbitmap=chromium.desktop; +image/x-xpixmap=chromium.desktop; +image/vnd.wap.wbmp=chromium.desktop; +image/x-fits=gimp.desktop +image/x-icon=gimp.desktop +image/x-sun-raster=gimp.desktop +image/x-tga=gimp.desktop +image/x-xcf=gimp.desktop +image/x-xwindowdump=gimp.desktop +video/3gpp=chromium.desktop; +video/dv=chromium.desktop; +video/fli=chromium.desktop; +video/flv=chromium.desktop; +video/mp2t=chromium.desktop; +video/mp4=chromium.desktop; +video/mp4v-es=chromium.desktop; +video/mpeg=chromium.desktop; +video/msvideo=chromium.desktop; +video/ogg=chromium.desktop; +video/quicktime=chromium.desktop; +video/vivo=chromium.desktop; +video/vnd.divx=chromium.desktop; +video/vnd.rn-realvideo=chromium.desktop; +video/vnd.vivo=chromium.desktop; +video/webm=chromium.desktop; +video/x-anim=chromium.desktop; +video/x-avi=chromium.desktop; +video/x-flc=chromium.desktop; +video/x-fli=chromium.desktop; +video/x-flic=chromium.desktop; +video/x-flv=chromium.desktop; +video/x-m4v=chromium.desktop; +video/x-matroska=chromium.desktop; +video/x-mpeg=chromium.desktop; +video/x-ogm+ogg=chromium.desktop; +video/x-theora+ogg=chromium.desktop; +application/x-flash-video=chromium.desktop; +text/plain=leafpad.desktop; +text/css=leafpad.desktop; +text/javascript=leafpad.desktop; +text/mathml=leafpad.desktop; +text/x-c++hdr=leafpad.desktop; +text/x-c++src=leafpad.desktop; +text/x-csrc=leafpad.desktop; +text/x-chdr=leafpad.desktop; +text/x-dtd=leafpad.desktop; +text/x-java=leafpad.desktop; +text/x-javascript=leafpad.desktop; +text/x-makefile=leafpad.desktop; +text/x-moc=leafpad.desktop; +text/x-pascal=leafpad.desktop; +text/x-patch=leafpad.desktop; +text/x-perl=leafpad.desktop; +text/x-php=leafpad.desktop; +text/x-python=leafpad.desktop; +text/x-sql=leafpad.desktop; +text/x-tcl=leafpad.desktop; +text/x-tex=leafpad.desktop; +text/xml=leafpad.desktop; +application/javascript=leafpad.desktop; +application/x-cgi=leafpad.desktop; +application/x-javascript=leafpad.desktop; +application/x-perl=leafpad.desktop; +application/x-php=leafpad.desktop; +application/x-python=leafpad.desktop; +application/x-shellscript=leafpad.desktop; +application/xml=leafpad.desktop; +application/xml-dtd=leafpad.desktop; +application/x-bzip=xarchiver.desktop; +application/x-bzip-compressed-tar=xarchiver.desktop; +application/x-gzip=xarchiver.desktop; +application/x-tar=xarchiver.desktop; +application/x-zip=xarchiver.desktop; +application/x-zip-compressed=xarchiver.desktop; +application/zip=xarchiver.desktop; +application/x-compressed-tar=xarchiver.desktop; +application/x-bzip2=xarchiver.desktop; +application/x-bzip2-compressed-tar=xarchiver.desktop; +application/x-lzma-compressed-tar=xarchiver.desktop; +application/x-lzma=xarchiver.desktop; +application/x-xz=xarchiver.desktop; +application/x-xz-compressed-tar=xarchiver.desktop; diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/videoplayer.desktop b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/videoplayer.desktop new file mode 100644 index 0000000..b2f1714 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/videoplayer.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Icon=videoplayer +Name=Video Player +Exec=fbliveapp vlc +Terminal=false diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/votecoin.desktop b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/votecoin.desktop new file mode 100644 index 0000000..460e9a8 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/applications/votecoin.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Icon=votecoin +Name=VoteCoin Wallet +Exec=fbliveapp votecoin +Terminal=false +Hidden=true diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closefcs.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closefcs.png new file mode 100644 index 0000000..6843155 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closefcs.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closepr.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closepr.png new file mode 100644 index 0000000..819f59a Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closepr.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closeunfcs.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closeunfcs.png new file mode 100644 index 0000000..dabe48c Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/closeunfcs.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxfcs.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxfcs.png new file mode 100644 index 0000000..ae0558e Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxfcs.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxpr.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxpr.png new file mode 100644 index 0000000..e87bb1e Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxpr.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxunfcs.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxunfcs.png new file mode 100644 index 0000000..f878fe6 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/maxunfcs.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minfcs.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minfcs.png new file mode 100644 index 0000000..f67c7ed Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minfcs.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minpr.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minpr.png new file mode 100644 index 0000000..100be63 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minpr.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minunfcs.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minunfcs.png new file mode 100644 index 0000000..82b487f Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/minunfcs.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png new file mode 100644 index 0000000..e74bf47 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/pixmaps/start-here.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/theme.cfg b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/theme.cfg new file mode 100644 index 0000000..c249232 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/fluxbox/styles/Slax/theme.cfg @@ -0,0 +1,114 @@ +! Slax fluxbox theme +! (c) Tomas Matejicek + +! common settings +*font: Bitstream Vera Sans-9 + +background: aspect +background.pixmap: /usr/share/wallpapers/slax_wallpaper.jpg + +toolbar.justify: left +toolbar.clock.justify: right +window.justify: center +menu.title.justify: center +menu.frame.justify: left + +! window +window.focus.backgroundColor: #63b4fb +window.unfocus.backgroundColor: #ebebeb +window.focus.borderColor: #63b4fb +window.unfocus.borderColor: #ebebeb +window.borderWidth: 6 +window.handleWidth: 0 + +! title +window.title.height: 18 +window.title.focus: flat solid +window.title.focus.color: #63b4fb +window.label.focus: parentrelative +window.label.focus.textColor: #282828 +window.title.unfocus: flat solid +window.title.unfocus.color: #ebebeb +window.label.unfocus: parentrelative +window.label.unfocus.textColor: #282828 + +! buttons +window.button.focus: flat solid +window.button.focus.color: #63b4fb +window.button.focus.picColor: #282828 +window.button.pressed: sunken solid +window.button.pressed.color: #63b4fb +window.button.pressed.picColor: #000000 +window.button.unfocus: flat solid +window.button.unfocus.color: #ebebeb +window.button.unfocus.picColor: #282828 + +window.close.pixmap: closefcs.png +window.close.unfocus.pixmap: closeunfcs.png +window.close.pressed.pixmap: closepr.png +window.iconify.pixmap: minfcs.png +window.iconify.unfocus.pixmap: minunfcs.png +window.iconify.pressed.pixmap: minpr.png +window.maximize.pixmap: maxfcs.png +window.maximize.unfocus.pixmap: maxunfcs.png +window.maximize.pressed.pixmap: maxpr.png + +! taskbar +toolbar.height: 18 +toolbar.bevelWidth: 0 +toolbar.borderWidth: 3 +toolbar.borderColor: #222222 +toolbar: flat solid + +toolbar.color: #222222 +toolbar.clock: flat solid +toolbar.clock.color: #222222 +toolbar.clock.textColor: white + +toolbar.iconbar.empty: flat +toolbar.iconbar.empty.color: #222222 + +toolbar.iconbar.focused.borderWidth: 15 +toolbar.iconbar.focused.borderColor: #222222 +toolbar.iconbar.focused: flat +toolbar.iconbar.focused.color: #dddddd +toolbar.iconbar.focused.textColor: #282828 +toolbar.iconbar.focused.justify: left + +toolbar.iconbar.unfocused.borderWidth: 15 +toolbar.iconbar.unfocused.borderColor: #222222 +toolbar.iconbar.unfocused: flat +toolbar.iconbar.unfocused.color: #444444 +toolbar.iconbar.unfocused.textColor: white +toolbar.iconbar.unfocused.justify: left + +toolbar.button: flat solid +toolbar.button.borderWidth: 13 +toolbar.button.borderColor: #222222 +toolbar.button.color: #222222 +toolbar.button.picColor: #61CA00 +toolbar.button.pressed: flat solid + +! menu +menu.title: flat solid +menu.title.color: #63b4fb +menu.title.textColor: #282828 +menu.title.justify: center + +menu.bevelWidth: 4 +menu.borderWidth: 6 +menu.borderColor: #63b4fb + +menu.frame: flat solid +menu.frame.disableColor: #999999 +menu.frame.color: #ebebeb +menu.frame.textColor: #282828 +menu.frame.justify: left + +menu.hilite: flat solid +menu.hilite.textColor: #ffffff +menu.hilite.color: #63b4fb + +menu.bullet: empty +menu.bullet.position: right +menu.itemHeight: 24 diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/logout.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/logout.png new file mode 100644 index 0000000..fa6dddb Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/logout.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/restart.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/restart.png new file mode 100644 index 0000000..7c80934 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/restart.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/shutdown.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/shutdown.png new file mode 100644 index 0000000..8c25c3a Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/actions/shutdown.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/chromium.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/chromium.png new file mode 100644 index 0000000..057a663 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/chromium.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/terminal.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/terminal.png new file mode 100644 index 0000000..c53249b Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/terminal.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png new file mode 100644 index 0000000..bb45fe5 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/128x128/apps/xlunch_highlight.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/64x64/apps/videoplayer.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/64x64/apps/videoplayer.png new file mode 100644 index 0000000..327b538 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/64x64/apps/videoplayer.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/64x64/apps/votecoin.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/64x64/apps/votecoin.png new file mode 100644 index 0000000..a7056af Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/hicolor/64x64/apps/votecoin.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/actions/system-shutdown-symbolic.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/actions/system-shutdown-symbolic.png new file mode 100644 index 0000000..7386bcd Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/actions/system-shutdown-symbolic.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/apps/black.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/apps/black.png new file mode 100644 index 0000000..53993f0 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/apps/black.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm new file mode 100644 index 0000000..0cd329e --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm @@ -0,0 +1,6 @@ +#define command2_width 16 +#define command2_height 16 +static unsigned char command2_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff, + 0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1, + 0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_czech_republic.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_czech_republic.png new file mode 100644 index 0000000..d79b3d9 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_czech_republic.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_france.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_france.png new file mode 100644 index 0000000..2db5840 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_france.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_germany.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_germany.png new file mode 100644 index 0000000..8deb4c9 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_germany.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_italy.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_italy.png new file mode 100644 index 0000000..19064f8 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_italy.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_poland.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_poland.png new file mode 100644 index 0000000..4dd7104 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_poland.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_portugal.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_portugal.png new file mode 100644 index 0000000..19cd33a Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_portugal.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_russia.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_russia.png new file mode 100644 index 0000000..b4822ea Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_russia.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_slovakia.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_slovakia.png new file mode 100644 index 0000000..8c4d813 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_slovakia.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_spain.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_spain.png new file mode 100644 index 0000000..d87283c Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_spain.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_ukraine.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_ukraine.png new file mode 100644 index 0000000..639aa4a Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_ukraine.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_usa.png b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_usa.png new file mode 100644 index 0000000..f027ed8 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/icons/locolor/16x16/flags/flag_usa.png differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/sounds/shutdown.wav b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/sounds/shutdown.wav new file mode 100644 index 0000000..cba904d Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/sounds/shutdown.wav differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/sounds/startup.wav b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/sounds/startup.wav new file mode 100644 index 0000000..278e8e8 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/sounds/startup.wav differ diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/themes/MurrinaChrome/gtk-2.0/gtkrc b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/themes/MurrinaChrome/gtk-2.0/gtkrc new file mode 100644 index 0000000..f1fdee6 --- /dev/null +++ b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/themes/MurrinaChrome/gtk-2.0/gtkrc @@ -0,0 +1,438 @@ +gtk_color_scheme = "fg_color:#000000\nbg_color:#eeeeee\nbase_color:#FFFFFF\ntext_color:#000000\nselected_bg_color:#63b4fb\nselected_fg_color:#FFFFFF\ntooltip_bg_color:#F5F5C9\ntooltip_fg_color:#000000" + +# menu delay +#gtk-menu-popup-delay = 0 + +# icon sizes +#gtk-icon-sizes = "gtk-menu=16,16:\ngtk-button=16,16:\ngtk-dnd=16,16:\npanel-menu=16,16:\npanel=16,16:\ngtk-dialog=16,16:" + +# icon sizes (small toolbar) +# gtk-icon-sizes = "gtk-menu=16,16:\ngtk-button=16,16:\ngtk-dnd=16,16:\npanel-menu=16,16:\npanel=16,16:\ngtk-dialog=16,16:\ngtk-small-toolbar=16,16:\ngtk-large-toolbar=16,16:" + +style "murrine-default" +{ + ######## + # Style Properties + ######## + GtkButton ::child-displacement-x = 1 + GtkButton ::child-displacement-y = 1 + GtkButton ::default-border = { 0, 0, 0, 0 } + GtkButton ::inner-border = { 5, 5, 5, 5 } + GtkCheckButton ::indicator-size = 14 + + GtkPaned ::handle-size = 6 + + GtkRange ::trough-border = 0 + GtkRange ::slider-width = 15 + GtkRange ::stepper-size = 15 + + GtkScale ::slider-length = 15 + GtkScale ::trough-side-details = 0 + GtkScrollbar ::min-slider-length = 30 + + GtkMenuBar ::internal-padding = 1 + GtkExpander ::expander-size = 16 + GtkToolbar ::internal-padding = 0 + GtkTreeView ::expander-size = 14 + GtkTreeView ::vertical-separator = 0 + + GtkMenu ::horizontal-padding = 1 + GtkMenu ::vertical-padding = 1 + + GtkMenuBar ::shadow_type = GTK_SHADOW_NONE + GtkToolbar ::shadow_type = GTK_SHADOW_NONE + + # Glow the tasklist by changing the color, instead of overlaying it with a rectangle + #WnckTasklist ::fade-overlay-rect = 0 + + xthickness = 1 + ythickness = 1 + + + fg[NORMAL] = @fg_color + fg[PRELIGHT] = @fg_color + fg[SELECTED] = @selected_fg_color + fg[ACTIVE] = @fg_color + fg[INSENSITIVE] = darker (@bg_color) + + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade (1.02, @bg_color) + bg[SELECTED] = @selected_bg_color + bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = shade (0.9, @bg_color) + + base[NORMAL] = @base_color + base[PRELIGHT] = shade (0.95, @bg_color) + base[ACTIVE] = shade (0.88, @selected_bg_color) + base[SELECTED] = shade (0.89, @selected_bg_color) + base[INSENSITIVE] = @bg_color + + text[NORMAL] = @text_color + text[PRELIGHT] = @text_color + text[ACTIVE] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[INSENSITIVE] = darker (@bg_color) + + engine "murrine" + { + animation = TRUE + colorize_scrollbar = FALSE + contrast = 0.65 # 0.8 for less contrast, more than 1.0 for more contrast on borders + glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave style, 3 = top curved highlight, 4 = beryl highlight + gradient_shades = {1.03,1.0,1.0,0.985} + #gradient_shades = {1.09,1.06,1.04,1.01} # default: {1.1,1.0,1.0,1.1} + highlight_shade = 1.0 # set highlight amount for buttons or widgets + lightborder_shade = 1.06 # sets lightborder amount for buttons or widgets + #lightborderstyle = 0 # 0 = lightborder on top side, 1 = lightborder on all sides + listviewheaderstyle = 1 # 0 = flat, 1 = glassy, 2 = raised + listviewstyle = 1 # 0 = nothing, 1 = dotted + menubaritemstyle = 0 # 0 = menuitem look, 1 = button look + menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped + menuitemstyle = 1 # 0 = flat, 1 = glassy, 2 = striped + menustyle = 0 # 0 = no vertical menu stripe, 1 = display vertical menu stripe + reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow + rgba = TRUE # FALSE = disabled, TRUE = enabled + roundness = 0 # 0 = squared, 1 = old default, more will increase roundness + scrollbarstyle = 0 # 0 = nothing, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles + sliderstyle = 0 # 0 = nothing added, 1 = handles + stepperstyle = 0 # 0 = standard, 1 = integrated stepper handles, 2 = unknown + toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient + } +} + +style "murrine-wide" +{ + xthickness = 2 + ythickness = 2 + + bg[SELECTED] = @selected_bg_color +} + +style "murrine-wider" +{ + xthickness = 3 + ythickness = 3 + + bg[SELECTED] = @selected_bg_color +} + +style "murrine-button" = "murrine-wider" +{ + bg[NORMAL] = shade (1.04, @bg_color) + bg[PRELIGHT] = shade (1.06, @bg_color) + bg[ACTIVE] = shade (1.02, @bg_color) + bg[INSENSITIVE] = shade (1.0, @bg_color) + + engine "murrine" { + contrast = 0.45 + } +} + +style "murrine-entry" = "murrine-wider" +{ + engine "murrine" { + contrast = 0.35 + } +} +style "murrine-notebook" +{ + xthickness = 2 + ythickness = 2 + + bg[ACTIVE] = shade (0.99, @bg_color) + bg[NORMAL] = shade (1.03, @bg_color) + bg[SELECTED] = @selected_bg_color + fg[ACTIVE] = shade (0.34, @bg_color) +} + +style "murrine-tasklist" = "murrine-wide" +{ +} + +style "murrine-menu" = "murrine-wider" +{ + xthickness = 3 + ythickness = 3 + + bg[NORMAL] = shade (1.18, @bg_color) +} + +style "murrine-menu-item" = "murrine-wider" +{ + xthickness = 2 + ythickness = 3 + + fg[PRELIGHT] = @selected_fg_color + bg[SELECTED] = shade (0.95, @selected_bg_color) + bg[SELECTED] = shade (0.95, @selected_bg_color) + + engine "murrine" + { + roundness = 0 + } +} + +style "murrine-separator-menu-item" +{ +} + +style "murrine-treeview" +{ + bg[SELECTED] = @selected_bg_color +} + +style "murrine-treeview-header" = "murrine-default" +{ + bg[NORMAL] = shade (1.06,@bg_color) + bg[PRELIGHT] = shade (1.06,@bg_color) +} + +style "murrine-frame-title" +{ + fg[NORMAL] = lighter (@fg_color) +} + +style "murrine-tooltips" = "murrine-wider" +{ + bg[NORMAL] = @tooltip_bg_color + fg[NORMAL] = @tooltip_fg_color +} + +style "murrine-progressbar" +{ + xthickness = 0 + ythickness = 0 + + fg[PRELIGHT] = @selected_fg_color + bg[NORMAL] = shade (0.98, @bg_color) + bg[SELECTED] = @selected_bg_color +} + +style "murrine-statusbar" +{ +} + +style "murrine-comboboxentry" +{ +} + +style "murrine-spinbutton" +{ +} + +style "murrine-scale" = "murrine-button" +{ + GtkRange ::slider-width = 15 + + engine "murrine" + { + roundness = 6 + } +} + +style "murrine-hscale" +{ +} + +style "murrine-vscale" +{ +} + +style "murrine-scrollbar" +{ + bg[NORMAL] = shade (1.04, @bg_color) + bg[PRELIGHT] = shade (1.06, @bg_color) + bg[ACTIVE] = shade (1.02, @bg_color) + bg[INSENSITIVE] = shade (1.0, @bg_color) +} + +style "murrine-hscrollbar" +{ +} + +style "murrine-vscrollbar" +{ +} + +style "murrine-menubar" +{ +} + +style "murrine-nautilus-location" +{ +# bg[NORMAL] = shade (1.0,@selected_bg_color) +# bg[SELECTED] = shade (1.0,@selected_bg_color) +# bg[ACTIVE] = shade (1.0,@selected_bg_color) +} + +style "murrine-radiocheck" = "murrine-default" +{ + text[NORMAL] = "#FFFFFF" + text[PRELIGHT] = "#FFFFFF" +} + +style "panel" +{ + fg[NORMAL] = "#FFFFFF" + fg[PRELIGHT] = "#FFFFFF" + fg[ACTIVE] = "#FFFFFF" + bg[NORMAL] = shade (0.4, @bg_color) + bg[ACTIVE] = shade (0.5, @bg_color) + bg[PRELIGHT] = shade (0.56, @bg_color) + + engine "murrine" { + contrast = 0.8 + } +} + +style "smaller-text" +{ + font_name = "7" +} + +style "handle" +{ + bg[NORMAL] = "#232323" +} + +######################################### +# Matches +######################################### + +# theme radio buttons and checkmarks +class "GtkRadio*" style "murrine-radiocheck" +class "GtkCheck*" style "murrine-radiocheck" + +# theme default style is applied to every widget +class "GtkWidget" style "murrine-default" + +# Increase the x/ythickness in some widgets +class "GtkToolbar" style "murrine-default" +class "GtkRange" style "murrine-wide" +class "GtkFrame" style "murrine-wide" +class "GtkSeparator" style "murrine-wide" +class "GtkEntry" style "murrine-entry" + +class "GtkSpinButton" style "murrine-spinbutton" +class "GtkScale" style "murrine-scale" +class "GtkVScale" style "murrine-vscale" +class "GtkHScale" style "murrine-hscale" +class "GtkScrollbar" style "murrine-scrollbar" +class "GtkVScrollbar" style "murrine-vscrollbar" +class "GtkHScrollbar" style "murrine-hscrollbar" + +# General matching following, the order is choosen so that the right styles override each other +# eg. progressbar needs to be more important then the menu match. + +# This is not perfect, it could be done better +# (That is modify *every* widget in the notebook, and change those back that +# we really don't want changed) +widget_class "**" style "murrine-notebook" +widget_class "**" style "murrine-notebook" +widget_class "**" style "murrine-notebook" +widget_class "**" style "murrine-notebook" + +widget_class "*" style "murrine-button" +widget_class "*" style "murrine-notebook" +widget_class "**" style "murrine-statusbar" + +widget_class "**" style "murrine-comboboxentry" +widget_class "**" style "murrine-comboboxentry" + +widget_class "**" style "murrine-menubar" +widget_class "**" style "murrine-menu" +widget_class "**" style "murrine-menu-item" +widget_class "**" style "murrine-separator-menu-item" + +widget_class "*.." style "murrine-frame-title" +widget_class "*.*" style "murrine-treeview" + +widget_class "*" style "murrine-progressbar" + +# Treeview header +widget_class "*.." style "murrine-treeview-header" +widget_class "*.." style "murrine-treeview-header" +widget_class "*.." style "murrine-treeview-header" +widget_class "*.." style "murrine-treeview-header" + +# Workarounds for Evolution +widget_class "*.ETable.ECanvas" style "murrine-treeview-header" +widget_class "*.ETree.ECanvas" style "murrine-treeview-header" + +# Panel style +class "*Panel*" style "panel" +class "*notif*" style "panel" +class "*Notif*" style "panel" +class "*Tray*" style "panel" +class "*tray*" style "panel" + +widget_class "*ToolButton*" style "smaller-text" +widget_class "*Statusbar*" style "smaller-text" +widget_class "*Mail*" style "panel" +widget "*PanelWidget*" style "panel" +widget "*PanelApplet*" style "panel" + +class "PanelAppletFrame" style "handle" + +# The window of the tooltip is called "gtk-tooltip" +################################ +# FIXME: +# This will not work if one embeds eg. a button into the tooltip. +# As far as I can tell right now we will need to rework the theme +# quite a bit to get this working correctly. +# (It will involve setting different priorities, etc.) +################################ +widget "gtk-tooltip*" style "murrine-tooltips" + +################################################### +# Special cases and work arounds +################################################### + +# Special case the nautilus-extra-view-widget +# ToDo: A more generic approach for all applications that have a widget like this. +widget "*.nautilus-extra-view-widget" style : highest "murrine-nautilus-location" + +# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646 +# Note that the work around assumes that the combobox is _not_ in +# appears-as-list mode. +# Similar hack also in the menuitem style. +# This style does not affect GtkComboBoxEntry, it does have an effect +# on comboboxes in appears-as-list mode though. +style "murrine-combobox-text-color-workaround" +{ + text[NORMAL] = @fg_color + text[PRELIGHT] = @fg_color + text[SELECTED] = @selected_fg_color + text[ACTIVE] = @fg_color + text[INSENSITIVE] = darker (@bg_color) +} +widget_class "*.." style "murrine-combobox-text-color-workaround" + +style "murrine-menuitem-text-is-fg-color-workaround" +{ + text[NORMAL] = @fg_color + text[PRELIGHT] = @selected_fg_color + text[SELECTED] = @selected_fg_color + text[ACTIVE] = @fg_color + text[INSENSITIVE] = darker (@bg_color) +} + +widget "*.gtk-combobox-popup-menu.*" style "murrine-menuitem-text-is-fg-color-workaround" + +# Work around the usage of GtkLabel inside GtkListItems to display text. +# This breaks because the label is shown on a background that is based on the +# base color set. +style "murrine-fg-is-text-color-workaround" +{ + fg[NORMAL] = @text_color + fg[PRELIGHT] = @text_color + fg[ACTIVE] = @selected_fg_color + fg[SELECTED] = @selected_fg_color + fg[INSENSITIVE] = darker (@bg_color) +} + +widget_class "**" style "murrine-fg-is-text-color-workaround" +# The same problem also exists for GtkCList and GtkCTree +# Only match GtkCList and not the parent widgets, because that would also change the headers. + +widget_class "*" style "murrine-fg-is-text-color-workaround" diff --git a/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/wallpapers/slax_wallpaper.jpg b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/wallpapers/slax_wallpaper.jpg new file mode 100755 index 0000000..727e2a7 Binary files /dev/null and b/linux-live/modules/slax/03-desktop/rootcopy-install/usr/share/wallpapers/slax_wallpaper.jpg differ diff --git a/linux-live/modules/slax/04-apps/install b/linux-live/modules/slax/04-apps/install new file mode 100644 index 0000000..a02dc5e --- /dev/null +++ b/linux-live/modules/slax/04-apps/install @@ -0,0 +1,16 @@ +#!/bin/bash + +CWD=$(dirname $(readlink -f $0)) + +echo "wicd-daemon wicd/users multiselect live" | debconf-set-selections + +apt-get update >>$OUTPUT 2>&1 +apt-get install --no-install-recommends --yes \ + mousepad \ + qalculate-gtk \ + pcmanfm \ + lxtask \ + xarchiver xdg-utils libgconf-2-4 \ + network-manager-gnome >>$OUTPUT 2>&1 + +(cd /rootcopy-install && cp --parents -afr * /) diff --git a/linux-live/modules/slax/04-apps/install2 b/linux-live/modules/slax/04-apps/install2 new file mode 100644 index 0000000..219946e --- /dev/null +++ b/linux-live/modules/slax/04-apps/install2 @@ -0,0 +1,42 @@ +#!/bin/bash + +CWD=$(dirname $(readlink -f $0)) + +cd / + +#rm -Rf /squashfs-root/root/.fluxbox >>$OUTPUT 2>&1 +#rm -f /squashfs-root/root/.gtk-bookmarks >>$OUTPUT 2>&1 + +# we want to patch pcmanfm it to hide ugly root warning icon +# so we will recompile whole package + +REBUILD=/tmp/pcmanfm-rebuild-$$ + +apt-get update >>$OUTPUT 2>&1 +apt-get --yes build-dep pcmanfm >>$OUTPUT 2>&1 + +mkdir -p -m 0777 $REBUILD +cd $REBUILD + +apt-get source pcmanfm >>$OUTPUT 2>&1 + +if [ $DISTRIBUTION = "stretch" ]; then + cd pcmanfm-1.2.5 +else + cd pcmanfm-1.3.1 +fi +dpkg-buildpackage -us -uc >>$OUTPUT 2>&1 +patch -p1 <$CWD/patches/pcmanfm-slax.diff >>$OUTPUT 2>&1 +make >>$OUTPUT 2>&1 + +strip --strip-unneeded src/pcmanfm >>$OUTPUT 2>&1 +cp src/pcmanfm /squashfs-root/usr/bin >>$OUTPUT 2>&1 + +rm -f /squashfs-root/usr/share/applications/mousepad.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/qalculate-gtk.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/pcmanfm.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/nm-applet.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/nm-connection-editor.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/lxtask.desktop >>$OUTPUT 2>&1 + +dir2sb /squashfs-root /04-apps.sb >>$OUTPUT 2>&1 diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/slitlist b/linux-live/modules/slax/04-apps/is_internal_build similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/slitlist rename to linux-live/modules/slax/04-apps/is_internal_build diff --git a/linux-live/modules/slax/04-apps/patches/pcmanfm-slax.diff b/linux-live/modules/slax/04-apps/patches/pcmanfm-slax.diff new file mode 100644 index 0000000..ad20b83 --- /dev/null +++ b/linux-live/modules/slax/04-apps/patches/pcmanfm-slax.diff @@ -0,0 +1,10 @@ +--- a/src/main-win.c ++++ b/src/main-win.c +@@ -955,6 +955,7 @@ static void fm_main_win_init(FmMainWin * + /* the location bar */ + win->location = fm_path_entry_new(); + g_signal_connect(win->location, "activate", G_CALLBACK(on_location_activate), win); ++ if (FALSE) + if(geteuid() == 0) /* if we're using root, Give the user some warnings */ + { + GtkWidget* warning = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR); diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.config/libfm/libfm.conf b/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.config/libfm/libfm.conf new file mode 100644 index 0000000..4e71676 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.config/libfm/libfm.conf @@ -0,0 +1,45 @@ +# Configuration file for the libfm version 1.2.5. +# Autogenerated file, don't edit, your changes will be overwritten. + +[config] +single_click=0 +use_trash=0 +confirm_del=1 +confirm_trash=1 +advanced_mode=0 +si_unit=0 +force_startup_notify=1 +backup_as_hidden=1 +no_usb_trash=1 +no_child_non_expandable=0 +show_full_names=1 +only_user_templates=0 +template_run_app=0 +template_type_once=0 +auto_selection_delay=600 +drop_default_action=ask +defer_content_test=0 +quick_exec=0 +show_internal_volumes=0 +terminal=x-terminal-emulator %s +thumbnail_local=1 +thumbnail_max=2048 +smart_desktop_autodrop=1 + +[ui] +big_icon_size=48 +small_icon_size=24 +pane_icon_size=24 +thumbnail_size=128 +show_thumbnail=1 +shadow_hidden=1 + +[places] +places_home=1 +places_desktop=0 +places_root=0 +places_computer=0 +places_trash=0 +places_applications=0 +places_network=0 +places_unmounted=0 diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.config/pcmanfm/default/pcmanfm.conf b/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.config/pcmanfm/default/pcmanfm.conf new file mode 100644 index 0000000..a39ba16 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.config/pcmanfm/default/pcmanfm.conf @@ -0,0 +1,26 @@ +[config] +bm_open_method=0 + +[volume] +mount_on_startup=1 +mount_removable=1 +autorun=1 + +[ui] +always_show_tabs=0 +max_tab_chars=32 +win_width=640 +win_height=480 +splitter_pos=150 +media_in_new_tab=0 +desktop_folder_new_win=0 +change_tab_on_drop=1 +close_on_unmount=1 +focus_previous=1 +side_pane_mode=places +view_mode=list +show_hidden=0 +sort=name;ascending; +toolbar= +show_statusbar=1 +pathbar_mode_buttons=1 diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.qalculate/qalculate-gtk.cfg b/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.qalculate/qalculate-gtk.cfg new file mode 100644 index 0000000..cc01904 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/etc/skel/.qalculate/qalculate-gtk.cfg @@ -0,0 +1,127 @@ + +[General] +version=0.9.7 +width=450 +height=400 +save_mode_on_exit=1 +save_definitions_on_exit=1 +load_global_definitions=1 +fetch_exchange_rates_at_startup=0 +wget_args=--quiet --tries=1 +show_keypad=1 +show_history=0 +show_stack=1 +rpn_keypad_only=1 +display_expression_status=1 +enable_completion=1 +use_unicode_signs=1 +lower_case_numbers=0 +lower_case_e=1 +base_display=1 +spell_out_logical_operators=1 +dot_as_separator=0 +use_custom_result_font=0 +use_custom_expression_font=0 +use_custom_status_font=0 +custom_result_font=Sans 10 +custom_expression_font=Sans 10 +custom_status_font=Sans 10 +multiplication_sign=0 +division_sign=1 +expression_history=10*20 +expression_history=d*d +expression_history=5+2/200000000000 +expression_history=5+2/200000 +expression_history=5+2/2 +expression_history=5+2/3 +history_expression=10*20 +history_parse=10 * 20 +history_result=200 +history_expression=d*d +history_parse=day * day +history_result=1 d^2 +history_expression=5+2/200000000000 +history_parse=5 + (2 ∕ 2E11) +history_result_approximate=5 +history_result_approximate=5 +history_expression=5+2/200000000000 +history_parse=5 + (2 ∕ 2E11) +history_result_approximate=5 +history_result_approximate=5 +history_result_approximate=5 +history_expression=5+2/200000000000 +history_parse=5 + (2 ∕ 2E11) +history_result_approximate=5 +history_expression=5+2/200000 +history_parse=5 + (2 ∕ 200000) +history_result=5.00001 +history_expression=5+2/2 +history_parse=5 + (2 ∕ 2) +history_result=6 +history_expression=5+2/3 +history_parse=5 + (2 ∕ 3) +history_result_approximate=5.6666667 +recent_functions= +recent_variables= +recent_units= + +[Mode] +min_deci=0 +use_min_deci=0 +max_deci=2 +use_max_deci=0 +precision=8 +min_exp=-1 +negative_exponents=0 +sort_minus_last=1 +number_fraction_format=0 +use_prefixes=1 +abbreviate_names=1 +all_prefixes_enabled=0 +denominator_prefix_enabled=1 +place_units_separately=1 +auto_post_conversion=0 +number_base=10 +number_base_expression=10 +read_precision=0 +assume_denominators_nonzero=1 +warn_about_denominators_assumed_nonzero=1 +structuring=1 +angle_unit=1 +functions_enabled=1 +variables_enabled=1 +calculate_functions=1 +calculate_variables=1 +sync_units=1 +unknownvariables_enabled=0 +units_enabled=1 +allow_complex=1 +allow_infinite=1 +indicate_infinite_series=0 +show_ending_zeroes=0 +round_halfway_to_even=0 +approximation=1 +in_rpn_mode=0 +rpn_syntax=0 +limit_implicit_multiplication=0 +spacious=1 +excessive_parenthesis=0 +short_multiplication=1 +default_assumption_type=4 +default_assumption_sign=0 + +[Plotting] +plot_legend_placement=2 +plot_style=0 +plot_smoothing=0 +plot_display_grid=1 +plot_full_border=0 +plot_min=0 +plot_max=10 +plot_step=1 +plot_sampling_rate=100 +plot_use_sampling_rate=1 +plot_variable=x +plot_rows=0 +plot_type=0 +plot_color=1 diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/etc/systemd/system/suspend.target.wants/resume_wifi.service b/linux-live/modules/slax/04-apps/rootcopy-install/etc/systemd/system/suspend.target.wants/resume_wifi.service new file mode 120000 index 0000000..528ff71 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/etc/systemd/system/suspend.target.wants/resume_wifi.service @@ -0,0 +1 @@ +/lib/systemd/system/resume_wifi.service \ No newline at end of file diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/etc/wicd/manager-settings.conf b/linux-live/modules/slax/04-apps/rootcopy-install/etc/wicd/manager-settings.conf new file mode 100644 index 0000000..b6e52cb --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/etc/wicd/manager-settings.conf @@ -0,0 +1,20 @@ +[Settings] +backend = external +always_show_wired_interface = True +use_global_dns = False +global_dns_1 = None +global_dns_2 = None +global_dns_3 = None +global_dns_dom = None +global_search_dom = None +auto_reconnect = True +debug_mode = False +wired_connect_mode = 1 +signal_display_type = 0 +should_verify_ap = 1 +dhcp_client = 0 +link_detect_tool = 0 +flush_tool = 0 +sudo_app = 0 +prefer_wired = False +show_never_connect = True diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/etc/wicd/wired-settings.conf b/linux-live/modules/slax/04-apps/rootcopy-install/etc/wicd/wired-settings.conf new file mode 100644 index 0000000..1d6ee42 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/etc/wicd/wired-settings.conf @@ -0,0 +1,16 @@ +[wired-default] +ip = None +broadcast = None +netmask = None +gateway = None +search_domain = None +dns_domain = None +dns1 = None +dns2 = None +dns3 = None +beforescript = None +afterscript = None +predisconnectscript = None +postdisconnectscript = None +encryption_enabled = None +default = True diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/bin/wicd-manager b/linux-live/modules/slax/04-apps/rootcopy-install/usr/bin/wicd-manager new file mode 100755 index 0000000..321496f --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/usr/bin/wicd-manager @@ -0,0 +1,20 @@ +#!/bin/bash + +# check if gui is runnning, if so bring it to front and do nothing more +if pgrep wicd-client; then + xdotool search --name "Wicd Network Manager" windowactivate + exit +fi + +CONF=/etc/wicd/manager-settings.conf + +# remove previously configured settings so wicd can gather fresh ones +# then run wicd gtk gui application +service wicd stop +sed -i -r "s/^wireless_interface.*=.*//" $CONF +sed -i -r "s/^wired_interface.*=.*//" $CONF +sed -i -r "s/^wpa_driver.*=.*//" $CONF +service wicd start + +# start gui client +wicd-client --no-tray diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/lib/systemd/system/resume_wifi.service b/linux-live/modules/slax/04-apps/rootcopy-install/usr/lib/systemd/system/resume_wifi.service new file mode 100644 index 0000000..627bf6d --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/usr/lib/systemd/system/resume_wifi.service @@ -0,0 +1,13 @@ +[Unit] +Description=Start wifi after resume +After=suspend.target + +[Service] +User=root +Type=oneshot +ExecStart=/usr/share/wicd/daemon/autoconnect.py +TimeoutSec=0 +StandardOutput=syslog + +[Install] +WantedBy=suspend.target diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/2pcmanfm.desktop b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/2pcmanfm.desktop new file mode 100644 index 0000000..1278327 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/2pcmanfm.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Icon=system-file-manager +Name=File Manager +GenericName=File Manager +Comment=Browse the file system and manage the files +Categories=System;FileTools;FileManager;Utility;Core;GTK; +Exec=pcmanfm %U +StartupNotify=true +Terminal=false +MimeType=inode/directory; diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/3qalculate-gtk.desktop b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/3qalculate-gtk.desktop new file mode 100644 index 0000000..afdec00 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/3qalculate-gtk.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Name=Calculator +Exec=qalculate-gtk +Icon=calculator +Terminal=false diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/4mousepad.desktop b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/4mousepad.desktop new file mode 100644 index 0000000..69aa8b4 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/4mousepad.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Text editor +Comment=Simple text editor +Exec=mousepad %f +Icon=editor +Terminal=false +Type=Application +MimeType=text/plain +Categories=GTK;Utility;TextEditor; +Keywords=text;editor; +InitialPreference=6 diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/xarchiver.desktop b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/xarchiver.desktop new file mode 100644 index 0000000..f349497 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/xarchiver.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Name=Archiver +Comment=A GTK+2 only archive manager +GenericName=Archive manager +Exec=xarchiver %f +Icon=xarchiver +Terminal=false +Type=Application +X-MultipleArgs=false +Categories=GTK;Archiving;Utility; +Keywords=GTK;archiver;frontend;compression;zip;bz2;7z;gzip;deb;rpm;arj;lzma;rar;xz; +StartupNotify=true +MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma-compressed-tar;application/x-lzma;application/x-deb;application/deb;application/x-xz;application/x-xz-compressed-tar; diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/zlxtask.desktop b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/zlxtask.desktop new file mode 100644 index 0000000..12aa220 --- /dev/null +++ b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/applications/zlxtask.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Task Manager +Comment=Manage running processes +GenericName=Process manager +Keywords=task;kill;suspend;processor;memory;monitoring;performance; +Exec=lxtask +Icon=utilities-system-monitor +Terminal=false +StartupNotify=true +Type=Application +Categories=GTK;System;Monitor; diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-documents.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-download.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-music.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-pictures.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-publicshare.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-remote.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-saved-search.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-templates.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder-videos.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/folder.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-bookmarks.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-desktop.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/16x16/places/user-home.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-documents.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-download.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-music.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-pictures.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-publicshare.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-remote.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-saved-search.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-templates.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder-videos.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/folder.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-bookmarks.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-desktop.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/22x22/places/user-home.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-documents.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-download.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-music.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-pictures.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-publicshare.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-remote.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-saved-search.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-templates.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder-videos.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/folder.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-bookmarks.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-desktop.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/24x24/places/user-home.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-documents.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-download.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-music.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-pictures.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-publicshare.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-remote.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-saved-search.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-templates.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder-videos.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/folder.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-bookmarks.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-desktop.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/32x32/places/user-home.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-documents.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-download.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-music.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-pictures.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-publicshare.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-remote.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-saved-search.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-templates.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder-videos.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/folder.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-bookmarks.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-desktop.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png new file mode 100644 index 0000000..154bb9e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/gnome/48x48/places/user-home.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png new file mode 100644 index 0000000..70a03aa Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/calculator.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png new file mode 100644 index 0000000..bfc6460 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/editor.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png new file mode 100644 index 0000000..33f9b0a Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/128x128/apps/system-file-manager.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png new file mode 100644 index 0000000..32d82e5 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/16x16/apps/system-file-manager.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png new file mode 100644 index 0000000..1a94a20 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/24x24/apps/system-file-manager.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png new file mode 100644 index 0000000..c211019 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/32x32/apps/system-file-manager.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png new file mode 100644 index 0000000..8b45025 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/48x48/apps/system-file-manager.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png new file mode 100644 index 0000000..768b352 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/calculator.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png new file mode 100644 index 0000000..4d7c2c7 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/gnome_network_workgroup.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png new file mode 100644 index 0000000..d7689e0 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/medit.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png new file mode 100644 index 0000000..aca5c1e Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/system-file-manager.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png new file mode 100644 index 0000000..f3b5041 Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/icons/hicolor/64x64/apps/utilities-system-monitor.png differ diff --git a/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/pixmaps/qalculate.png b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/pixmaps/qalculate.png new file mode 100644 index 0000000..274d1fa Binary files /dev/null and b/linux-live/modules/slax/04-apps/rootcopy-install/usr/share/pixmaps/qalculate.png differ diff --git a/linux-live/modules/slax/05-chromium/install b/linux-live/modules/slax/05-chromium/install new file mode 100644 index 0000000..3cd3090 --- /dev/null +++ b/linux-live/modules/slax/05-chromium/install @@ -0,0 +1,16 @@ +#!/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")")" + +# install packages +if [ -f $SCRIPT_DIR/$PACKAGE_VARIANT.list ]; then + $APT_CMD update >>$OUTPUT 2>&1 && + $APT_CMD install $APT_OPTIONS \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 +fi + +echo 'export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disk-cache-dir=/dev/null --disk-cache-size=1"' >>/etc/chromium.d/default-flags diff --git a/linux-live/modules/slax/05-chromium/minimal.list b/linux-live/modules/slax/05-chromium/minimal.list new file mode 100644 index 0000000..e4f291d --- /dev/null +++ b/linux-live/modules/slax/05-chromium/minimal.list @@ -0,0 +1,2 @@ +chromium +chromium-sandbox \ No newline at end of file diff --git a/linux-live/modules/slax/05-chromium/postinstall b/linux-live/modules/slax/05-chromium/postinstall new file mode 100644 index 0000000..52fafe1 --- /dev/null +++ b/linux-live/modules/slax/05-chromium/postinstall @@ -0,0 +1,4 @@ +#!/bin/bash + +rm -Rf /usr/share/applications/chromium.desktop >>$OUTPUT 2>&1 +rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 diff --git a/linux-live/modules/slax/05-chromium/standard.list b/linux-live/modules/slax/05-chromium/standard.list new file mode 100644 index 0000000..e4f291d --- /dev/null +++ b/linux-live/modules/slax/05-chromium/standard.list @@ -0,0 +1,2 @@ +chromium +chromium-sandbox \ No newline at end of file diff --git a/linux-live/modules/test/01-firmware/install b/linux-live/modules/test/01-firmware/install new file mode 100644 index 0000000..0ea3419 --- /dev/null +++ b/linux-live/modules/test/01-firmware/install @@ -0,0 +1,29 @@ +#!/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")")" + +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 + $APT_CMD install $APT_OPTIONS \ + linux-firmware firmware-b43-installer firmware-ath9k-htc >>$OUTPUT 2>&1 + else + $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 + $APT_CMD install $APT_OPTIONS \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 + fi +fi diff --git a/linux-live/modules/test/01-firmware/minimal.list b/linux-live/modules/test/01-firmware/minimal.list new file mode 100644 index 0000000..b8cb39c --- /dev/null +++ b/linux-live/modules/test/01-firmware/minimal.list @@ -0,0 +1,13 @@ +firmware-linux-free +firmware-linux-nonfree +firmware-atheros +firmware-iwlwifi +firmware-zd1211 +firmware-realtek +firmware-bnx2 +firmware-brcm80211 +firmware-cavium +firmware-ipw2x00 +firmware-libertas +firmware-ti-connectivity +firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/test/01-firmware/standard.list b/linux-live/modules/test/01-firmware/standard.list new file mode 100644 index 0000000..b8cb39c --- /dev/null +++ b/linux-live/modules/test/01-firmware/standard.list @@ -0,0 +1,13 @@ +firmware-linux-free +firmware-linux-nonfree +firmware-atheros +firmware-iwlwifi +firmware-zd1211 +firmware-realtek +firmware-bnx2 +firmware-brcm80211 +firmware-cavium +firmware-ipw2x00 +firmware-libertas +firmware-ti-connectivity +firmware-b43-installer \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/install b/linux-live/modules/test/02-xorg/install new file mode 100644 index 0000000..e685c76 --- /dev/null +++ b/linux-live/modules/test/02-xorg/install @@ -0,0 +1,33 @@ +#!/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")")" + +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 + $APT_CMD install $APT_OPTIONS \ + $(grep -vE "^\s*#" $SCRIPT_DIR/$PACKAGE_VARIANT.list | tr "\n" " ") >>$OUTPUT 2>&1 +fi + +cat </usr/lib/systemd/system/xorg.service +[Unit] +Description=X-Window +ConditionKernelCommandLine=!text +After=systemd-user-sessions.service + +[Service] +ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live + +EOF + +update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 +if [ ! -L /etc/alternatives/x-terminal-emulator ]; then + ln -s /usr/bin/xterm /etc/alternatives/x-terminal-emulator +fi diff --git a/linux-live/modules/test/02-xorg/minimal.list b/linux-live/modules/test/02-xorg/minimal.list new file mode 100644 index 0000000..5b401b4 --- /dev/null +++ b/linux-live/modules/test/02-xorg/minimal.list @@ -0,0 +1,14 @@ +xserver-xorg +xserver-xorg-video-all +xserver-xorg-video-intel +xinit +xterm +blackbox +libxcursor1 +breeze-cursor-theme +x11-utils +wmctrl +xdotool +libdrm-intel1 +libgl1-mesa-dri +libglu1-mesa \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/postinstall b/linux-live/modules/test/02-xorg/postinstall new file mode 100644 index 0000000..5358a85 --- /dev/null +++ b/linux-live/modules/test/02-xorg/postinstall @@ -0,0 +1,24 @@ +#!/bin/bash + +# Set setuid bit on xorg binary, so it can be started by guest user +chmod u+s /usr/lib/xorg/Xorg + +# use only white cursors. There were some troubles if the other cursors +# was left behind, installing gtk apps reverted the cursor from white to gray, +# so we're going to nuke it to leave only Snow cursors active. +rm -Rf /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1 +mv /usr/share/icons/Breeze_Snow /usr/share/icons/breeze_cursors >>$OUTPUT 2>&1 + +(cd /rootcopy-install && cp --parents -afr * /) + +# install x11 server utils, apt-get would add cpp dependency, bullshit! +cd /tmp +apt-get download x11-xserver-utils >>$OUTPUT 2>&1 +ls -la +dpkg -x x11-xserver-utils*.deb /tmp/x11utils >>$OUTPUT 2>&1 +cd /tmp/x11utils +cp -aR * / >>$OUTPUT 2>&1 + +rm -Rf /usr/share/icons/hicolor/256x256 >>$OUTPUT 2>&1 + +update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.Xresources b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.Xresources new file mode 100644 index 0000000..a6d2cc5 --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.Xresources @@ -0,0 +1,32 @@ +! this are Xresources to make xterm look good +! put into ~/.Xresources +! after changing contents, run xrdb -merge .Xresources +! gentoo has a bug so that it doesnt read it when X starts, so add above +! command to /etc/xfce4/xinitrc (top) and be happy. + +XTerm*termName: xterm-256color +XTerm*foreground: white +XTerm*background: rgb:22/22/22 +XTerm*cursorColor: rgb:00/ff/00 +XTerm*borderColor: black +XTerm*scrollColor: black +XTerm*visualBell: true +XTerm*saveLines: 1000 +XTerm*allowSendEvents: true +XTerm*sessionMgt: false +XTerm*scrollBar: true +XTerm*rightScrollBar: true +XTerm*eightBitInput: false +XTerm*faceName: DejaVu Sans Mono: size=9 +XTerm*boldFont: DejaVu Sans Mono Bold: size=9 +XTerm*renderFont: true +XTerm*activeIcon: true +XTerm*iconPixmap: /usr/share/icons/locolor/16x16/apps/xterm.xbm +XTerm*fullscreen: never +XTerm*selectToClipboard: true +Xft.dpi: 96 +Xft.antialias: true +Xft.hinting: true +Xft.hintstyle: hintlight +Xft.lcdfilter: lcddefault +Xft.rgba: rgb \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackbox-menu b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackbox-menu new file mode 100644 index 0000000..093ae2a --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackbox-menu @@ -0,0 +1,4 @@ +[begin] ( Menu ) + [exec] (Terminal) { xterm -ls -title Terminal } + [exit] (Exit) +[end] diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackboxrc b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackboxrc new file mode 100644 index 0000000..a39f965 --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.blackboxrc @@ -0,0 +1,6 @@ +session.screen0.toolbar.widthPercent: 100 +session.screen0.strftimeFormat: %H:%M +session.edgeSnapThreshold: 10 +session.menuFile: /root/.blackbox-menu +session.styleFile: /usr/share/blackbox/styles/Slax +session.changeWorkspaceWithMouseWheel: False diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.xinitrc b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.xinitrc new file mode 100644 index 0000000..5118998 --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/etc/skel/.xinitrc @@ -0,0 +1,2 @@ +xrdb -merge .Xresources +blackbox \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service b/linux-live/modules/test/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service new file mode 120000 index 0000000..d31ece8 --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/etc/systemd/system/display-manager.service @@ -0,0 +1 @@ +/lib/systemd/system/xorg.service \ No newline at end of file diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service b/linux-live/modules/test/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service new file mode 100644 index 0000000..3928ee8 --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/usr/lib/systemd/system/xorg.service @@ -0,0 +1,7 @@ +[Unit] +Description=X-Window +ConditionKernelCommandLine=!text +After=systemd-user-sessions.service + +[Service] +ExecStart=/bin/su --login -c "/usr/bin/startx -- :0 vt7 -ac -nolisten tcp" live diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax b/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax new file mode 100644 index 0000000..aefe9ef --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/blackbox/styles/Slax @@ -0,0 +1,79 @@ +*.appearance: flat solid + +*button.pressed.appearance: sunken solid +*button.pressed.backgroundColor: rgb:69/c1/f1 +*button.appearance: parentrelative + +*.focus.backgroundColor: rgb:69/c1/f1 +*.unfocus.backgroundColor: rgb:28/28/28 + +*font: Bitstream Vera Sans-9 + +menu.title.appearance: flat solid +menu.title.backgroundColor: rgb:69/c1/f1 +menu.title.textColor: rgb:28/28/28 +menu.title.alignment: center +menu.title.marginWidth: 6 + +menu.frame.appearance: flat gradient border +menu.frame.textColor: rgb:28/28/28 +menu.frame.foregroundColor: grey40 +menu.frame.borderColor: rgb:69/c1/f1 +menu.frame.borderWidth: 6 +menu.frame.disabledColor: darkgrey +menu.frame.alignment: left +menu.frame.marginWidth: 2 + +menu.active.appearance: flat solid border +menu.active.backgroundColor: rgb:69/c1/f1 +menu.active.borderWidth: 4 +menu.active.borderColor: rgb:69/c1/f1 +menu.active.textColor: rgb:38/38/38 + +rootCommand: bsetroot -solid rgb:77/90/aa + +slit.appearance: raised solid +slit.backgroundColor: rgb:77/90/aa +slit.marginWidth: 3 + +toolbar.appearance: flat gradient border +toolbar.alignment: center +toolbar*textColor: rgb:28/28/28 +toolbar.label.appearance: parentrelative +toolbar.clock.appearance: parentrelative +toolbar.windowLabel.appearance: parentrelative + +window.title.focus.appearance: flat solid +window.title.focus.backgroundColor: rgb:69/c1/f1 +window.title.unfocus.appearance: flat solid +window.title.unfocus.backgroundColor: rgb:d6/d6/d6 +window.title.marginWidth: 5 + +window.label.focus.appearance: parentrelative +window.label.focus.textColor: rgb:28/28/28 +window.label.unfocus.appearance: parentrelative +window.label.unfocus.textColor: rgb:28/28/28 +window.label.marginWidth: 1 + +window.button.focus.appearance: parentrelative +window.button.focus.foregroundColor: white + +window.button.unfocus.appearance: parentrelative +window.button.unfocus.foregroundColor: darkgrey + +window.handle.focus.appearance: flat solid +window.handle.focus.backgroundColor: rgb:69/c1/f1 +window.handle.unfocus.appearance: flat solid +window.handle.unfocus.backgroundColor: rgb:d6/d6/d6 + +window.grip.focus.appearance: flat solid +window.grip.focus.backgroundColor: rgb:69/c1/f1 +window.grip.unfocus.appearance: flat solid +window.grip.unfocus.backgroundColor: rgb:d6/d6/d6 + +window*alignment: center + +window.handleHeight: 7 +window.frame.borderWidth: 7 +window.frame.focus.borderColor: rgb:69/c1/f1 +window.frame.unfocus.borderColor: rgb:d6/d6/d6 diff --git a/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm b/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm new file mode 100644 index 0000000..0cd329e --- /dev/null +++ b/linux-live/modules/test/02-xorg/rootcopy-install/usr/share/icons/locolor/16x16/apps/xterm.xbm @@ -0,0 +1,6 @@ +#define command2_width 16 +#define command2_height 16 +static unsigned char command2_bits[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xe7, 0xff, 0xcf, 0xff, + 0x9f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x9f, 0xff, 0xcf, 0xff, 0xe7, 0xc1, + 0xf7, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; diff --git a/linux-live/modules/test/02-xorg/standard.list b/linux-live/modules/test/02-xorg/standard.list new file mode 100644 index 0000000..dcb6662 --- /dev/null +++ b/linux-live/modules/test/02-xorg/standard.list @@ -0,0 +1,15 @@ +xserver-xorg +xserver-xorg-video-all +xserver-xorg-video-intel +xinit +xterm +blackbox +libxcursor1 +breeze-cursor-theme +x11-utils +wmctrl +xdotool +libdrm-intel1 +libgl1-mesa-dri +libglu1-mesa +open-vm-tools-desktop \ No newline at end of file diff --git a/linux-live/unusedmodules/03-desktop/install b/linux-live/unusedmodules/03-desktop/install index 1cd7da8..dc29cdf 100644 --- a/linux-live/unusedmodules/03-desktop/install +++ b/linux-live/unusedmodules/03-desktop/install @@ -19,7 +19,7 @@ apt-get install --no-install-recommends --yes \ (cd /rootcopy && cp --parents -afr * /) -chown live:live /home/live +#chown live:live /home/live #chown -R live:live /home/live/.gtkrc-2.0 #chown -R live:live /home/live/.config -chown -R live:live /home/live \ No newline at end of file +#chown -R live:live /home/live \ No newline at end of file diff --git a/linux-live/unusedmodules/03-desktop/install2 b/linux-live/unusedmodules/03-desktop/install2 index ea20725..66ba931 100644 --- a/linux-live/unusedmodules/03-desktop/install2 +++ b/linux-live/unusedmodules/03-desktop/install2 @@ -8,11 +8,11 @@ VERSION=1.3.5 cd / # create user directories -for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do - mkdir -p /squashfs-root/home/live/$dir >>$OUTPUT 2>&1 - mkdir -p /squashfs-root/root/$dir >>$OUTPUT 2>&1 -done -chown -R live.users /squashfs-root/home/live +#for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do +# mkdir -p /squashfs-root/home/live/$dir >>$OUTPUT 2>&1 +# mkdir -p /squashfs-root/root/$dir >>$OUTPUT 2>&1 +#done +#chown -R live.users /squashfs-root/home/live # then, we want to patch it to implement window resizing! # so we will recompile whole package diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/chromium/Default/Preferences b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/chromium/Default/Preferences new file mode 100644 index 0000000..5bfddb0 --- /dev/null +++ b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/chromium/Default/Preferences @@ -0,0 +1,38 @@ +{ + "AudioCaptureAllowed": false, + "account_id_migration_state": 2, + "account_tracker_service_last_update": "13154004704520013", + "alternate_error_pages": { + "enabled": false + }, + "bookmark_bar": { + "show_on_all_tabs": false + }, + "browser": { + "check_default_browser": false, + "has_seen_welcome_page": true, + "show_home_button": false, + "window_placement": { + "bottom": 10, + "left": 10, + "maximized": true, + "right": 10, + "top": 10 + } + }, + "extensions": { + "theme": { + "use_system": true + } + }, + "ntp": { + "most_visited_blacklist": { + "c8e0afd1da1d9e29511240861f795a5a": null, + "eacc8c3ad0b50bd698ef8752d5ee24b6": null + } + }, + "safebrowsing": { + "enabled": false, + "scout_group_selected": true + } +} \ No newline at end of file diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/chromium/First Run b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/chromium/First Run new file mode 100644 index 0000000..e69de29 diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.config/volumeicon/volumeicon b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/volumeicon/volumeicon similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.config/volumeicon/volumeicon rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/volumeicon/volumeicon diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.config/xarchiver/xarchiverrc b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/xarchiver/xarchiverrc similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.config/xarchiver/xarchiverrc rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.config/xarchiver/xarchiverrc diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/apps b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/apps similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/apps rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/apps diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/fbrun_history b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/fbrun_history new file mode 100644 index 0000000..e69de29 diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/init b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/init similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/init rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/init diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/kblayout b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/kblayout similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/kblayout rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/kblayout diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/keys b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/keys similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/keys rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/keys diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/lastwallpaper b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/lastwallpaper similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/lastwallpaper rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/lastwallpaper diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/menu b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/menu similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/menu rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/menu diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/overlay b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/overlay similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/overlay rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/overlay diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/slitlist b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/slitlist new file mode 100644 index 0000000..e69de29 diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/startup b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/startup similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/home/live/.fluxbox/startup rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/startup diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/windowmenu b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/windowmenu similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.fluxbox/windowmenu rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.fluxbox/windowmenu diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.gtkrc-2.0 b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.gtkrc-2.0 similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.gtkrc-2.0 rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.gtkrc-2.0 diff --git a/linux-live/unusedmodules/03-desktop/rootcopy/root/.xinitrc b/linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.xinitrc similarity index 100% rename from linux-live/unusedmodules/03-desktop/rootcopy/root/.xinitrc rename to linux-live/unusedmodules/03-desktop/rootcopy/etc/skel/.xinitrc diff --git a/modules/03-xfce-desktop/postinstall b/modules/03-xfce-desktop/postinstall index 1989b88..411a45e 100644 --- a/modules/03-xfce-desktop/postinstall +++ b/modules/03-xfce-desktop/postinstall @@ -182,4 +182,5 @@ fi rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 + update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 diff --git a/modules/05-chromium/minimal.list b/modules/05-chromium/minimal.list index df28f7a..e4f291d 100644 --- a/modules/05-chromium/minimal.list +++ b/modules/05-chromium/minimal.list @@ -1 +1,2 @@ -palemoon \ No newline at end of file +chromium +chromium-sandbox \ No newline at end of file