diff --git a/home/live/.Xdefaults b/home/live/.Xdefaults
new file mode 100644
index 0000000..abdc96a
--- /dev/null
+++ b/home/live/.Xdefaults
@@ -0,0 +1,30 @@
+! xscreensaver ---------------------------------------------------------------
+
+!font settings
+xscreensaver.Dialog.headingFont: -*-dina-bold-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.Dialog.bodyFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.Dialog.labelFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.Dialog.unameFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.Dialog.buttonFont: -*-dina-bold-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.Dialog.dateFont: -*-dina-medium-r-*-*-10-*-*-*-*-*-*-*
+xscreensaver.passwd.passwdFont: -*-dina-bold-r-*-*-10-*-*-*-*-*-*-*
+!general dialog box (affects main hostname, username, password text)
+xscreensaver.Dialog.foreground: #EDEDED
+xscreensaver.Dialog.background: #202020
+xscreensaver.Dialog.topShadowColor: #202024
+xscreensaver.Dialog.bottomShadowColor: #202024
+xscreensaver.Dialog.Button.foreground: #EDEDFF
+xscreensaver.Dialog.Button.background: #444
+!username/password input box and date text colour
+xscreensaver.Dialog.text.foreground: #EDEDFF
+xscreensaver.Dialog.text.background: #444
+xscreensaver.Dialog.internalBorderWidth:24
+xscreensaver.Dialog.borderWidth: 0
+xscreensaver.Dialog.shadowThickness: 2
+!timeout bar (background is actually determined by Dialog.text.background)
+xscreensaver.passwd.thermometer.foreground: #A9B7C4
+xscreensaver.passwd.thermometer.background: #202020
+xscreensaver.passwd.thermometer.width: 8
+!datestamp format--see the strftime(3) manual page for details
+xscreensaver.dateFormat: %I:%M%P %a %b %d, %Y
+
diff --git a/home/live/.bashrc b/home/live/.bashrc
new file mode 100644
index 0000000..b488fcc
--- /dev/null
+++ b/home/live/.bashrc
@@ -0,0 +1,117 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+ *i*) ;;
+ *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+ debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+ xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+ if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+ # We have color support; assume it's compliant with Ecma-48
+ # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+ # a case would tend to support setf rather than setaf.)
+ color_prompt=yes
+ else
+ color_prompt=
+ fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+ PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+ PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+ PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+ ;;
+*)
+ ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+ test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+ alias ls='ls --color=auto'
+ #alias dir='dir --color=auto'
+ #alias vdir='vdir --color=auto'
+
+ alias grep='grep --color=auto'
+ alias fgrep='fgrep --color=auto'
+ alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Add an "alert" alias for long running commands. Use like so:
+# sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+ . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+ if [ -f /usr/share/bash-completion/bash_completion ]; then
+ . /usr/share/bash-completion/bash_completion
+ elif [ -f /etc/bash_completion ]; then
+ . /etc/bash_completion
+ fi
+fi
diff --git a/home/live/.config/Trolltech.conf b/home/live/.config/Trolltech.conf
new file mode 100644
index 0000000..ebabedd
--- /dev/null
+++ b/home/live/.config/Trolltech.conf
@@ -0,0 +1,5 @@
+[Qt]
+font="Noto Sans,9,-1,5,50,0,0,0,0,0"
+style=GTK+
+doubleClickInterval=400
+cursorFlashTime=1200
diff --git a/home/live/.config/dconf/user b/home/live/.config/dconf/user
new file mode 100644
index 0000000..ca3b6d4
Binary files /dev/null and b/home/live/.config/dconf/user differ
diff --git a/home/live/.config/user-dirs.dirs b/home/live/.config/user-dirs.dirs
new file mode 100644
index 0000000..7f9a959
--- /dev/null
+++ b/home/live/.config/user-dirs.dirs
@@ -0,0 +1,15 @@
+# This file is written by xdg-user-dirs-update
+# If you want to change or add directories, just edit the line you're
+# interested in. All local changes will be retained on the next run.
+# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
+# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
+# absolute path. No other format is supported.
+#
+XDG_DESKTOP_DIR="$HOME/Desktop"
+XDG_DOWNLOAD_DIR="$HOME/Downloads"
+XDG_TEMPLATES_DIR="$HOME/Templates"
+XDG_PUBLICSHARE_DIR="$HOME/Public"
+XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_MUSIC_DIR="$HOME/Music"
+XDG_PICTURES_DIR="$HOME/Pictures"
+XDG_VIDEOS_DIR="$HOME/Videos"
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-1048x809.rc b/home/live/.config/xfce4/desktop/icons.screen0-1048x809.rc
new file mode 100644
index 0000000..1f12d3c
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-1048x809.rc
@@ -0,0 +1,35 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[/home/user/Desktop/22.png]
+row=1
+col=0
+
+[/home/user/Desktop/24.png]
+row=2
+col=0
+
+[/home/user/Desktop/16.png]
+row=0
+col=0
+
+[/home/user/Desktop/32.png]
+row=3
+col=0
+
+[/home/user/Desktop/48.png]
+row=4
+col=0
+
+[/home/user/Desktop/64.png]
+row=0
+col=1
+
+[/home/user/Desktop/chrome-gbbalmjehbfiadnjnbgnndkhefcejgic-Default.desktop]
+row=2
+col=1
+
+[/home/user/Desktop/128.png]
+row=1
+col=1
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-1048x814.rc b/home/live/.config/xfce4/desktop/icons.screen0-1048x814.rc
new file mode 100644
index 0000000..c7049f3
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-1048x814.rc
@@ -0,0 +1,31 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[/home/user/Desktop/64.png]
+row=0
+col=1
+
+[/home/user/Desktop/32.png]
+row=3
+col=0
+
+[/home/user/Desktop/16.png]
+row=0
+col=0
+
+[/home/user/Desktop/22.png]
+row=1
+col=0
+
+[/home/user/Desktop/48.png]
+row=4
+col=0
+
+[/home/user/Desktop/128.png]
+row=1
+col=1
+
+[/home/user/Desktop/24.png]
+row=2
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-1156x849.rc b/home/live/.config/xfce4/desktop/icons.screen0-1156x849.rc
new file mode 100644
index 0000000..147fc70
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-1156x849.rc
@@ -0,0 +1,11 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[/home/user/Desktop/mount_fs.sh]
+row=1
+col=0
+
+[2018-01-08-14-41-11-00]
+row=0
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-1249x679.rc b/home/live/.config/xfce4/desktop/icons.screen0-1249x679.rc
new file mode 100644
index 0000000..147fc70
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-1249x679.rc
@@ -0,0 +1,11 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[/home/user/Desktop/mount_fs.sh]
+row=1
+col=0
+
+[2018-01-08-14-41-11-00]
+row=0
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-1561x959.rc b/home/live/.config/xfce4/desktop/icons.screen0-1561x959.rc
new file mode 100644
index 0000000..a87813d
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-1561x959.rc
@@ -0,0 +1,7 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2020-08-03-08-53-04-00]
+row=0
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-2203x1133.rc b/home/live/.config/xfce4/desktop/icons.screen0-2203x1133.rc
new file mode 100644
index 0000000..9943512
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-2203x1133.rc
@@ -0,0 +1,19 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2020-08-03-08-53-04-00]
+row=0
+col=0
+
+[Корзина]
+row=1
+col=0
+
+[/]
+row=2
+col=0
+
+[/home/user]
+row=3
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-2203x1231.rc b/home/live/.config/xfce4/desktop/icons.screen0-2203x1231.rc
new file mode 100644
index 0000000..a87813d
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-2203x1231.rc
@@ -0,0 +1,7 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2020-08-03-08-53-04-00]
+row=0
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-2203x1239.rc b/home/live/.config/xfce4/desktop/icons.screen0-2203x1239.rc
new file mode 100644
index 0000000..03e8607
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-2203x1239.rc
@@ -0,0 +1,7 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2018-01-08-14-41-11-00]
+row=0
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-2203x1246.rc b/home/live/.config/xfce4/desktop/icons.screen0-2203x1246.rc
new file mode 100644
index 0000000..9943512
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-2203x1246.rc
@@ -0,0 +1,19 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2020-08-03-08-53-04-00]
+row=0
+col=0
+
+[Корзина]
+row=1
+col=0
+
+[/]
+row=2
+col=0
+
+[/home/user]
+row=3
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-2203x1247.rc b/home/live/.config/xfce4/desktop/icons.screen0-2203x1247.rc
new file mode 100644
index 0000000..9943512
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-2203x1247.rc
@@ -0,0 +1,19 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2020-08-03-08-53-04-00]
+row=0
+col=0
+
+[Корзина]
+row=1
+col=0
+
+[/]
+row=2
+col=0
+
+[/home/user]
+row=3
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-784x551.rc b/home/live/.config/xfce4/desktop/icons.screen0-784x551.rc
new file mode 100644
index 0000000..147fc70
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-784x551.rc
@@ -0,0 +1,11 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[/home/user/Desktop/mount_fs.sh]
+row=1
+col=0
+
+[2018-01-08-14-41-11-00]
+row=0
+col=0
+
diff --git a/home/live/.config/xfce4/desktop/icons.screen0-784x559.rc b/home/live/.config/xfce4/desktop/icons.screen0-784x559.rc
new file mode 100644
index 0000000..9943512
--- /dev/null
+++ b/home/live/.config/xfce4/desktop/icons.screen0-784x559.rc
@@ -0,0 +1,19 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2020-08-03-08-53-04-00]
+row=0
+col=0
+
+[Корзина]
+row=1
+col=0
+
+[/]
+row=2
+col=0
+
+[/home/user]
+row=3
+col=0
+
diff --git a/home/live/.config/xfce4/helpers.rc b/home/live/.config/xfce4/helpers.rc
new file mode 100644
index 0000000..fc0f325
--- /dev/null
+++ b/home/live/.config/xfce4/helpers.rc
@@ -0,0 +1 @@
+WebBrowser=google-chrome
\ No newline at end of file
diff --git a/home/live/.config/xfce4/panel/launcher-19/16093657651.desktop b/home/live/.config/xfce4/panel/launcher-19/16093657651.desktop
new file mode 100644
index 0000000..19e8d6c
--- /dev/null
+++ b/home/live/.config/xfce4/panel/launcher-19/16093657651.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch FileManager %u
+Icon=system-file-manager
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=inode/directory;x-scheme-handler/trash;
+Name=File Manager
+Name[ru]=Файловый менеджер
+Comment=Browse the file system
+Comment[ru]=Просмотреть файловую систему
+X-XFCE-Source=file:///usr/share/applications/exo-file-manager.desktop
diff --git a/home/live/.config/xfce4/panel/launcher-23/16093659533.desktop b/home/live/.config/xfce4/panel/launcher-23/16093659533.desktop
new file mode 100644
index 0000000..0298d34
--- /dev/null
+++ b/home/live/.config/xfce4/panel/launcher-23/16093659533.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch WebBrowser %u
+Icon=web-browser
+StartupNotify=true
+Terminal=false
+Categories=Network;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https;
+Name=Web Browser
+Name[ru]=Веб-браузер
+Comment=Browse the web
+Comment[ru]=Смотреть в Интернете
+X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop
+Path=
diff --git a/home/live/.config/xfce4/panel/launcher-24/16093659584.desktop b/home/live/.config/xfce4/panel/launcher-24/16093659584.desktop
new file mode 100644
index 0000000..2034e66
--- /dev/null
+++ b/home/live/.config/xfce4/panel/launcher-24/16093659584.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch TerminalEmulator
+Icon=utilities-terminal
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+Name=Terminal Emulator
+Name[ru]=Эмулятор терминала
+Comment=Use the command line
+Comment[ru]=Использовать командную строку
+X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop
diff --git a/home/live/.config/xfce4/panel/whiskermenu-1.rc b/home/live/.config/xfce4/panel/whiskermenu-1.rc
new file mode 100644
index 0000000..b80c96c
--- /dev/null
+++ b/home/live/.config/xfce4/panel/whiskermenu-1.rc
@@ -0,0 +1,68 @@
+favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop
+recent=
+button-title=Applications Menu
+button-icon=xubuntu-logo-menu
+button-single-row=false
+show-button-title=false
+show-button-icon=true
+launcher-show-name=true
+launcher-show-description=false
+launcher-show-tooltip=true
+item-icon-size=2
+hover-switch-category=false
+category-show-name=true
+category-icon-size=1
+load-hierarchy=true
+recent-items-max=10
+favorites-in-recent=true
+display-recent-default=false
+position-search-alternate=true
+position-commands-alternate=false
+position-categories-alternate=false
+menu-width=400
+menu-height=500
+menu-opacity=100
+command-settings=xfce4-settings-manager
+show-command-settings=true
+command-lockscreen=xflock4
+show-command-lockscreen=true
+command-switchuser=dm-tool switch-to-greeter
+show-command-switchuser=false
+command-logout=xfce4-session-logout
+show-command-logout=true
+command-menueditor=menulibre
+show-command-menueditor=true
+command-profile=mugshot
+show-command-profile=true
+search-actions=5
+
+[action0]
+name=Man-страницы
+pattern=#
+command=exo-open --launch TerminalEmulator man %s
+regex=false
+
+[action1]
+name=Web-поиск
+pattern=?
+command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
+regex=false
+
+[action2]
+name=Википедия
+pattern=!w
+command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
+regex=false
+
+[action3]
+name=Выполнить в терминале
+pattern=!
+command=exo-open --launch TerminalEmulator %s
+regex=false
+
+[action4]
+name=Открыть URI
+pattern=^(file|http|https):\\/\\/(.*)$
+command=exo-open \\0
+regex=true
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
new file mode 100644
index 0000000..d779138
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
new file mode 100644
index 0000000..9fd09d6
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
new file mode 100644
index 0000000..c6778b6
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
new file mode 100644
index 0000000..a1544c8
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
new file mode 100644
index 0000000..88de0ff
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
new file mode 100644
index 0000000..ccb5895
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
new file mode 100644
index 0000000..38aef24
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
new file mode 100644
index 0000000..e778356
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
new file mode 100644
index 0000000..641c0b9
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
new file mode 100644
index 0000000..109c63f
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
new file mode 100644
index 0000000..3e0f196
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
new file mode 100644
index 0000000..848d648
--- /dev/null
+++ b/home/live/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/home/live/.gnupg/pubring.kbx b/home/live/.gnupg/pubring.kbx
new file mode 100644
index 0000000..e868a83
Binary files /dev/null and b/home/live/.gnupg/pubring.kbx differ
diff --git a/home/live/.gnupg/trustdb.gpg b/home/live/.gnupg/trustdb.gpg
new file mode 100644
index 0000000..2349aa1
Binary files /dev/null and b/home/live/.gnupg/trustdb.gpg differ
diff --git a/home/live/.local/share/keyrings/default b/home/live/.local/share/keyrings/default
new file mode 100644
index 0000000..5404b0b
--- /dev/null
+++ b/home/live/.local/share/keyrings/default
@@ -0,0 +1 @@
+Связка_ключей_по_умолчанию
\ No newline at end of file
diff --git a/home/live/.local/share/keyrings/user.keystore b/home/live/.local/share/keyrings/user.keystore
new file mode 100644
index 0000000..8a52318
Binary files /dev/null and b/home/live/.local/share/keyrings/user.keystore differ
diff --git a/home/live/.local/share/keyrings/Связка_ключей_по_умолчанию.keyring b/home/live/.local/share/keyrings/Связка_ключей_по_умолчанию.keyring
new file mode 100644
index 0000000..7d0727b
--- /dev/null
+++ b/home/live/.local/share/keyrings/Связка_ключей_по_умолчанию.keyring
@@ -0,0 +1,40 @@
+[keyring]
+display-name=Связка ключей по умолчанию
+ctime=1609546770
+mtime=0
+lock-on-idle=false
+lock-after=false
+
+[2]
+item-type=0
+display-name=Chromium Safe Storage
+secret=Zh/EgdOG9N/CLKfdPvmBvg==
+mtime=1609546770
+ctime=1609546770
+
+[2:attribute0]
+name=application
+type=string
+value=chromium
+
+[2:attribute1]
+name=xdg:schema
+type=string
+value=chrome_libsecret_os_crypt_password_v2
+
+[1]
+item-type=0
+display-name=Chrome Safe Storage Control
+secret=The meaning of life
+mtime=1609546770
+ctime=1609546770
+
+[1:attribute0]
+name=explanation
+type=string
+value=Because of quirks in the gnome libsecret API, Chrome needs to store a dummy entry to guarantee that this keyring was properly unlocked. More details at http://crbug.com/660005.
+
+[1:attribute1]
+name=xdg:schema
+type=string
+value=_chrome_dummy_schema_for_unlocking
diff --git a/home/live/.pki/nssdb/cert9.db b/home/live/.pki/nssdb/cert9.db
new file mode 100644
index 0000000..98a54bd
Binary files /dev/null and b/home/live/.pki/nssdb/cert9.db differ
diff --git a/home/live/.pki/nssdb/key4.db b/home/live/.pki/nssdb/key4.db
new file mode 100644
index 0000000..1cebeeb
Binary files /dev/null and b/home/live/.pki/nssdb/key4.db differ
diff --git a/home/live/.pki/nssdb/pkcs11.txt b/home/live/.pki/nssdb/pkcs11.txt
new file mode 100644
index 0000000..a2d7af2
--- /dev/null
+++ b/home/live/.pki/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:/home/live/.pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags=optimizeSpace updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription=''
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/home/live/.profile b/home/live/.profile
new file mode 100644
index 0000000..d89ea5a
--- /dev/null
+++ b/home/live/.profile
@@ -0,0 +1,27 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+ # include .bashrc if it exists
+ if [ -f "$HOME/.bashrc" ]; then
+ . "$HOME/.bashrc"
+ fi
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+ PATH="$HOME/bin:$PATH"
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+ PATH="$HOME/.local/bin:$PATH"
+fi
diff --git a/home/live/.xscreensaver b/home/live/.xscreensaver
new file mode 100644
index 0000000..e4c7ad3
--- /dev/null
+++ b/home/live/.xscreensaver
@@ -0,0 +1,2 @@
+mode: blank
+
diff --git a/linux-live/bootfiles/boot/grub/grub.cfg b/linux-live/bootfiles/boot/grub/grub.cfg
index aefbd8e..2c748d5 100644
--- a/linux-live/bootfiles/boot/grub/grub.cfg
+++ b/linux-live/bootfiles/boot/grub/grub.cfg
@@ -6,12 +6,13 @@ insmod efi_gop
insmod efi_uga
insmod gfxterm
terminal_output gfxterm
-set color_normal=white/black
+set color_normal=black/black
set color_highlight=black/white
loadfont /boot/grub/unicode.pf2
background_image /boot/grub/bootlogo.png
set default_settings="load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 apparmor=0 net.ifnames=0 biosdevname=0"
+set perch_settings="slax.flags=perch,automount"
set live_settings="slax.flags=automount"
set ram_settings="slax.flags=toram"
set debug_settings="load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0 debug net.ifnames=0 biosdevname=0"
@@ -23,7 +24,7 @@ set message="Загружаем ядро и рамдиск... Подождите
menuentry "Запуск MiniOS с сохранением изменений"{
echo $message
search --set -f $linux_64
- linux $linux_64 $default_settings
+ linux $linux_64 $default_settings $perch_settings
initrd $initrd_img
}
menuentry "Запуск MiniOS в чистом режиме"{
diff --git a/linux-live/bootfiles/boot/syslinux/bootlogo.png b/linux-live/bootfiles/boot/syslinux/bootlogo.png
index 134fa74..f3175f4 100644
Binary files a/linux-live/bootfiles/boot/syslinux/bootlogo.png and b/linux-live/bootfiles/boot/syslinux/bootlogo.png differ
diff --git a/linux-live/bootfiles/boot/syslinux/syslinux.cfg b/linux-live/bootfiles/boot/syslinux/syslinux.cfg
index f829563..b45bd82 100644
--- a/linux-live/bootfiles/boot/syslinux/syslinux.cfg
+++ b/linux-live/bootfiles/boot/syslinux/syslinux.cfg
@@ -2,20 +2,21 @@ FONT 866_8x16.psf
DEFAULT vesamenu.c32
PROMPT 0
TIMEOUT 90
+ALLOWOPTIONS 0
ONTIMEOUT default
MENU BACKGROUND bootlogo.png
MENU COLOR border 30;44 #00000000 #00000000 none
-MENU COLOR unsel 37;44 #90ffffff #00000000 std
-MENU COLOR sel 7;37;40 #ffffffff #99006693 all
+MENU COLOR unsel 37;44 #901E1E1E #00000000 std
+MENU COLOR sel 7;37;40 #ff1E1E1E #99006693 all
MENU COLOR hotsel 1;7;37;40 #55555555 #99006693 all
LABEL default
MENU LABEL MiniOS ࠭
KERNEL /minios/boot/vmlinuz
-APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 apparmor=0 net.ifnames=0 biosdevname=0
+APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=perch,automount apparmor=0 net.ifnames=0 biosdevname=0
-LABEL perch
+LABEL live
MENU LABEL MiniOS ⮬ ०
KERNEL /minios/boot/vmlinuz
APPEND vga=normal initrd=/minios/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 slax.flags=automount apparmor=0 net.ifnames=0 biosdevname=0
diff --git a/linux-live/buildconfig b/linux-live/buildconfig
old mode 100644
new mode 100755
index dd6ed21..fd5b950
--- a/linux-live/buildconfig
+++ b/linux-live/buildconfig
@@ -26,4 +26,6 @@ DEBIAN_FRONTEND_TYPE="noninteractive"
APT_CMD="apt-get"
-APT_OPTIONS="-y" #--no-install-recommends"
\ No newline at end of file
+APT_OPTIONS="-y" #--no-install-recommends"
+
+LIVE_TYPE="ubuntu"
\ No newline at end of file
diff --git a/linux-live/minioslib b/linux-live/minioslib
index bb06fd6..085db61 100644
--- a/linux-live/minioslib
+++ b/linux-live/minioslib
@@ -618,29 +618,134 @@ function build_live() {
remove_log_file
- copy_build_scripts
+ if [ LIVE_TYPE = "linux-live" ]; then
+ copy_build_scripts
- check_build_dir
+ check_build_dir
- chroot $BUILD_DIR mount none -t proc /proc
- : 'chroot $BUILD_DIR /bin/bash -x <$PARENT_DIR/image/install/memtest86
+ rm -f $PARENT_DIR/image/install/memtest86-usb.zip
+
+ # grub
+ touch $PARENT_DIR/image/ubuntu
+ cat <$PARENT_DIR/image/isolinux/grub.cfg
+search --set=root --file /ubuntu
+insmod all_video
+set default="0"
+set timeout=30
+menuentry "Try $SYSTEMNAME without installing" {
+ linux /casper/vmlinuz boot=casper nopersistent toram quiet splash ---
+ initrd /casper/initrd
+}
+menuentry "Install $SYSTEMNAME" {
+ linux /casper/vmlinuz boot=casper only-ubiquity quiet splash ---
+ initrd /casper/initrd
+}
+menuentry "Check disc for defects" {
+ linux /casper/vmlinuz boot=casper integrity-check quiet splash ---
+ initrd /casper/initrd
+}
+menuentry "Test memory Memtest86+ (BIOS)" {
+ linux16 /install/memtest86+
+}
+menuentry "Test memory Memtest86 (UEFI, long load time)" {
+ insmod part_gpt
+ insmod search_fs_uuid
+ insmod chain
+ loopback loop /install/memtest86
+ chainloader (loop,gpt1)/efi/boot/BOOTX64.efi
+}
+EOF
+ # generate manifest
+ sudo chroot $BUILD_DIR dpkg-query -W --showformat='${Package} ${Version}\n' | sudo tee $PARENT_DIR/image/casper/filesystem.manifest
+ sudo cp -v $PARENT_DIR/image/casper/filesystem.manifest $PARENT_DIR/image/casper/filesystem.manifest-desktop
+ sudo sed -i '/ubiquity/d' $PARENT_DIR/image/casper/filesystem.manifest-desktop
+ sudo sed -i '/casper/d' $PARENT_DIR/image/casper/filesystem.manifest-desktop
+ sudo sed -i '/discover/d' $PARENT_DIR/image/casper/filesystem.manifest-desktop
+ sudo sed -i '/laptop-detect/d' $PARENT_DIR/image/casper/filesystem.manifest-desktop
+ sudo sed -i '/os-prober/d' $PARENT_DIR/image/casper/filesystem.manifest-desktop
+
+ # compress rootfs
+ sudo mksquashfs $BUILD_DIR $PARENT_DIR/image/casper/filesystem.squashfs -noappend -comp lz4 -b 1048576
+ printf $(sudo du -sx --block-size=1 $BUILD_DIR | cut -f1) >$PARENT_DIR/image/casper/filesystem.size
+
+ # create diskdefines
+ cat <$PARENT_DIR/image/README.diskdefines
+#define DISKNAME $SYSTEMNAME $VER
+#define TYPE binary
+#define TYPEbinary 1
+#define ARCH $DISTRIBUTION_ARCH
+#define ARCH$DISTRIBUTION_ARCH 1
+#define DISKNUM 1
+#define DISKNUM1 1
+#define TOTALNUM 0
+#define TOTALNUM0 1
+EOF
+
+ # create iso image
+ pushd $PARENT_DIR/image
+ grub-mkstandalone \
+ --format=x86_64-efi \
+ --output=isolinux/bootx64.efi \
+ --locales="" \
+ --fonts="" \
+ "boot/grub/grub.cfg=isolinux/grub.cfg"
+
+ (
+ cd isolinux &&
+ dd if=/dev/zero of=efiboot.img bs=1M count=10 &&
+ sudo mkfs.vfat efiboot.img &&
+ LC_CTYPE=C mmd -i efiboot.img efi efi/boot &&
+ LC_CTYPE=C mcopy -i efiboot.img ./bootx64.efi ::efi/boot/
+ )
+
+ grub-mkstandalone \
+ --format=i386-pc \
+ --output=isolinux/core.img \
+ --install-modules="linux16 linux normal iso9660 biosdisk memdisk search tar ls" \
+ --modules="linux16 linux normal iso9660 biosdisk search" \
+ --locales="" \
+ --fonts="" \
+ "boot/grub/grub.cfg=isolinux/grub.cfg"
+
+ cat /usr/lib/grub/i386-pc/cdboot.img isolinux/core.img >isolinux/bios.img
+
+ sudo /bin/bash -c "(find . -type f -print0 | xargs -0 md5sum | grep -v -e 'md5sum.txt' -e 'bios.img' -e 'efiboot.img' > md5sum.txt)"
+
+ popd
+ fi
}
function build_iso() {
@@ -652,77 +757,108 @@ function build_iso() {
fi
fi
- copy_build_scripts
-
check_build_dir
- if [ "$UNATTENDED" = "1" ]; then
- BUILD_DIR="/build/$DISTRIBUTION"
- fi
- if [ "$BUILD_DIR" = "" ]; then
- LAST_BUILD_DIR=$(cat "$SCRIPT_DIR/.build_dir") >>$OUTPUT 2>&1
- BUILD_DIR=$LAST_BUILD_DIR
- fi
- LIVEKITDATA=$(cat $BUILD_DIR/tmp/livekitdata)
- cd $BUILD_DIR$LIVEKITDATA
- if [ ! -d $ISO_DIR ]; then
- mkdir -p $ISO_DIR
- fi
+ if [ LIVE_TYPE = "linux-live" ]; then
+
+ copy_build_scripts
+
+ if [ "$UNATTENDED" = "1" ]; then
+ BUILD_DIR="/build/$DISTRIBUTION"
+ fi
+ if [ "$BUILD_DIR" = "" ]; then
+ LAST_BUILD_DIR=$(cat "$SCRIPT_DIR/.build_dir") >>$OUTPUT 2>&1
+ BUILD_DIR=$LAST_BUILD_DIR
+ fi
+ LIVEKITDATA=$(cat $BUILD_DIR/tmp/livekitdata)
+ cd $BUILD_DIR$LIVEKITDATA
+ if [ ! -d $ISO_DIR ]; then
+ mkdir -p $ISO_DIR
+ fi
- mkdir -p $ISO_DIR >>$OUTPUT 2>&1
- VER=$SYSTEMVER
- DATE=$(date +%Y%m%d_%H%M)
+ mkdir -p $ISO_DIR >>$OUTPUT 2>&1
+ VER=$SYSTEMVER
+ DATE=$(date +%Y%m%d_%H%M)
- DIR=$BUILD_DIR$LIVEKITDATA
- ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso
+ DIR=$BUILD_DIR$LIVEKITDATA
+ ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso
- B="-b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat"
- C="-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot"
- # ▼ должно быть только перенаправление ошибки!
- if [ -x "$(which xorriso 2>>$OUTPUT)" ]; then
- M="xorriso -as mkisofs -isohybrid-mbr $DIR/boot/syslinux/isohdpfx.bin"
- D=" -isohybrid-gpt-basdat -e"
+ B="-b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat"
+ C="-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot"
# ▼ должно быть только перенаправление ошибки!
- elif [ -x "$(which genisoimage 2>>$OUTPUT)" ]; then
- M=genisoimage
- D="-efi-boot"
- else
- M=mkisofs
- D="-eltorito-platform 0xEF -eltorito-boot"
- fi
+ if [ -x "$(which xorriso 2>>$OUTPUT)" ]; then
+ M="xorriso -as mkisofs -isohybrid-mbr $DIR/boot/syslinux/isohdpfx.bin"
+ D=" -isohybrid-gpt-basdat -e"
+ # ▼ должно быть только перенаправление ошибки!
+ elif [ -x "$(which genisoimage 2>>$OUTPUT)" ]; then
+ M=genisoimage
+ D="-efi-boot"
+ else
+ M=mkisofs
+ D="-eltorito-platform 0xEF -eltorito-boot"
+ fi
- E="EFI/boot/efiboot.img -no-emul-boot"
+ E="EFI/boot/efiboot.img -no-emul-boot"
- VER="$SYSTEMNAME $VER"
+ VER="$SYSTEMNAME $VER"
- if [ REMOVE_OLD_ISO = "1" ]; then
- rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-*.iso >>$OUTPUT 2>&1
- fi
+ if [ REMOVE_OLD_ISO = "1" ]; then
+ rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-*.iso >>$OUTPUT 2>&1
+ fi
- if
- ! $M -hide-rr-moved -f -r -J -l -V "$VER" -A "$VER" \
- $B $C $D $E -o $ISO $DIR
- then
- exit 1
- fi
+ if
+ ! $M -hide-rr-moved -f -r -J -l -V "$VER" -A "$VER" \
+ $B $C $D $E -o $ISO $DIR
+ then
+ exit 1
+ fi
- echo ">>> $ISO created"
+ echo ">>> $ISO created"
- # xorriso has hybridization built-in
- if [ "$(echo $M | cut -d" " -f1)" != "xorriso" ]; then
- # ▼ должно быть только перенаправление ошибки!
- if [ -x "$(which isohybrid 2>>$OUTPUT)" ]; then
- isohybrid -uefi $ISO
- else
- echo ">>> No isohybrid to hybridize this ISO"
+ # xorriso has hybridization built-in
+ if [ "$(echo $M | cut -d" " -f1)" != "xorriso" ]; then
+ # ▼ должно быть только перенаправление ошибки!
+ if [ -x "$(which isohybrid 2>>$OUTPUT)" ]; then
+ isohybrid -uefi $ISO
+ else
+ echo ">>> No isohybrid to hybridize this ISO"
+ fi
fi
- fi
- if [ $BUILD_TEST_ISO = "1" ]; then
- if cp -f $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then
- echo ">>> $ISO_DIR/$LIVEKITNAME.iso created"
+ if [ $BUILD_TEST_ISO = "1" ]; then
+ if cp -f $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then
+ echo ">>> $ISO_DIR/$LIVEKITNAME.iso created"
+ fi
fi
+ exit 0
+ elif [ LIVE_TYPE = "ubuntu" ]; then
+ VER=$SYSTEMVER
+ DATE=$(date +%Y%m%d_%H%M)
+ ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso
+ cd $BUILD_DIR/image
+ sudo xorriso \
+ -as mkisofs \
+ -iso-level 3 \
+ -full-iso9660-filenames \
+ -volid "$SYSTEMNAME $VER" \
+ -eltorito-boot boot/grub/bios.img \
+ -no-emul-boot \
+ -boot-load-size 4 \
+ -boot-info-table \
+ --eltorito-catalog boot/grub/boot.cat \
+ --grub2-boot-info \
+ --grub2-mbr /usr/lib/grub/i386-pc/boot_hybrid.img \
+ -eltorito-alt-boot \
+ -e EFI/efiboot.img \
+ -no-emul-boot \
+ -append_partition 2 0xef isolinux/efiboot.img \
+ -output "$ISO" \
+ -m "isolinux/efiboot.img" \
+ -m "isolinux/bios.img" \
+ -graft-points \
+ "/EFI/efiboot.img=isolinux/efiboot.img" \
+ "/boot/grub/bios.img=isolinux/bios.img" \
+ "."
fi
- exit 0
}
# =================================================================
diff --git a/linux-live/modules/02-xorg/build b/linux-live/modules/02-xorg/build
old mode 100644
new mode 100755
index e23eab4..3bbf026
--- a/linux-live/modules/02-xorg/build
+++ b/linux-live/modules/02-xorg/build
@@ -2,8 +2,14 @@
apt-get update
apt-get install -y \
- xorg
+ xorg \
xterm \
- blackbox
+ blackbox \
+ nodm
+
+sed -i "s,NODM_USER=root,NODM_USER=live,g" /run/initramfs/memory/changes/etc/default/nodm
+rm -rf /run/initramfs/memory/changes/etc/ssh
+rm -f /run/initramfs/memory/changes/etc/machine-id
+rm -rf /run/initramfs/memory/changes/root
savechanges /02-xorg.sb
\ No newline at end of file
diff --git a/linux-live/modules/03-desktop/install b/linux-live/modules/03-desktop/install
new file mode 100644
index 0000000..038ef20
--- /dev/null
+++ b/linux-live/modules/03-desktop/install
@@ -0,0 +1 @@
+catfish engrampa mousepad blueman ristretto onboard gigolo gparted xfce4-taskmanager language-pack-gnome-en language-pack-gnome-ru
\ No newline at end of file
diff --git a/linux-live/pkglists/hostreq.list b/linux-live/pkglists/hostreq.list
index 9b09c87..adf7096 100644
--- a/linux-live/pkglists/hostreq.list
+++ b/linux-live/pkglists/hostreq.list
@@ -1,4 +1,9 @@
# Приложения, необходимые хостовой системе для сборки.
sudo
+binutils
debootstrap
-xorriso
\ No newline at end of file
+squashfs-tools
+xorriso
+grub-pc-bin
+grub-efi-amd64-bin
+mtools
\ No newline at end of file
diff --git a/linux-live/pkglists/other.list b/linux-live/pkglists/other.list
index c594054..0789ce7 100644
--- a/linux-live/pkglists/other.list
+++ b/linux-live/pkglists/other.list
@@ -5,4 +5,8 @@ openssh-server
squashfs-tools
# без этого ▼ пакета нельзя будет пересобрать запущенную систему
xorriso
-mc
\ No newline at end of file
+mc
+htop
+ncdu
+open-vm-tools
+#tasksel
\ No newline at end of file
diff --git a/linux-live/pkglists/ubuntu.list b/linux-live/pkglists/ubuntu.list
new file mode 100644
index 0000000..4711871
--- /dev/null
+++ b/linux-live/pkglists/ubuntu.list
@@ -0,0 +1,17 @@
+casper
+lupin-casper
+discover
+laptop-detect
+os-prober
+network-manager
+resolvconf
+net-tools
+wireless-tools
+ubiquity
+ubiquity-casper
+#ubiquity-frontend-gtk
+#ubiquity-slideshow-ubuntu
+#ubiquity-ubuntu-artwork
+#plymouth-theme-ubuntu-logo
+#ubuntu-gnome-desktop
+#ubuntu-gnome-wallpapers
\ No newline at end of file