diff --git a/autoinstall b/autoinstall index f7400c0..0d62f03 100755 --- a/autoinstall +++ b/autoinstall @@ -19,7 +19,7 @@ set -u # don't change! use ./install instead UNATTENDED="1" -CMD=(setup_host build_bootstrap build_chroot build_live build_modules_chroot build_modules_live build_iso) +CMD=(setup_host build_bootstrap build_chroot build_live build_modules_chroot build_iso) # ============= main ================ diff --git a/install b/install index eb24258..8d0d7c6 100755 --- a/install +++ b/install @@ -19,7 +19,7 @@ set -u # don't change! use ./autoinstall instead UNATTENDED="0" -CMD=(setup_host build_bootstrap build_chroot build_live build_modules_chroot build_modules_live build_iso) +CMD=(setup_host build_bootstrap build_chroot build_live build_modules_chroot build_iso) # ============= main ================ diff --git a/linux-live/aptsources/bullseye.list b/linux-live/aptsources/bullseye.list new file mode 100644 index 0000000..f7232e8 --- /dev/null +++ b/linux-live/aptsources/bullseye.list @@ -0,0 +1,5 @@ +deb http://deb.debian.org/debian/ bullseye main +deb-src http://deb.debian.org/debian/ bullseye main + +deb http://security.debian.org/debian-security bullseye-security main +deb-src http://security.debian.org/debian-security bullseye-security main diff --git a/linux-live/basesystem/01-casper/install b/linux-live/basesystem/01-casper/install deleted file mode 100644 index 637d470..0000000 --- a/linux-live/basesystem/01-casper/install +++ /dev/null @@ -1,16 +0,0 @@ -#!/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.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.list | tr "\n" " ") >>$OUTPUT 2>&1 -fi diff --git a/linux-live/basesystem/01-casper/package.list b/linux-live/basesystem/01-casper/package.list deleted file mode 100644 index bfab0fd..0000000 --- a/linux-live/basesystem/01-casper/package.list +++ /dev/null @@ -1,17 +0,0 @@ -# since we work without modules, we install everything in one file -# main -casper -lupin-casper -discover -laptop-detect -os-prober -network-manager -net-tools -wireless-tools -# gui -xubuntu-core^ -ubiquity -ubiquity-casper -ubiquity-frontend-gtk -ubiquity-slideshow-xubuntu -ubiquity-ubuntu-artwork \ No newline at end of file diff --git a/linux-live/basesystem/01-casper/rootcopy/etc/casper.conf b/linux-live/basesystem/01-casper/rootcopy/etc/casper.conf deleted file mode 100644 index ae7dde1..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/casper.conf +++ /dev/null @@ -1,14 +0,0 @@ -# This file should go in /etc/casper.conf -# Supported variables are: -# USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM, FLAVOUR - -export USERNAME="live" -export USERFULLNAME="Live session user" -export HOST="minios" -export BUILD_SYSTEM="Ubuntu" - -# USERNAME and HOSTNAME as specified above won't be honoured and will be set to -# flavour string acquired at boot time, unless you set FLAVOUR to any -# non-empty string. - -# export FLAVOUR="Ubuntu" diff --git a/linux-live/basesystem/01-casper/rootcopy/etc/issue b/linux-live/basesystem/01-casper/rootcopy/etc/issue deleted file mode 100644 index 7e33ac0..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/issue +++ /dev/null @@ -1,2 +0,0 @@ -Welcome to MiniOS! \n \l - diff --git a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/helpers.rc b/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/helpers.rc deleted file mode 100644 index fc0f325..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/helpers.rc +++ /dev/null @@ -1 +0,0 @@ -WebBrowser=google-chrome \ No newline at end of file diff --git a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop b/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop deleted file mode 100644 index 19e8d6c..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[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/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop b/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop deleted file mode 100644 index 0298d34..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[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/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop b/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop deleted file mode 100644 index 2034e66..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[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/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc deleted file mode 100644 index f0539a5..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc +++ /dev/null @@ -1,68 +0,0 @@ -favorites=ubiquity.desktop -recent= -button-title=Applications Menu -button-icon=MiniOS-white -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/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 38aef24..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linux-live/basesystem/01-casper/rootcopy/etc/timezone b/linux-live/basesystem/01-casper/rootcopy/etc/timezone deleted file mode 100644 index b1f078f..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/etc/timezone +++ /dev/null @@ -1 +0,0 @@ -Europe/Moscow \ No newline at end of file diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/backgrounds/MiniOS.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/backgrounds/MiniOS.png deleted file mode 100644 index 5716d76..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/backgrounds/MiniOS.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/pixmaps/MiniOS-white.svg b/linux-live/basesystem/01-casper/rootcopy/usr/share/pixmaps/MiniOS-white.svg deleted file mode 100644 index ca13046..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/usr/share/pixmaps/MiniOS-white.svg +++ /dev/null @@ -1,149 +0,0 @@ - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/default.plymouth b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/default.plymouth deleted file mode 120000 index b251b32..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/default.plymouth +++ /dev/null @@ -1 +0,0 @@ -/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth \ No newline at end of file diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/details/details.plymouth b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/details/details.plymouth deleted file mode 100644 index bd84964..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/details/details.plymouth +++ /dev/null @@ -1,4 +0,0 @@ -[Plymouth Theme] -Name=Details -Description=Verbose fallback theme -ModuleName=details diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/fsck-fade.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/fsck-fade.png deleted file mode 100644 index 3ef161a..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/fsck-fade.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/fsck-fade_16bit.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/fsck-fade_16bit.png deleted file mode 100644 index 3ada9e0..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/fsck-fade_16bit.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/logo.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/logo.png deleted file mode 100644 index cb8af2d..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/logo.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/logo_16bit.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/logo_16bit.png deleted file mode 100644 index fbae9b3..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/logo_16bit.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth deleted file mode 100644 index db7715b..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth +++ /dev/null @@ -1,8 +0,0 @@ -[Plymouth Theme] -Name=MiniOS Logo -Description=A theme that features a background with a logo. -ModuleName=script - -[script] -ImageDir=/usr/share/plymouth/themes/minios-logo -ScriptFile=/usr/share/plymouth/themes/minios-logo/minios-logo.script diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/minios-logo.script b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/minios-logo.script deleted file mode 100644 index 0f0c1e1..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/minios-logo.script +++ /dev/null @@ -1,512 +0,0 @@ - /************************************************************************** - * - * Copyright (C) 2011 The Xubuntu Community - * Copyright (C) 2009 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * Written by: Mad Nick - * - **************************************************************************/ - -/* - * Related to the screen */ - -screen_width = Window.GetWidth(); -screen_height = Window.GetHeight(); -screen_x = Window.GetX(); -screen_y = Window.GetY(); - -/**/ - -/* - * Images, check bits per pixel - * and load images accordingly */ - -background_image = Image("wallpaper.png"); -passw_dialog_input_image = Image("passw-dialog.png"); -bullet_image = Image("test.png"); - -bpp = Window.GetBitsPerPixel(); - -if (bpp == 4) { - - logotype_image = Image("logo_16bit.png"); - progress_meter_image = Image("progress-meter_16bit.png"); - progress_fade_image = Image("progress-fade_16bit.png"); - fsck_progress_meter_image = Image("progress-meter_16bit.png"); - fsck_progress_fade_image = Image("fsck-fade_16bit.png"); - -} -else { - - logotype_image = Image("logo.png"); - progress_meter_image = Image("progress-meter.png"); - progress_fade_image = Image("progress-fade.png"); - fsck_progress_meter_image = Image("progress-meter.png"); - fsck_progress_fade_image = Image("fsck-fade.png"); - -} - -/**/ - -/* - * Sprites */ - -ratio = screen_height / screen_width; -background_ratio = background_image.GetHeight() / background_image.GetWidth(); -factor = 0; - -if (ratio > background_ratio) { - - factor = screen_height / background_image.GetHeight(); - -} -else { - - factor = screen_width / background_image.GetWidth(); - -} - -scaled = background_image.Scale(background_image.GetWidth() * factor, background_image.GetHeight() * factor); -background_sprite = Sprite(scaled); -background_sprite.SetX(screen_x + screen_width / 2 - scaled.GetWidth() / 2); -background_sprite.SetY(screen_y + screen_height / 2 - scaled.GetHeight() / 2); - -logotype_sprite = Sprite(logotype_image); - -fsck_progress_meter_sprite = Sprite(fsck_progress_meter_image); -fsck_progress_fade_sprite = Sprite(fsck_progress_fade_image.Scale(1, fsck_progress_fade_image.GetHeight())); - -passw_dialog_input_sprite = Sprite(passw_dialog_input_image); -passw_lbl_sprite = Sprite(); - -msg_label_sprite = Sprite(); - -/**/ - -/* - * Misc */ - -counter = 0; - -fade_pos_x = (screen_width / 2) - (progress_meter_image.GetWidth() / 2); -fade_dir = 0; /* 0 = right, 1 = left */ - -fsck_running = 0; -fsck_dev_array; -fsck_dev_counter = 0; -fsck_fade_in_counter = 0; -fsck_done_fading = 0; - -stars_array; -stars_n = 0; - -//full_msg = ""; -msgs_line = [NULL,NULL,NULL,NULL,NULL]; - -/**/ - -/* - * Debug related */ - -debug = 0; -debug_sprite = Sprite(); - -fun debugOutput(str) { - - /* - * This will print to the top left corner */ - debug_sprite.SetImage(Image.Text(str)); - -} - -/**/ - -/* - * Setup the graphics properties */ -logotype_sprite.SetPosition(screen_x + (screen_width / 2) - (logotype_image.GetWidth() / 2), screen_y + (screen_height / 2) - (logotype_image.GetHeight() / 2)); -fsck_progress_meter_sprite.SetPosition(screen_x + (screen_width / 2) - (progress_meter_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 25); -fsck_progress_fade_sprite.SetPosition(screen_x + (screen_width / 2) - (progress_meter_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 25); -fsck_progress_meter_sprite.SetOpacity(0); -fsck_progress_fade_sprite.SetOpacity(0); -passw_dialog_input_sprite.SetPosition(screen_x + (screen_width / 2) - (passw_dialog_input_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 70); -passw_dialog_input_sprite.SetOpacity(0); -passw_lbl_sprite.SetOpacity(0); - -spin = 0; - -/* - * this function only goes up to 100 - * because thats all thats needed for - * the progress meter bar */ -fun atoi(str) { - - int = -1; - - for (i = 0; i <= 100; i++) { - - if (i + "" == str) { - - int = i; - - break; - - } - - } - - return int; - -} - -/* - * This handler will/can be invoked - * 50 times per second. - * - * According to the previous author of the - * splash script, without this callback - * the screen is not updated correctly */ -spinner_sprite; -spinner; - -fun refreshHandler() { - - if (spin < 3.14 * 2) { - - spin = spin + 0.1; - - } - else { - - spin = 0; - - } - - /* if fsck is running or the password is prompted, hide the spinner */ - if (fsck_running == 1 || passw_dialog_input_sprite.GetOpacity() == 1) { - - spinner_sprite.SetOpacity(0); - - } else { - - spinner = Image("spinner.png"); - spinner = spinner.Rotate(spin); - spinner_sprite = Sprite(spinner); - spinner_sprite.SetPosition(screen_x + (screen_width / 2) - (spinner.GetWidth() / 2), screen_y + (screen_height / 2) - (spinner.GetHeight() / 2) + 80); - - } - - if (fade_dir == 0) { - - counter++; - - if (counter >= 200) { - - fade_dir = 1; - - } - - } - else { - - counter--; - - if (counter <= 0) { - - fade_dir = 0; - - } - - } - - if ((fsck_running == 1) && (fsck_done_fading == 0)) { - - - fsck_progress_meter_sprite.SetOpacity(fsck_fade_in_counter); - fsck_progress_fade_sprite.SetOpacity(fsck_fade_in_counter); - - if (fsck_fade_in_counter < 1) { - - fsck_fade_in_counter+= 0.025; - - } - else { - - fsck_done_fading = 1; - - } - - } - -} - -Plymouth.SetRefreshFunction (refreshHandler); - -/**/ - -/* - * This function will display the password related information - * when being prompt with entering a password */ -fun showPasswordHandler(prompt, stars) { - - if (passw_dialog_input_sprite.GetOpacity() == 0 && passw_lbl_sprite.GetOpacity() == 0) { - - passw_dialog_input_sprite.SetOpacity(1); - passw_lbl_sprite.SetOpacity(1); - - } - - tmp_prompt_image = Image.Text(prompt, 1, 1, 1); - - passw_lbl_sprite.SetImage(tmp_prompt_image); - passw_lbl_sprite.SetPosition(screen_x + (screen_width / 2) - (tmp_prompt_image.GetWidth() / 2), screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 50); - - for(i = 0; i < stars_n; i++) { - - stars_array[i] = NULL; - - } - - stars_n = 0; - - for(i = 0; (i < stars) && (i < 15); i++) { - - stars_array[i] = Sprite(bullet_image); - stars_array[i].SetPosition(screen_x + (((screen_width / 2) - (passw_dialog_input_image.GetWidth() / 2)) + (18 * i)) + 2, screen_y + (screen_height / 2) + (logotype_image.GetHeight() / 2) + 75); - stars_n++; - - } - -} - -Plymouth.SetDisplayPasswordFunction(showPasswordHandler); - -/**/ - -fun displayNormalHandler() { - - /* - * Hide the password dialog and the bullets */ - - if (passw_dialog_input_sprite.GetOpacity() == 1) { - - passw_dialog_input_sprite.SetOpacity(0); - - } - - if (passw_lbl_sprite.GetOpacity() == 1) { - - passw_lbl_sprite.SetOpacity(0); - - } - - for(i = 0; i < stars_n; i++) { - - stars_array[i] = NULL; - - } - -} - -Plymouth.SetDisplayNormalFunction(displayNormalHandler); - -fun strlen(string) { - - i = 0; - - while (String(string).CharAt(i)) { - - i++; - - } - - return i; - -} - -/* - * This function will display the most current message */ -fun messageHandler(msg) { - - if ((msg == "") || !msg) { - - return 0; - - } - - if (msg.SubString(0, 5) == "keys:") { - - msg = msg.SubString(5, strlen(msg)); - - } - - # Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n - if (msg.SubString(0, 17) == "fsckd-cancel-msg:") - msg = msg.SubString(17, strlen(msg)); - - //full_msg += msg + " "; - for(i = 4; i > 0; i--) { - - msgs_line[i] = msgs_line[i - 1]; - - } - - msgs_line[0] = Sprite(Image.Text(msg, 1, 1, 1)); - - dist = 1; - - for(i = 0; i < 5; i++) { - - if (msgs_line[i] != NULL) { - - msgs_line[i].SetPosition(screen_x + (screen_width / 2) - (msgs_line[i].GetImage().GetWidth() / 2), screen_y + (screen_height - msgs_line[i].GetImage().GetHeight()) - 20*dist); - dist++; - - } - - } - -} - -Plymouth.SetMessageFunction(messageHandler); - -/**/ - -/* - * Handles the updates passed to the plymouth daemon - * for example the FSCK data */ -fun statusHandler(status) { - - tmp_char; - status_array[0] = ""; - elem_count = 0; - - for (i = 0; String(status).CharAt(i) != ""; i++) { - - tmp_char = String(status).CharAt(i); - - if (tmp_char != ":") { - - status_array[elem_count] += tmp_char; - - } - else { - - elem_count++; - status_array[elem_count] = ""; - - } - - } - - if (status_array[0] == "fsck") { - - already_added = 0; - - if (fsck_running == 0) { - - /* - * use the dedicated message handler for this - * since there is no messages about fsck checks - * currently... */ - messageHandler("Routine disk drive check."); - - fsck_running = 1; - - } - - for(i = 0; i < fsck_dev_counter; i++) { - - /* - * check if the device already exist and update - * the progress only in that case */ - if (fsck_dev_array[i][0] == status_array[1]) { - - fsck_dev_array[i][1] = status_array[2]; /* progress */ - already_added = 1; - - } - - } - - /* - * if the device is not added, then add it */ - if (already_added == 0) { - - fsck_dev_array[fsck_dev_counter][0] = status_array[1]; /* device */ - fsck_dev_array[fsck_dev_counter][1] = status_array[2]; /* progress */ - fsck_dev_counter++; - - } - - /* - * update the progress */ - - total = 0; - - for(i = 0; i < fsck_dev_counter; i++) { - - total += atoi(fsck_dev_array[i][1]); - - } - - if (fsck_dev_counter > 0) { - - /* - * display the total percentage */ - fsck_progress_fade_sprite.SetImage(fsck_progress_fade_image.Scale((fsck_progress_meter_image.GetWidth() / 100) * (total / fsck_dev_counter), fsck_progress_fade_image.GetHeight())); - - } - - /**/ - - /* - * if the total progress is at maximum, - * make the progress meter go away, - * we might want to fade this out... */ - if (total == (100 * fsck_dev_counter)) { - - fsck_progress_meter_sprite.SetOpacity(0); - fsck_progress_fade_sprite.SetOpacity(0); - - } - - } - - # systemd-fsckd pass fsckd::: - if (status_array[0] == "fsckd") { - fsck_running = 1; - - # remove ",x" as we only care about integers - progress_str = status_array[2]; - progress = atoi(progress_str.SubString(0, strlen(progress_str) - 2)); - - fsck_progress_fade_sprite.SetImage(fsck_progress_fade_image.Scale((fsck_progress_meter_image.GetWidth() / 100) * progress, fsck_progress_fade_image.GetHeight())); - - /* - * if the total progress is at maximum, - * make the progress meter go away, - * we might want to fade this out... */ - if (progress == 100) { - fsck_progress_meter_sprite.SetOpacity(0); - fsck_progress_fade_sprite.SetOpacity(0); - } - } - -} - -Plymouth.SetUpdateStatusFunction(statusHandler); - -/**/ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/passw-dialog.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/passw-dialog.png deleted file mode 100644 index 9e6a504..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/passw-dialog.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-fade.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-fade.png deleted file mode 100644 index ec475f4..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-fade.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-fade_16bit.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-fade_16bit.png deleted file mode 100644 index 878aec6..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-fade_16bit.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-meter.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-meter.png deleted file mode 100644 index 4e8b719..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-meter.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-meter_16bit.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-meter_16bit.png deleted file mode 100644 index 75f8713..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/progress-meter_16bit.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/spinner.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/spinner.png deleted file mode 100644 index 80944a3..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/spinner.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/test.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/test.png deleted file mode 100644 index 3d64128..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/test.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/wallpaper.png b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/wallpaper.png deleted file mode 100644 index 3a3b82d..0000000 Binary files a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-logo/wallpaper.png and /dev/null differ diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-text/minios-text.plymouth b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-text/minios-text.plymouth deleted file mode 100644 index 3376c71..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/minios-text/minios-text.plymouth +++ /dev/null @@ -1,11 +0,0 @@ -[Plymouth Theme] -Name=MiniOS Text -Description=Text mode theme based on minios-logo theme -ModuleName=ubuntu-text - -[ubuntu-text] -title=MiniOS 2021 -black=0x000000 -white=0xffffff -brown=0x000000 -blue=0xffffff diff --git a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/text.plymouth b/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/text.plymouth deleted file mode 120000 index 740f19a..0000000 --- a/linux-live/basesystem/01-casper/rootcopy/usr/share/plymouth/themes/text.plymouth +++ /dev/null @@ -1 +0,0 @@ -/usr/share/plymouth/themes/minios-text/minios-text.plymouth \ No newline at end of file diff --git a/linux-live/basesystem/01-core/install b/linux-live/basesystem/01-core/install index 29e9948..e45fc91 100644 --- a/linux-live/basesystem/01-core/install +++ b/linux-live/basesystem/01-core/install @@ -14,3 +14,6 @@ if [ -f $SCRIPT_DIR/package.list ]; then $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 fi + +chown live.users /home/live +chown -R live.users /home/live \ No newline at end of file diff --git a/linux-live/basesystem/01-core/package.list b/linux-live/basesystem/01-core/package.list index 83b471e..542b9d2 100644 --- a/linux-live/basesystem/01-core/package.list +++ b/linux-live/basesystem/01-core/package.list @@ -1,3 +1,9 @@ +#sudo +linux-image-amd64 +#libterm-readline-gnu-perl +#systemd-sysv +#dbus +#debconf-utils mc squashfs-tools genisoimage @@ -37,5 +43,4 @@ ntpdate dvd+rw-tools usb-modeswitch pm-utils -wget -linux-image-amd64 \ No newline at end of file +wget \ No newline at end of file diff --git a/linux-live/basesystem/01-core/postinstall b/linux-live/basesystem/01-core/postinstall index e33a74d..adb76a5 100644 --- a/linux-live/basesystem/01-core/postinstall +++ b/linux-live/basesystem/01-core/postinstall @@ -1,103 +1,10 @@ #!/bin/bash -apt-get remove --yes vim* grub* debconf-i18n installation-report +apt-get remove --yes vim* grub* debconf-i18n installation-report >>$OUTPUT 2>&1 -CWD="$(pwd)" cd /tmp -apt -y update -apt-get download acpi-support -dpkg -x acpi-support*.deb /tmp/acpisupport +apt -y update >>$OUTPUT 2>&1 +apt-get download acpi-support >>$OUTPUT 2>&1 +dpkg -x acpi-support*.deb /tmp/acpisupport >>$OUTPUT 2>&1 cd /tmp/acpisupport -cp -aR * / -cd "$CWD" - -rm -f /etc/fstab -rm -f /etc/mtab -rm -f /etc/apt/sources.list~ -rm -Rf /etc/systemd/system/timers.target.wants -rm -f /etc/systemd/system/multi-user.target.wants/ssh.service -rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service - -rm -f /etc/ssh/ssh_host* - -rm -f /var/backups/* -rm -f /var/cache/ldconfig/* -rm -f /var/cache/debconf/* -rm -f /var/cache/fontconfig/* -rm -f /var/lib/apt/extended_states -rm -f /var/lib/systemd/random-seed -rm -f /var/lib/apt/lists/deb.* -rm -Rf /root/.local/share/mc -rm -Rf /root/.cache -rm -f /root/.wget-hsts - -rm -f /var/lib/dpkg/*-old -rm -f /var/log/* -rm -f /var/log/*/* -rm -f /var/log/*/*/* -rm -f /var/cache/apt/archives/*.deb -rm -f /var/cache/apt/*.bin -rm -f /var/cache/debconf/*-old -rm -f /var/lib/dhcp/dhclient.leases -rm -f /root/.bash_history -rm -f /root/.wget-hsts -rm -Rf /usr/share/doc/* -rm -Rf /usr/share/info/* -rm -f /usr/share/images/fluxbox/debian-squared.jpg -rm -Rf /usr/share/fluxbox/nls/??* -rm -Rf /usr/share/gnome/help - -rm -Rf /usr/share/locale/?? -rm -Rf /usr/share/locale/??_* -rm -Rf /usr/share/locale/??@* -rm -Rf /usr/share/locale/??? -rm -Rf /usr/share/i18n/locales/*_* -rm -Rf /usr/share/man/?? -rm -Rf /usr/share/man/*_* - -rm -Rf /usr/share/icons/elementaryXubuntu-dark -rm -Rf /usr/share/icons/gnome/256x256 - -rm /usr/share/applications/compton.desktop -rm /usr/share/applications/debian-uxterm.desktop -rm /usr/share/applications/debian-xterm.desktop -rm /usr/share/applications/htop.desktop -rm /usr/share/applications/mc.desktop -rm /usr/share/applications/mcedit.desktop -rm /usr/share/applications/pcmanfm-desktop-pref.desktop -rm /usr/share/applications/python2.7.desktop -rm /usr/share/applications/python3.7.desktop -rm /usr/share/applications/vim.desktop - - - -# 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 -} - -uncompress_files /etc/alternatives -uncompress_files /usr/share/man - -# remove broken links -# $1 = search directory -remove_broken_links() -{ - find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf -} - -remove_broken_links /etc/alternatives -remove_broken_links /usr/share/man - - +cp -aR * / >>$OUTPUT 2>&1 \ No newline at end of file diff --git a/linux-live/basesystem/01-casper/rootcopy/root/.bashrc b/linux-live/basesystem/01-core/rootcopy/home/live/.bashrc similarity index 100% rename from linux-live/basesystem/01-casper/rootcopy/root/.bashrc rename to linux-live/basesystem/01-core/rootcopy/home/live/.bashrc diff --git a/linux-live/minioslib b/linux-live/minioslib index 2eb5f68..9250441 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -565,22 +565,6 @@ function copy_build_scripts() { fi } -function preserve_environment_variables() { - if [ -d /opt/minios-live ]; then - chroot $BUILD_DIR /usr/bin/env \ - 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 \ - APT_OPTIONS2=$APT_OPTIONS2 \ - LIVE_TYPE=$LIVE_TYPE - fi - -} - function build_chroot() { current_process @@ -634,63 +618,6 @@ function build_chroot() { fi } -function build_package() { - current_process - - if [ $CONTAINER_TYPE = "1" ]; then - if [ ! -f /.minios-live ]; then - setup_host - fi - fi - - chroot_mount_fs - - #copy_build_scripts - - if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then - chroot $BUILD_DIR /usr/bin/env \ - 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 \ - APT_OPTIONS2=$APT_OPTIONS2 \ - LIVE_TYPE=$LIVE_TYPE \ - sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD update >>$OUTPUT 2>&1 && - chroot $BUILD_DIR /usr/bin/env \ - 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 \ - APT_OPTIONS2=$APT_OPTIONS2 \ - LIVE_TYPE=$LIVE_TYPE \ - sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/add_pkg.list | tr "\n" " ") >>$OUTPUT 2>&1 - else - chroot $BUILD_DIR sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD update >>$OUTPUT 2>&1 && - chroot $BUILD_DIR sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/add_pkg.list | tr "\n" " ") >>$OUTPUT 2>&1 - fi - - chroot_umount_fs - - rm -f $BUILD_DIR/var/lib/apt/extended_states >>$OUTPUT 2>&1 - rm -f $BUILD_DIR/var/lib/apt/lists/*Packages* >>$OUTPUT 2>&1 - rm -f $BUILD_DIR/var/lib/apt/lists/*Translation* >>$OUTPUT 2>&1 - rm -f $BUILD_DIR/var/lib/apt/lists/*InRelease >>$OUTPUT 2>&1 - rm -f $BUILD_DIR/var/lib/apt/lists/deb.* >>$OUTPUT 2>&1 - rm -f $BUILD_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1 -} - function build_live() { current_process @@ -860,6 +787,109 @@ function chroot_setup_host() { current_process } +function build_cleanup() { + echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." + + set +e + + rm -f $MODULE_UPPER_DIR/preinstall >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/install >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/package.list >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1 + rm -rf $MODULE_UPPER_DIR/rootcopy >>$OUTPUT 2>&1 + rm -rf $MODULE_UPPER_DIR/patches >>$OUTPUT 2>&1 + + rm -f $MODULE_UPPER_DIR/etc/fstab >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/etc/mtab >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/etc/apt/sources.list~ >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/etc/systemd/system/timers.target.wants >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/ssh.service >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/etc/systemd/system/multi-user.target.wants/dnsmasq.service >>$OUTPUT 2>&1 + + rm -f $MODULE_UPPER_DIR/etc/ssh/ssh_host* >>$OUTPUT 2>&1 + + rm -f $MODULE_UPPER_DIR/var/backups/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/cache/ldconfig/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/cache/debconf/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/cache/fontconfig/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/lib/apt/extended_states >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/lib/systemd/random-seed >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.* >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/root/.local/share/mc >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/root/.cache >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/root/.wget-hsts >>$OUTPUT 2>&1 + + rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/log/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/log/*/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/log/*/*/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/cache/apt/archives/*.deb >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/cache/apt/*.bin >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/cache/debconf/*-old >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/var/lib/dhcp/dhclient.leases >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/root/.bash_history >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/root/.wget-hsts >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/doc/* >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/info/* >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/usr/share/images/fluxbox/debian-squared.jpg >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/fluxbox/nls/??* >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/gnome/help >>$OUTPUT 2>&1 + + rm -Rf $MODULE_UPPER_DIR/usr/share/locale/?? >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??_* >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??@* >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/locale/??? >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/i18n/locales/*_* >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/man/?? >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/man/*_* >>$OUTPUT 2>&1 + + rm -Rf $MODULE_UPPER_DIR/usr/share/icons/elementaryXubuntu-dark >>$OUTPUT 2>&1 + rm -Rf $MODULE_UPPER_DIR/usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 + + rm $MODULE_UPPER_DIR/usr/share/applications/compton.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/debian-uxterm.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/debian-xterm.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/htop.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/mc.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/mcedit.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/pcmanfm-desktop-pref.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/python2.7.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/python3.7.desktop >>$OUTPUT 2>&1 + rm $MODULE_UPPER_DIR/usr/share/applications/vim.desktop >>$OUTPUT 2>&1 + + # 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 >>$OUTPUT 2>&1 + } + + uncompress_files $MODULE_UPPER_DIR/etc/alternatives >>$OUTPUT 2>&1 + uncompress_files $MODULE_UPPER_DIR/usr/share/man >>$OUTPUT 2>&1 + + # remove broken links + # $1 = search directory + remove_broken_links() { + find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf >>$OUTPUT 2>&1 + } + + remove_broken_links $MODULE_UPPER_DIR/etc/alternatives >>$OUTPUT 2>&1 + remove_broken_links $MODULE_UPPER_DIR/usr/share/man >>$OUTPUT 2>&1 + + set -e + +} + function hostreq_pkg_list() { echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}" $APT_CMD update >>$OUTPUT 2>&1 @@ -924,6 +954,8 @@ function main_pkg_list() { LIVE_TYPE=$LIVE_TYPE \ /linux-live/basesystem/01-core/postinstall fi + + build_cleanup } function chroot_pkg_install() { @@ -987,7 +1019,7 @@ EOF systemctl disable grub-initrd-fallback.service fi - if grep openssh-server $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1; then + if grep openssh-server $SCRIPT_DIR/basesystem/01-core/package.list >>$OUTPUT 2>&1; then echo "Enable ssh.service autostart." >>$OUTPUT 2>&1 cat </lib/systemd/system/ssh-keygen.service [Unit] @@ -1249,13 +1281,14 @@ function module_chroot_umount_fs() { umount $MODULE_MERGED_DIR/run >>$OUTPUT 2>&1 fi umount $MODULE_MERGED_DIR >>$OUTPUT 2>&1 - set -e + #set -e MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT) for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT) umount $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower done + set -e module_check_mounted } @@ -1322,6 +1355,7 @@ function module_chroot_cleanup() { rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/preinstall >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/install >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/install2 >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/cleanup >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/package.list >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1 @@ -1374,13 +1408,12 @@ function build_modules_chroot() { # copy files if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then - echo "1" + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/) fi else - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then - mkdir $MODULE_MERGED_DIR/rootcopy + if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ] >>$OUTPUT 2>&1; then + mkdir $MODULE_MERGED_DIR/rootcopy (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/rootcopy/) fi fi @@ -1411,6 +1444,8 @@ function build_modules_chroot() { if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then module_chroot_umount_fs + build_cleanup + # run external actions if [ "$(ls -A $MODULE_UPPER_DIR)" != "" ]; then @@ -1432,6 +1467,10 @@ function build_modules_chroot() { if [ -f $SCRIPT_DIR/linux-live/modules/$MODULE/install2 ]; then cp $SCRIPT_DIR/linux-live/modules/$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 + mkdir $MODULE_MERGED_DIR/patches + (cd $SCRIPT_DIR/linux-live/modules/$MODULE/patches && cp --parents -afr * $MODULE_MERGED_DIR/patches/) + fi chroot $MODULE_MERGED_DIR /usr/bin/env \ OUTPUT=$OUTPUT \ LOGPATH=$LOGPATH \ @@ -1445,13 +1484,6 @@ function build_modules_chroot() { /install2 >>$OUTPUT 2>&1 fi - : 'if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then - # copy files - if [ "$(ls -A $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy)" != "" ]; then - (cd $SCRIPT_DIR/linux-live/modules/$MODULE/rootcopy && cp --parents -afr * $MODULE_MERGED_DIR/) - 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 @@ -1474,17 +1506,21 @@ function build_modules_chroot() { cp $MODULE_UPPER_DIR/$MODULE.$BEXT $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT >>$OUTPUT 2>&1 fi - #if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then module_chroot_finish_up module_chroot_umount_fs + if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then + build_cleanup + fi + module_chroot_cleanup - #fi - if [ ! -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT ] && [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then - echo "here 1" - build_modules_live + if [ ! -f $SCRIPT_DIR/linux-live/modules/$MODULE/is_internal_build ]; then + ls -la $SCRIPT_DIR/linux-live/modules/$MODULE/ + if [ ! -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT ]; then + build_modules_live + fi fi fi diff --git a/linux-live/modules/01-firmware/install b/linux-live/modules/01-firmware/install index 29e9948..9c6fd63 100644 --- a/linux-live/modules/01-firmware/install +++ b/linux-live/modules/01-firmware/install @@ -6,11 +6,14 @@ 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 + # install packages if [ -f $SCRIPT_DIR/package.list ]; then #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD update >>$OUTPUT 2>&1 && + $APT_CMD update >>$OUTPUT 2>&1 && #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ + $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 -fi +fi \ No newline at end of file diff --git a/linux-live/modules/01-firmware/postinstall b/linux-live/modules/01-firmware/postinstall deleted file mode 100644 index 4c072dc..0000000 --- a/linux-live/modules/01-firmware/postinstall +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -rm -f /etc/fstab -rm -f /etc/mtab -rm -f /etc/apt/sources.list~ -rm -Rf /etc/systemd/system/timers.target.wants -rm -f /etc/systemd/system/multi-user.target.wants/ssh.service -rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service - -rm -f /etc/ssh/ssh_host* - -rm -f /var/backups/* -rm -f /var/cache/ldconfig/* -rm -f /var/cache/debconf/* -rm -f /var/cache/fontconfig/* -rm -f /var/lib/apt/extended_states -rm -f /var/lib/systemd/random-seed -rm -f /var/lib/apt/lists/deb.* -rm -Rf /root/.local/share/mc -rm -Rf /root/.cache -rm -f /root/.wget-hsts - -rm -f /var/lib/dpkg/*-old -rm -f /var/log/* -rm -f /var/log/*/* -rm -f /var/log/*/*/* -rm -f /var/cache/apt/archives/*.deb -rm -f /var/cache/apt/*.bin -rm -f /var/cache/debconf/*-old -rm -f /var/lib/dhcp/dhclient.leases -rm -f /root/.bash_history -rm -f /root/.wget-hsts -rm -Rf /usr/share/doc/* -rm -Rf /usr/share/info/* -rm -f /usr/share/images/fluxbox/debian-squared.jpg -rm -Rf /usr/share/fluxbox/nls/??* -rm -Rf /usr/share/gnome/help - -rm -Rf /usr/share/locale/?? -rm -Rf /usr/share/locale/??_* -rm -Rf /usr/share/locale/??@* -rm -Rf /usr/share/locale/??? -rm -Rf /usr/share/i18n/locales/*_* -rm -Rf /usr/share/man/?? -rm -Rf /usr/share/man/*_* - -rm -Rf /usr/share/icons/elementaryXubuntu-dark -rm -Rf /usr/share/icons/gnome/256x256 - -rm /usr/share/applications/compton.desktop -rm /usr/share/applications/debian-uxterm.desktop -rm /usr/share/applications/debian-xterm.desktop -rm /usr/share/applications/htop.desktop -rm /usr/share/applications/mc.desktop -rm /usr/share/applications/mcedit.desktop -rm /usr/share/applications/pcmanfm-desktop-pref.desktop -rm /usr/share/applications/python2.7.desktop -rm /usr/share/applications/python3.7.desktop -rm /usr/share/applications/vim.desktop - - - -# 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 -} - -uncompress_files /etc/alternatives -uncompress_files /usr/share/man - -# remove broken links -# $1 = search directory -remove_broken_links() -{ - find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf -} - -remove_broken_links /etc/alternatives -remove_broken_links /usr/share/man - - diff --git a/linux-live/modules/02-xorg/install b/linux-live/modules/02-xorg/install index 29e9948..5ef01af 100644 --- a/linux-live/modules/02-xorg/install +++ b/linux-live/modules/02-xorg/install @@ -6,11 +6,16 @@ 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 + # install packages if [ -f $SCRIPT_DIR/package.list ]; then #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD update >>$OUTPUT 2>&1 && + $APT_CMD update >>$OUTPUT 2>&1 && #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ + $APT_CMD install $APT_OPTIONS $APT_OPTIONS2 \ $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 fi + +chown live.users /home/live +chown -R live.users /home/live \ No newline at end of file diff --git a/linux-live/modules/02-xorg/package.list b/linux-live/modules/02-xorg/package.list old mode 100755 new mode 100644 diff --git a/linux-live/modules/02-xorg/postinstall b/linux-live/modules/02-xorg/postinstall index a14863e..9e730c0 100644 --- a/linux-live/modules/02-xorg/postinstall +++ b/linux-live/modules/02-xorg/postinstall @@ -6,117 +6,16 @@ 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 -mv /usr/share/icons/Breeze_Snow /usr/share/icons/breeze_cursors +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 && cp --parents -afr * /) # install x11 server utils, apt-get would add cpp dependency, bullshit! cd /tmp -apt-get download x11-xserver-utils -dpkg -x x11-xserver-utils*.deb /tmp/x11utils +apt-get download x11-xserver-utils >>$OUTPUT 2>&1 +dpkg -x x11-xserver-utils*.deb /tmp/x11utils >>$OUTPUT 2>&1 cd /tmp/x11utils -cp -aR * / - -update-alternatives --set x-terminal-emulator /usr/bin/xterm - -apt-get remove --yes vim* grub* debconf-i18n installation-report - -CWD="$(pwd)" -cd /tmp -apt-get download acpi-support -dpkg -x acpi-support*.deb /tmp/acpisupport -cd /tmp/acpisupport -cp -aR * / -cd "$CWD" - -rm -f /etc/fstab -rm -f /etc/mtab -rm -f /etc/apt/sources.list~ -rm -Rf /etc/systemd/system/timers.target.wants -rm -f /etc/systemd/system/multi-user.target.wants/ssh.service -rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service - -rm -f /etc/ssh/ssh_host* - -rm -f /var/backups/* -rm -f /var/cache/ldconfig/* -rm -f /var/cache/debconf/* -rm -f /var/cache/fontconfig/* -rm -f /var/lib/apt/extended_states -rm -f /var/lib/systemd/random-seed -rm -f /var/lib/apt/lists/deb.* -rm -Rf /root/.local/share/mc -rm -Rf /root/.cache -rm -f /root/.wget-hsts - -rm -f /var/lib/dpkg/*-old -rm -f /var/log/* -rm -f /var/log/*/* -rm -f /var/log/*/*/* -rm -f /var/cache/apt/archives/*.deb -rm -f /var/cache/apt/*.bin -rm -f /var/cache/debconf/*-old -rm -f /var/lib/dhcp/dhclient.leases -rm -f /root/.bash_history -rm -f /root/.wget-hsts -rm -Rf /usr/share/doc/* -rm -Rf /usr/share/info/* -rm -f /usr/share/images/fluxbox/debian-squared.jpg -rm -Rf /usr/share/fluxbox/nls/??* -rm -Rf /usr/share/gnome/help - -rm -Rf /usr/share/locale/?? -rm -Rf /usr/share/locale/??_* -rm -Rf /usr/share/locale/??@* -rm -Rf /usr/share/locale/??? -rm -Rf /usr/share/i18n/locales/*_* -rm -Rf /usr/share/man/?? -rm -Rf /usr/share/man/*_* - -rm -Rf /usr/share/icons/elementaryXubuntu-dark -rm -Rf /usr/share/icons/gnome/256x256 - -rm /usr/share/applications/compton.desktop -rm /usr/share/applications/debian-uxterm.desktop -rm /usr/share/applications/debian-xterm.desktop -rm /usr/share/applications/htop.desktop -rm /usr/share/applications/mc.desktop -rm /usr/share/applications/mcedit.desktop -rm /usr/share/applications/pcmanfm-desktop-pref.desktop -rm /usr/share/applications/python2.7.desktop -rm /usr/share/applications/python3.7.desktop -rm /usr/share/applications/vim.desktop - - - -# 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 -} - -uncompress_files /etc/alternatives -uncompress_files /usr/share/man - -# remove broken links -# $1 = search directory -remove_broken_links() -{ - find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf -} - -remove_broken_links /etc/alternatives -remove_broken_links /usr/share/man - +cp -aR * / >>$OUTPUT 2>&1 +update-alternatives --set x-terminal-emulator /usr/bin/xterm >>$OUTPUT 2>&1 \ No newline at end of file diff --git a/linux-live/modules/02-xorg/rootcopy/home/live/.Xresources b/linux-live/modules/02-xorg/rootcopy/home/live/.Xresources new file mode 100644 index 0000000..2d6d0a3 --- /dev/null +++ b/linux-live/modules/02-xorg/rootcopy/home/live/.Xresources @@ -0,0 +1,30 @@ +! 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*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: 50000 +XTerm*allowSendEvents: True +XTerm*sessionMgt: false +XTerm*rightScrollBar: true +XTerm*eightBitInput: false +XTerm*faceName:fixed:size=11 +XTerm*boldFont:fixed:size=11 +XTerm*activeIcon: true +XTerm*iconPixmap: /usr/share/icons/locolor/16x16/apps/xterm.xbm +XTerm*fullscreen: never + +Xft.antialias: true +Xft.hinting: true +Xft.hintstyle: hintfull +Xft.lcdfilter: lcdlegacy +Xft.rgba: rgb + +XTerm*selectToClipboard: true diff --git a/linux-live/modules/02-xorg/rootcopy/home/live/.blackbox-menu b/linux-live/modules/02-xorg/rootcopy/home/live/.blackbox-menu new file mode 100644 index 0000000..df8a870 --- /dev/null +++ b/linux-live/modules/02-xorg/rootcopy/home/live/.blackbox-menu @@ -0,0 +1,5 @@ +[begin] ( Menu ) + [exec] (Terminal) { xterm -ls -title Terminal } + [exec] (Web browser) { chromium } + [exit] (Exit) +[end] diff --git a/linux-live/modules/02-xorg/rootcopy/home/live/.blackboxrc b/linux-live/modules/02-xorg/rootcopy/home/live/.blackboxrc new file mode 100644 index 0000000..a39f965 --- /dev/null +++ b/linux-live/modules/02-xorg/rootcopy/home/live/.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/03-desktop/cleanup b/linux-live/modules/03-desktop/cleanup deleted file mode 100644 index dd745ec..0000000 --- a/linux-live/modules/03-desktop/cleanup +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -rm -f /etc/fstab -rm -f /etc/mtab -rm -f /etc/apt/sources.list~ -rm -Rf /etc/systemd/system/timers.target.wants -rm -f /etc/systemd/system/multi-user.target.wants/ssh.service -rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service - -rm -f /etc/ssh/ssh_host* - -rm -f /var/backups/* -rm -f /var/cache/ldconfig/* -rm -f /var/cache/debconf/* -rm -f /var/cache/fontconfig/* -rm -f /var/lib/apt/extended_states -rm -f /var/lib/systemd/random-seed -rm -f /var/lib/apt/lists/deb.* -rm -Rf /root/.local/share/mc -rm -Rf /root/.cache -rm -f /root/.wget-hsts - -rm -f /var/lib/dpkg/*-old -rm -f /var/log/* -rm -f /var/log/*/* -rm -f /var/log/*/*/* -rm -f /var/cache/apt/archives/*.deb -rm -f /var/cache/apt/*.bin -rm -f /var/cache/debconf/*-old -rm -f /var/lib/dhcp/dhclient.leases -rm -f /root/.bash_history -rm -f /root/.wget-hsts -rm -Rf /usr/share/doc/* -rm -Rf /usr/share/info/* -rm -f /usr/share/images/fluxbox/debian-squared.jpg -rm -Rf /usr/share/fluxbox/nls/??* -rm -Rf /usr/share/gnome/help - -rm -Rf /usr/share/locale/?? -rm -Rf /usr/share/locale/??_* -rm -Rf /usr/share/locale/??@* -rm -Rf /usr/share/locale/??? -rm -Rf /usr/share/i18n/locales/*_* -rm -Rf /usr/share/man/?? -rm -Rf /usr/share/man/*_* - -rm -Rf /usr/share/icons/elementaryXubuntu-dark -rm -Rf /usr/share/icons/gnome/256x256 - -rm /usr/share/applications/compton.desktop -rm /usr/share/applications/debian-uxterm.desktop -rm /usr/share/applications/debian-xterm.desktop -rm /usr/share/applications/htop.desktop -rm /usr/share/applications/mc.desktop -rm /usr/share/applications/mcedit.desktop -rm /usr/share/applications/pcmanfm-desktop-pref.desktop -rm /usr/share/applications/python2.7.desktop -rm /usr/share/applications/python3.7.desktop -rm /usr/share/applications/vim.desktop - - - -# 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 -} - -uncompress_files /etc/alternatives -uncompress_files /usr/share/man - -# remove broken links -# $1 = search directory -remove_broken_links() -{ - find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf -} - -remove_broken_links /etc/alternatives -remove_broken_links /usr/share/man - diff --git a/linux-live/modules/03-desktop/install b/linux-live/modules/03-desktop/install old mode 100755 new mode 100644 index adf0c55..37cd017 --- a/linux-live/modules/03-desktop/install +++ b/linux-live/modules/03-desktop/install @@ -7,7 +7,7 @@ VERSION=1.3.5 # first install stock version -apt-get update +apt-get update >>$OUTPUT 2>&1 apt-get install --no-install-recommends --yes \ $NAME \ feh \ @@ -15,11 +15,12 @@ apt-get install --no-install-recommends --yes \ volumeicon-alsa \ murrine-themes \ libnotify4 \ - scrot - -. ./cleanup + scrot >>$OUTPUT 2>&1 (cd /rootcopy && cp --parents -afr * /) + chown live.users /home/live chown -R live.users /home/live/.gtkrc-2.0 -chown -R live.users /home/live/.config \ No newline at end of file +chown -R live.users /home/live/.config + +chown -R live.users /home/live \ No newline at end of file diff --git a/linux-live/modules/03-desktop/install2 b/linux-live/modules/03-desktop/install2 index 0dc0109..ea20725 100644 --- a/linux-live/modules/03-desktop/install2 +++ b/linux-live/modules/03-desktop/install2 @@ -9,8 +9,8 @@ cd / # create user directories for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do - mkdir -p /squashfs-root/home/live/$dir - mkdir -p /squashfs-root/root/$dir + 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 @@ -19,66 +19,66 @@ chown -R live.users /squashfs-root/home/live REBUILD=/tmp/$NAME-rebuild-$$ -apt-get update -apt-get --yes build-dep $NAME +apt-get update >>$OUTPUT 2>&1 +apt-get --yes build-dep $NAME >>$OUTPUT 2>&1 -mkdir -p $REBUILD +mkdir -p $REBUILD >>$OUTPUT 2>&1 cd $REBUILD -apt-get source $NAME +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 +dpkg-buildpackage -us -uc >>$OUTPUT 2>&1 -rm -Rf debian/$NAME/DEBIAN -rm -Rf debian/$NAME/usr/share/doc -rm -Rf debian/$NAME/usr/share/images +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 +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 +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 +tar -xf xlunch.tar.gz >>$OUTPUT 2>&1 cd xlunch-4.5.3 -make -cp xlunch /squashfs-root/usr/bin -cp extra/gentriesquick /squashfs-root/usr/bin/xlunch_genquick -mkdir -p /squashfs-root/usr/share/icons/hicolor/48x48/apps/ +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 +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 +tar -xf systrayiconlauncher.tar.gz >>$OUTPUT 2>&1 cd SystrayIconLauncher-master -apt-get install --yes libgtk2.0-dev -make -cp systrayicon /squashfs-root/usr/bin +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 +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 +tar -xf gtkdialog.tar.gz >>$OUTPUT 2>&1 cd GTKdialog-master -make -cp gtkdialog /squashfs-root/usr/bin +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 -tar -xf 1.6.7.tar.gz +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 -cp -R /usr/include/gtk-2.0/* /usr/include -apt install --yes libnotify-dev +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/ \ @@ -89,7 +89,7 @@ CFLAGS="-O2 \ -I/usr/include/pango-1.0 \ -I/usr/include/glib-2.0 \ -I/usr/include/gtk-2.0" \ -make -cp cbatticon /squashfs-root/usr/bin +make >>$OUTPUT 2>&1 +cp cbatticon /squashfs-root/usr/bin >>$OUTPUT 2>&1 -dir2sb /squashfs-root /03-desktop.sb \ No newline at end of file +dir2sb /squashfs-root /03-desktop.sb >>$OUTPUT 2>&1 \ No newline at end of file diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.config/volumeicon/volumeicon b/linux-live/modules/03-desktop/rootcopy/home/live/.config/volumeicon/volumeicon new file mode 100644 index 0000000..80e3cc8 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.config/volumeicon/volumeicon @@ -0,0 +1,19 @@ +[StatusIcon] +stepsize=5 +lmb_slider=false +mmb_mute=false +use_horizontal_slider=false +show_sound_level=false +onclick=xterm -e 'alsamixer' +theme=White Gnome + +[Hotkeys] +up_enabled=true +down_enabled=true +mute_enabled=true +up=XF86AudioRaiseVolume +down=XF86AudioLowerVolume +mute=XF86AudioMute + +[Alsa] +card=default diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc b/linux-live/modules/03-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc new file mode 100644 index 0000000..f65e2a5 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.config/xarchiver/xarchiverrc @@ -0,0 +1,20 @@ +[xarchiver] +preferred_format=0 +confirm_deletion=true +sort_filename_content=false +store_output=false +icon_size=0 +show_archive_comment=false +show_sidebar=false +show_location_bar=false +preferred_temp_dir=/tmp +allow_sub_dir=0 +overwrite=false +full_path=true +touch=false +freshen=false +update=false +store_path=false +recurse=true +solid_archive=false +remove_files=false diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/apps b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/apps new file mode 100644 index 0000000..347fd3c --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/apps @@ -0,0 +1,18 @@ +[app] (name=fbrun) + [Position] (WINCENTER) {0 0} + [Layer] {2} +[end] + +[app] (name=gtkdialog) + [Position] (WINCENTER) {0 0} + [Layer] {2} +[end] + +[app] (name=xlunch) + [DECO] {NONE} + [IconHidden] {yes} +[end] + +[app] (name=xterm) {1} + [Position] (WINCENTER) {0 0} +[end] diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/fbrun_history b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/fbrun_history new file mode 100644 index 0000000..e69de29 diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/init b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/init new file mode 100644 index 0000000..66de046 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/init @@ -0,0 +1,76 @@ +session.screen0.slit.maxOver: false +session.screen0.slit.placement: TopLeft +session.screen0.slit.layer: Dock +session.screen0.slit.onhead: 0 +session.screen0.slit.acceptKdeDockapps: true +session.screen0.slit.alpha: 255 +session.screen0.slit.autoHide: false +session.screen0.menu.alpha: 255 +session.screen0.clientMenu.usePixmap: true +session.screen0.tab.placement: TopLeft +session.screen0.tab.width: 64 +session.screen0.toolbar.maxOver: false +session.screen0.toolbar.tools: RootMenu, iconbar, systemtray, clock +session.screen0.toolbar.autoHide: false +session.screen0.toolbar.widthPercent: 100 +session.screen0.toolbar.alpha: 255 +session.screen0.toolbar.visible: true +session.screen0.toolbar.placement: BottomCenter +session.screen0.toolbar.layer: Dock +session.screen0.toolbar.height: 0 +session.screen0.toolbar.onhead: 1 +session.screen0.tabs.usePixmap: true +session.screen0.tabs.maxOver: true +session.screen0.tabs.intitlebar: true +session.screen0.window.focus.alpha: 255 +session.screen0.window.unfocus.alpha: 255 +session.screen0.iconbar.usePixmap: true +session.screen0.iconbar.alignment: Left +session.screen0.iconbar.iconTextPadding: 10 +session.screen0.iconbar.mode: {static groups} (workspace) +session.screen0.iconbar.iconWidth: 128 +session.screen0.titlebar.left: +session.screen0.titlebar.right: Minimize Maximize Close +session.screen0.clickRaises: true +session.screen0.maxIgnoreIncrement: false +session.screen0.workspacewarping: true +session.screen0.colPlacementDirection: TopToBottom +session.screen0.maxDisableMove: false +session.screen0.rowPlacementDirection: LeftToRight +session.screen0.focusNewWindows: true +session.screen0.autoRaise: true +session.screen0.opaqueMove: true +session.screen0.maxDisableResize: false +session.screen0.tabFocusModel: ClickToTabFocus +session.screen0.tooltipDelay: 500 +session.screen0.fullMaximization: false +session.screen0.noFocusWhileTypingDelay: 0 +session.screen0.strftimeFormat: %H:%M +session.screen0.workspaces: 4 +session.screen0.allowRemoteActions: false +session.screen0.focusModel: ClickFocus +session.screen0.windowMenu: /root/.fluxbox/windowmenu +session.screen0.workspaceNames: Workspace 1 Ctrl+F1,Workspace 2 Ctrl+F2,Workspace 3 Ctrl+F3,Workspace 4 Ctrl+F4, +session.screen0.edgeSnapThreshold: 10 +session.screen0.showwindowposition: false +session.screen0.defaultDeco: NORMAL +session.screen0.menuDelay: 200 +session.screen0.windowPlacement: RowMinOverlapPlacement +session.screen0.focusSameHead: false +session.screen0.workspacewarping: false +session.keyFile: ~/.fluxbox/keys +session.menuFile: ~/.fluxbox/menu +session.styleFile: /usr/share/fluxbox/styles/Slax +session.colorsPerChannel: 4 +session.forcePseudoTransparency: true +session.ignoreBorder: false +session.doubleClickInterval: 250 +session.appsFile: /root/.fluxbox/apps +session.tabPadding: 0 +session.cacheLife: 5 +session.cacheMax: 200 +session.styleOverlay: /root/.fluxbox/overlay +session.autoRaiseDelay: 250 +session.slitlistFile: /root/.fluxbox/slitlist +session.tabsAttachArea: Window +session.configVersion: 13 diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/kblayout b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/kblayout new file mode 100644 index 0000000..c574d07 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/kblayout @@ -0,0 +1 @@ +en diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/keys b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/keys new file mode 100644 index 0000000..fd2b8c1 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/keys @@ -0,0 +1,139 @@ +# click on the desktop to get menus +OnDesktop Mouse1 :MacroCmd {WindowMenu} {HideMenus} +OnDesktop Mouse2 :WorkspaceMenu +OnDesktop Mouse3 :RootMenu + +# scroll on the desktop to change workspaces +#OnDesktop Mouse4 :PrevWorkspace +#OnDesktop Mouse5 :NextWorkspace + +# scroll on the toolbar to change current window +#OnToolbar Mouse4 :PrevWindow {static groups} (iconhidden=no) +#OnToolbar Mouse5 :NextWindow {static groups} (iconhidden=no) + +# alt + left/right click to move/resize a window +OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving} +OnWindowBorder Move1 :StartMoving + +OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner} +OnLeftGrip Move1 :StartResizing bottomleft +OnRightGrip Move1 :StartResizing bottomright + +# alt + middle click to lower the window +OnWindow Mod1 Mouse2 :Lower + +# control-click a window's titlebar and drag to attach windows +OnTitlebar Control Mouse1 :StartTabbing + +# double click on the titlebar to shade +OnTitlebar Double Mouse1 :Maximize + +# left click on the titlebar to move the window +OnTitlebar Mouse1 :MacroCmd {Raise} {Focus} {ActivateTab} {StartMoving} +OnTitlebar Move1 :StartMoving + +# middle click on the titlebar to lower +OnTitlebar Mouse2 :Lower + +# right click on the titlebar for a menu of options +OnTitlebar Mouse3 :WindowMenu + +# alt-tab +Mod1 Tab :NextWindow {groups} (workspace=[current]) +Mod1 Shift Tab :PrevWindow {groups} (workspace=[current]) + +# cycle through tabs in the current window +Mod4 Tab :NextTab +Mod4 Shift Tab :PrevTab + +# go to a specific tab in the current window +Mod4 1 :Tab 1 +Mod4 2 :Tab 2 +Mod4 3 :Tab 3 +Mod4 4 :Tab 4 +Mod4 5 :Tab 5 +Mod4 6 :Tab 6 +Mod4 7 :Tab 7 +Mod4 8 :Tab 8 +Mod4 9 :Tab 9 + +# open a terminal +Mod1 F1 :Exec xterm + +# open a dialog to run programs +Mod1 F2 :Exec fbappselect + +# volume settings, using common keycodes +# if these don't work, use xev to find out your real keycodes +176 :Exec amixer sset Master,0 1+ +174 :Exec amixer sset Master,0 1- +160 :Exec amixer sset Master,0 toggle + +# current window commands +Mod1 F4 :Close +Mod1 F5 :Kill +Mod1 F9 :Minimize +Mod1 F10 :Maximize +Mod1 F11 :Fullscreen + +# open the window menu +Mod1 space :WindowMenu + +# exit fluxbox +Control Mod1 Delete :Exit + +# change to previous/next workspace +Control Mod1 Left :PrevWorkspace +Control Mod1 Right :NextWorkspace + +# send the current window to previous/next workspace +Mod4 Left :SendToPrevWorkspace +Mod4 Right :SendToNextWorkspace + +# send the current window and follow it to previous/next workspace +Control Mod4 Left :TakeToPrevWorkspace +Control Mod4 Right :TakeToNextWorkspace + +# change to a specific workspace +Control F1 :Workspace 1 +Control F2 :Workspace 2 +Control F3 :Workspace 3 +Control F4 :Workspace 4 +Control F5 :Workspace 5 +Control F6 :Workspace 6 +Control F7 :Workspace 7 +Control F8 :Workspace 8 +Control F9 :Workspace 9 +Control F10 :Workspace 10 +Control F11 :Workspace 11 +Control F12 :Workspace 12 + +# send the current window to a specific workspace +Mod4 F1 :SendToWorkspace 1 +Mod4 F2 :SendToWorkspace 2 +Mod4 F3 :SendToWorkspace 3 +Mod4 F4 :SendToWorkspace 4 +Mod4 F5 :SendToWorkspace 5 +Mod4 F6 :SendToWorkspace 6 +Mod4 F7 :SendToWorkspace 7 +Mod4 F8 :SendToWorkspace 8 +Mod4 F9 :SendToWorkspace 9 +Mod4 F10 :SendToWorkspace 10 +Mod4 F11 :SendToWorkspace 11 +Mod4 F12 :SendToWorkspace 12 + +# send the current window and change to a specific workspace +Control Mod4 F1 :TakeToWorkspace 1 +Control Mod4 F2 :TakeToWorkspace 2 +Control Mod4 F3 :TakeToWorkspace 3 +Control Mod4 F4 :TakeToWorkspace 4 +Control Mod4 F5 :TakeToWorkspace 5 +Control Mod4 F6 :TakeToWorkspace 6 +Control Mod4 F7 :TakeToWorkspace 7 +Control Mod4 F8 :TakeToWorkspace 8 +Control Mod4 F9 :TakeToWorkspace 9 +Control Mod4 F10 :TakeToWorkspace 10 +Control Mod4 F11 :TakeToWorkspace 11 +Control Mod4 F12 :TakeToWorkspace 12 + +Print :Exec fbprintscreen diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/lastwallpaper b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/lastwallpaper new file mode 100644 index 0000000..686a294 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/lastwallpaper @@ -0,0 +1 @@ +fbsetroot|-foreground #7790aa -solid #7790aa|style|:0.0 diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/menu b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/menu new file mode 100644 index 0000000..f55cc8f --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/menu @@ -0,0 +1,68 @@ +[begin] (Desktop menu) + [exec] (Terminal) { fbstartupnotify && xterm -ls } + [exec] (File Manager) { fbstartupnotify && pcmanfm } + [exec] (Web Browser) { fbstartupnotify && fbliveapp chromium } + [exec] (Text Editor) { fbstartupnotify && leafpad } + [exec] (Calculator) { fbstartupnotify && qalculate } + [exec] (Network Manager) { fbstartupnotify && wicd-manager } + [exec] (Run) { fbappselect } + [separator] + [workspaces] (Workspaces ...) + [submenu] (Screen resolution ...) {} + [include] (~/.fluxbox/menu_resolution) + [end] + [submenu] (Keyboard layout ...) {} + [exec] (Czech) { fbsetkb cz } + [exec] (English) { fbsetkb us } + [exec] (French) { fbsetkb fr } + [exec] (German) { fbsetkb de } + [exec] (Italian) { fbsetkb it } + [exec] (Polish) { fbsetkb pl } + [exec] (Portuguese) { fbsetkb pt } + [exec] (Russian) { fbsetkb ru } + [exec] (Slovak) { fbsetkb sk } + [exec] (Spanish) { fbsetkb es } + [exec] (Ukrainian) { fbsetkb ua } + [submenu] (Other ...) {} + [exec] (Afghani) { fbsetkb af } + [exec] (Albanian) { fbsetkb al } + [exec] (Arabic [Morocco]) { fbsetkb ma } + [exec] (Arabic) { fbsetkb ara } + [exec] (Armenian) { fbsetkb am } + [exec] (Azerbaijani) { fbsetkb az } + [exec] (Belarusian) { fbsetkb by } + [exec] (Belgian) { fbsetkb be } + [exec] (Berber [Algeria]) { fbsetkb dz } + [exec] (Bosnian) { fbsetkb ba } + [exec] (Brasil) { fbsetkb br } + [exec] (Bulgarian) { fbsetkb bg } + [exec] (Croatian) { fbsetkb hr } + [exec] (Danish) { fbsetkb dk } + [exec] (Dutch) { fbsetkb nl } + [exec] (English [Australian]) { fbsetkb au } + [exec] (Estonian) { fbsetkb ee } + [exec] (Finnish) { fbsetkb fi } + [exec] (French [Canada]) { fbsetkb ca } + [exec] (German [Austria]) { fbsetkb at } + [exec] (German [Switzerland]) { fbsetkb ch } + [exec] (Greek) { fbsetkb gr } + [exec] (Hebrew) { fbsetkb il } + [exec] (Hungarian) { fbsetkb hu } + [exec] (Icelandic) { fbsetkb is } + [exec] (Indian) { fbsetkb in } + [exec] (Iraqi) { fbsetkb iq } + [exec] (Irish) { fbsetkb ie } + [exec] (Latvian) { fbsetkb lv } + [exec] (Lithuanian) { fbsetkb lt } + [exec] (Norwegian) { fbsetkb no } + [exec] (Persian) { fbsetkb ir } + [exec] (Romanian) { fbsetkb ro } + [exec] (Serbian) { fbsetkb rs } + [exec] (Slovenian) { fbsetkb si } + [exec] (Swedish) { fbsetkb se } + [exec] (Turkish) { fbsetkb tr } + [end] + [end] + [exec] (Exit / Logout) { fblogout } + +[end] diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/overlay b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/overlay new file mode 100644 index 0000000..bb4e91c --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/overlay @@ -0,0 +1,2 @@ +! The following line will prevent styles from setting the background. +! background: none diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/slitlist b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/slitlist new file mode 100644 index 0000000..e69de29 diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup new file mode 100644 index 0000000..fcf7527 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/startup @@ -0,0 +1,111 @@ +#!/bin/sh +# +# fluxbox startup-script: +# +# Lines starting with a '#' are ignored. + +# Change your keymap: +xmodmap "/root/.Xmodmap" + +# merge xresource settings +xrdb -merge ~/.Xresources + +# set keyboard layout +fbsetkb $(cat ~/.fluxbox/kblayout) + +# setup bookmarks for file manager +gtk-bookmarks-update + +# Share common directories with guest user. This is necessary +# 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 + fi +done + +# set background color and big wait mouse cursor +xsetroot -solid '#111111' +xsetroot -xcf /usr/share/icons/breeze_cursors/cursors/watch 37 + +# disable screen blanking +xset s off +xset -dpms + +# volume icon in system tray. Can fail if no soundcard is detected +volumeicon & + +# preload compton and fluxbox to cache +(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 + aplay $SND & + sleep 1 & + SOUNDPID=$! +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 +if [ $? -eq 0 ]; then + fbautostart +fi + +# We need to postpone compton after fluxbox starts, else it won't set +# the transparency of toolbar properly... So we check the fehbg file, +# which is created by fluxbox at the phase when it sets background. +# Once the file exist, fluxbox-toolbar is already started + +SIGNAL1=~/.fehbg +SIGNAL2=~/.fehbg2 + +rm -f $SIGNAL1 2>/dev/null +rm -f $SIGNAL2 2>/dev/null + +( + while [ ! -e $SIGNAL1 ]; do + sleep 0.1 + 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" & ) & + + 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' +) & + +# We want to run systrayicon only after the volumeicon is started +# So we have to wait until it is visible to xwinfo +# We also wait after background is set and compton is started +( + while [ ! -e $SIGNAL2 ]; do + sleep 0.1 + done + + rm -f $SIGNAL2 + + while ! xwininfo -name volumeicon >/dev/null 2>&1 && pgrep volumeicon >/dev/null 2>&1; do + sleep 0.1 + done + + exec systrayicon --command fblogout --iconfile /usr/share/icons/locolor/16x16/actions/system-shutdown-symbolic.png +) & + +# 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 + +# In all cases, wait for the sound sleeper. +# If startup took longer (sound completed already), no extra wait +wait $SOUNDPID + +# And last but not least we start fluxbox. +# Because it is the last app you have to run it with ''exec'' before it. + +exec fluxbox diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/windowmenu b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/windowmenu new file mode 100644 index 0000000..d867b64 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.fluxbox/windowmenu @@ -0,0 +1,15 @@ +[begin] + [shade] + [stick] + [maximize] + [iconify] + [raise] + [lower] + [settitledialog] + [sendto] + [layer] + [alpha] + [extramenus] + [separator] + [close] +[end] diff --git a/linux-live/modules/03-desktop/rootcopy/home/live/.xinitrc b/linux-live/modules/03-desktop/rootcopy/home/live/.xinitrc new file mode 100644 index 0000000..22df2f4 --- /dev/null +++ b/linux-live/modules/03-desktop/rootcopy/home/live/.xinitrc @@ -0,0 +1 @@ +startfluxbox diff --git a/linux-live/modules/03-desktop/rootcopy/usr/share/wallpapers/slax_wallpaper.jpg b/linux-live/modules/03-desktop/rootcopy/usr/share/wallpapers/slax_wallpaper.jpg index c5d7af5..6ce0014 100644 Binary files a/linux-live/modules/03-desktop/rootcopy/usr/share/wallpapers/slax_wallpaper.jpg and b/linux-live/modules/03-desktop/rootcopy/usr/share/wallpapers/slax_wallpaper.jpg differ diff --git a/linux-live/modules/04-apps/cleanup b/linux-live/modules/04-apps/cleanup deleted file mode 100644 index dd745ec..0000000 --- a/linux-live/modules/04-apps/cleanup +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -rm -f /etc/fstab -rm -f /etc/mtab -rm -f /etc/apt/sources.list~ -rm -Rf /etc/systemd/system/timers.target.wants -rm -f /etc/systemd/system/multi-user.target.wants/ssh.service -rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service - -rm -f /etc/ssh/ssh_host* - -rm -f /var/backups/* -rm -f /var/cache/ldconfig/* -rm -f /var/cache/debconf/* -rm -f /var/cache/fontconfig/* -rm -f /var/lib/apt/extended_states -rm -f /var/lib/systemd/random-seed -rm -f /var/lib/apt/lists/deb.* -rm -Rf /root/.local/share/mc -rm -Rf /root/.cache -rm -f /root/.wget-hsts - -rm -f /var/lib/dpkg/*-old -rm -f /var/log/* -rm -f /var/log/*/* -rm -f /var/log/*/*/* -rm -f /var/cache/apt/archives/*.deb -rm -f /var/cache/apt/*.bin -rm -f /var/cache/debconf/*-old -rm -f /var/lib/dhcp/dhclient.leases -rm -f /root/.bash_history -rm -f /root/.wget-hsts -rm -Rf /usr/share/doc/* -rm -Rf /usr/share/info/* -rm -f /usr/share/images/fluxbox/debian-squared.jpg -rm -Rf /usr/share/fluxbox/nls/??* -rm -Rf /usr/share/gnome/help - -rm -Rf /usr/share/locale/?? -rm -Rf /usr/share/locale/??_* -rm -Rf /usr/share/locale/??@* -rm -Rf /usr/share/locale/??? -rm -Rf /usr/share/i18n/locales/*_* -rm -Rf /usr/share/man/?? -rm -Rf /usr/share/man/*_* - -rm -Rf /usr/share/icons/elementaryXubuntu-dark -rm -Rf /usr/share/icons/gnome/256x256 - -rm /usr/share/applications/compton.desktop -rm /usr/share/applications/debian-uxterm.desktop -rm /usr/share/applications/debian-xterm.desktop -rm /usr/share/applications/htop.desktop -rm /usr/share/applications/mc.desktop -rm /usr/share/applications/mcedit.desktop -rm /usr/share/applications/pcmanfm-desktop-pref.desktop -rm /usr/share/applications/python2.7.desktop -rm /usr/share/applications/python3.7.desktop -rm /usr/share/applications/vim.desktop - - - -# 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 -} - -uncompress_files /etc/alternatives -uncompress_files /usr/share/man - -# remove broken links -# $1 = search directory -remove_broken_links() -{ - find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf -} - -remove_broken_links /etc/alternatives -remove_broken_links /usr/share/man - diff --git a/linux-live/modules/04-apps/install b/linux-live/modules/04-apps/install old mode 100755 new mode 100644 index 3c54525..e4b9f63 --- a/linux-live/modules/04-apps/install +++ b/linux-live/modules/04-apps/install @@ -2,14 +2,17 @@ CWD=$(dirname $(readlink -f $0)) -apt-get update +echo "wicd-daemon wicd/users multiselect live" | debconf-set-selections + +apt-get update >>$OUTPUT 2>&1 apt-get install --no-install-recommends --yes \ qalculate-gtk \ pcmanfm \ lxtask \ xarchiver xdg-utils libgconf-2-4 \ - wicd - -. ./cleanup + wicd >>$OUTPUT 2>&1 (cd /rootcopy && cp --parents -afr * /) + +chown live.users /home/live +chown -R live.users /home/live \ No newline at end of file diff --git a/linux-live/modules/04-apps/install2 b/linux-live/modules/04-apps/install2 index 4f3adaf..4e524e0 100644 --- a/linux-live/modules/04-apps/install2 +++ b/linux-live/modules/04-apps/install2 @@ -4,34 +4,34 @@ CWD=$(dirname $(readlink -f $0)) cd / -rm -Rf /squashfs-root/root/.fluxbox -rm -f /squashfs-root/root/.gtk-bookmarks +#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 -apt-get --yes build-dep pcmanfm +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 +apt-get source pcmanfm >>$OUTPUT 2>&1 cd pcmanfm-1.3.1 -dpkg-buildpackage -us -uc -patch -p1 < $CWD/patches/pcmanfm-slax.diff -make +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 -cp src/pcmanfm /squashfs-root/usr/bin +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/leafpad.desktop -rm -f /squashfs-root/usr/share/applications/qalculate-gtk.desktop -rm -f /squashfs-root/usr/share/applications/pcmanfm.desktop -rm -f /squashfs-root/usr/share/applications/wicd.desktop -rm -f /squashfs-root/usr/share/applications/lxtask.desktop +rm -f /squashfs-root/usr/share/applications/leafpad.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/wicd.desktop >>$OUTPUT 2>&1 +rm -f /squashfs-root/usr/share/applications/lxtask.desktop >>$OUTPUT 2>&1 -dir2sb /squashfs-root /04-apps.sb +dir2sb /squashfs-root /04-apps.sb >>$OUTPUT 2>&1 diff --git a/linux-live/modules/04-apps/rootcopy/home/live/.config/libfm/libfm.conf b/linux-live/modules/04-apps/rootcopy/home/live/.config/libfm/libfm.conf new file mode 100644 index 0000000..4e71676 --- /dev/null +++ b/linux-live/modules/04-apps/rootcopy/home/live/.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/04-apps/rootcopy/home/live/.config/pcmanfm/default/pcmanfm.conf b/linux-live/modules/04-apps/rootcopy/home/live/.config/pcmanfm/default/pcmanfm.conf new file mode 100644 index 0000000..a39ba16 --- /dev/null +++ b/linux-live/modules/04-apps/rootcopy/home/live/.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/04-apps/rootcopy/home/live/.qalculate/qalculate-gtk.cfg b/linux-live/modules/04-apps/rootcopy/home/live/.qalculate/qalculate-gtk.cfg new file mode 100644 index 0000000..cc01904 --- /dev/null +++ b/linux-live/modules/04-apps/rootcopy/home/live/.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/05-chromium/cleanup b/linux-live/modules/05-chromium/cleanup deleted file mode 100644 index dd745ec..0000000 --- a/linux-live/modules/05-chromium/cleanup +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash - -rm -f /etc/fstab -rm -f /etc/mtab -rm -f /etc/apt/sources.list~ -rm -Rf /etc/systemd/system/timers.target.wants -rm -f /etc/systemd/system/multi-user.target.wants/ssh.service -rm -f /etc/systemd/system/multi-user.target.wants/dnsmasq.service - -rm -f /etc/ssh/ssh_host* - -rm -f /var/backups/* -rm -f /var/cache/ldconfig/* -rm -f /var/cache/debconf/* -rm -f /var/cache/fontconfig/* -rm -f /var/lib/apt/extended_states -rm -f /var/lib/systemd/random-seed -rm -f /var/lib/apt/lists/deb.* -rm -Rf /root/.local/share/mc -rm -Rf /root/.cache -rm -f /root/.wget-hsts - -rm -f /var/lib/dpkg/*-old -rm -f /var/log/* -rm -f /var/log/*/* -rm -f /var/log/*/*/* -rm -f /var/cache/apt/archives/*.deb -rm -f /var/cache/apt/*.bin -rm -f /var/cache/debconf/*-old -rm -f /var/lib/dhcp/dhclient.leases -rm -f /root/.bash_history -rm -f /root/.wget-hsts -rm -Rf /usr/share/doc/* -rm -Rf /usr/share/info/* -rm -f /usr/share/images/fluxbox/debian-squared.jpg -rm -Rf /usr/share/fluxbox/nls/??* -rm -Rf /usr/share/gnome/help - -rm -Rf /usr/share/locale/?? -rm -Rf /usr/share/locale/??_* -rm -Rf /usr/share/locale/??@* -rm -Rf /usr/share/locale/??? -rm -Rf /usr/share/i18n/locales/*_* -rm -Rf /usr/share/man/?? -rm -Rf /usr/share/man/*_* - -rm -Rf /usr/share/icons/elementaryXubuntu-dark -rm -Rf /usr/share/icons/gnome/256x256 - -rm /usr/share/applications/compton.desktop -rm /usr/share/applications/debian-uxterm.desktop -rm /usr/share/applications/debian-xterm.desktop -rm /usr/share/applications/htop.desktop -rm /usr/share/applications/mc.desktop -rm /usr/share/applications/mcedit.desktop -rm /usr/share/applications/pcmanfm-desktop-pref.desktop -rm /usr/share/applications/python2.7.desktop -rm /usr/share/applications/python3.7.desktop -rm /usr/share/applications/vim.desktop - - - -# 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 -} - -uncompress_files /etc/alternatives -uncompress_files /usr/share/man - -# remove broken links -# $1 = search directory -remove_broken_links() -{ - find "$1" -type l -exec test ! -e {} \; -print | xargs rm -vf -} - -remove_broken_links /etc/alternatives -remove_broken_links /usr/share/man - diff --git a/linux-live/modules/05-chromium/install b/linux-live/modules/05-chromium/install old mode 100755 new mode 100644 index 463a90d..fe880a2 --- a/linux-live/modules/05-chromium/install +++ b/linux-live/modules/05-chromium/install @@ -1,15 +1,13 @@ #!/bin/bash -apt-get update -apt-get install --yes --no-install-recommends chromium chromium-sandbox - -. ./cleanup +apt-get update >>$OUTPUT 2>&1 +apt-get install --yes --no-install-recommends chromium chromium-sandbox >>$OUTPUT 2>&1 echo 'export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --disk-cache-dir=/dev/null --disk-cache-size=1"' >>/etc/chromium.d/default-flags -rm -Rf /usr/share/icons/gnome/256x256 -rm -Rf /root/.fluxbox -rm -Rf /root/.fluxbox/kblayout -rm -Rf /root/.gtk-bookmarks -rm -Rf /var/lib/wicd/dhclient.conf -rm -Rf /usr/share/applications/chromium.desktop +rm -Rf /usr/share/icons/gnome/256x256 >>$OUTPUT 2>&1 +#rm -Rf /root/.fluxbox +#rm -Rf /root/.fluxbox/kblayout +#rm -Rf /root/.gtk-bookmarks +#rm -Rf /var/lib/wicd/dhclient.conf +rm -Rf /usr/share/applications/chromium.desktop >>$OUTPUT 2>&1 diff --git a/linux-live/pkglists/main.list b/linux-live/pkglists/main.list deleted file mode 100644 index 83b471e..0000000 --- a/linux-live/pkglists/main.list +++ /dev/null @@ -1,41 +0,0 @@ -mc -squashfs-tools -genisoimage -zip -unzip -psmisc -net-tools -alsa-utils -man -less -xz-utils -ca-certificates -openssl -acpid -acpi-support-base -powermgmt-base -bzip2 -gpart -hdparm -sdparm -mdadm -smartmontools -dosfstools -lsof -htop -gddrescue -rsync -netcat -ssh -gpm -wireless-tools -ntfs-3g -rfkill -file -dnsmasq -ntpdate -dvd+rw-tools -usb-modeswitch -pm-utils -wget -linux-image-amd64 \ No newline at end of file diff --git a/linux-live/pkglists/prereq.list b/linux-live/pkglists/prereq.list index 8c6d783..cff925c 100644 --- a/linux-live/pkglists/prereq.list +++ b/linux-live/pkglists/prereq.list @@ -1,5 +1,5 @@ # Приложения, без которых невозможна установка. sudo -libterm-readline-gnu-perl +#libterm-readline-gnu-perl systemd-sysv dbus \ No newline at end of file