From 6bf22ca679d1933bf1cfbe79bbf5c5882d1166b0 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 22 May 2021 14:17:30 +0300 Subject: [PATCH] update --- {linux-live => .unused}/minioslib.copy | 0 {linux-live => .unused}/minioslib.test | 0 .unused/nii/03-apps/install | 37 ++++++ .unused/nii/03-apps/package.list | 8 ++ .../nii}/03-apps/postinstall | 0 .../rootcopy/etc/cts/registration_number.json | 0 .../rootcopy/etc/cts/settings-general.json | 0 .../etc/cts/user_registration_info.json | 0 .../etc/skel/.config/xfce4/helpers.rc | 1 + .../panel/launcher-19/16093657651.desktop | 15 +++ .../panel/launcher-23/16093659533.desktop | 16 +++ .../panel/launcher-24/16093659584.desktop | 14 ++ .../skel/.config/xfce4/panel/whiskermenu-1.rc | 68 ++++++++++ .../xfce-perchannel-xml/xfce4-panel.xml | 123 ++++++++++++++++++ .../rootcopy/etc/skel/.cts/settings.conf | 0 .../rootcopy/root/cts-4.0.0-104.ks1_amd64.deb | Bin .../share/applications/RDWebAccess.desktop | 0 .../share/applications/RDWebClient.desktop | 0 .../hicolor/apps/microsoft-remote-desktop.png | Bin .unused/wg-gen-web.yml | 34 +++++ docker/02-build.sh | 4 +- linux-live/buildconfig | 3 + linux-live/config | 2 +- linux-live/minioslib | 59 ++++++--- linux-live/modules/02-xubuntu/postinstall | 4 + linux-live/modules/03-apps/install | 21 --- linux-live/modules/03-apps/package.list | 8 +- linux-live/modules/04-drivers/postinstall | 4 +- .../skel/.config/xfce4/panel/whiskermenu-1.rc | 2 +- .../skel/.config/xfce4/panel/whiskermenu-1.rc | 2 +- .../skel/.config/xfce4/panel/whiskermenu-1.rc | 2 +- 31 files changed, 376 insertions(+), 51 deletions(-) rename {linux-live => .unused}/minioslib.copy (100%) rename {linux-live => .unused}/minioslib.test (100%) create mode 100644 .unused/nii/03-apps/install create mode 100644 .unused/nii/03-apps/package.list rename {linux-live/modules => .unused/nii}/03-apps/postinstall (100%) rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/etc/cts/registration_number.json (100%) rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/etc/cts/settings-general.json (100%) rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/etc/cts/user_registration_info.json (100%) create mode 100644 .unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/helpers.rc create mode 100644 .unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop create mode 100644 .unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop create mode 100644 .unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop create mode 100644 .unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc create mode 100644 .unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/etc/skel/.cts/settings.conf (100%) rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb (100%) rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop (100%) rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop (100%) rename {linux-live/modules => .unused/nii}/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png (100%) create mode 100644 .unused/wg-gen-web.yml diff --git a/linux-live/minioslib.copy b/.unused/minioslib.copy similarity index 100% rename from linux-live/minioslib.copy rename to .unused/minioslib.copy diff --git a/linux-live/minioslib.test b/.unused/minioslib.test similarity index 100% rename from linux-live/minioslib.test rename to .unused/minioslib.test diff --git a/.unused/nii/03-apps/install b/.unused/nii/03-apps/install new file mode 100644 index 0000000..421ed79 --- /dev/null +++ b/.unused/nii/03-apps/install @@ -0,0 +1,37 @@ +#!/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 + +cd /root +#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 >>$OUTPUT 2>&1 +#echo "deb https://download.onlyoffice.com/repo/debian squeeze main" >/etc/apt/sources.list.d/onlyoffice.list >>$OUTPUT 2>&1 +wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - >>$OUTPUT 2>&1 +wget -c https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb >>$OUTPUT 2>&1 +sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + $APT_CMD update +#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ +# $APT_CMD install $APT_OPTIONS onlyoffice-desktopeditors +sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + $APT_CMD install $APT_OPTIONS /root/google-chrome-stable_current_amd64.deb /root/cts-4.0.0-104.ks1_amd64.deb >>$OUTPUT 2>&1 + +if [ -d /home/live ]; then + mkdir -p /home/live/.cts + cp /etc/skel/.cts/settings.conf /home/live/.cts/ + chmod 755 /home/live/.cts + chown live:live /home/live/.cts + chmod 644 /home/live/.cts/settings.conf + chown live:live /home/live/.cts/settings.conf +fi diff --git a/.unused/nii/03-apps/package.list b/.unused/nii/03-apps/package.list new file mode 100644 index 0000000..a360beb --- /dev/null +++ b/.unused/nii/03-apps/package.list @@ -0,0 +1,8 @@ +open-vm-tools-desktop +#firefox +#firefox-locale-ru +remmina +parole +recordmydesktop +#compizconfig-settings-manager +#compiz-plugins \ No newline at end of file diff --git a/linux-live/modules/03-apps/postinstall b/.unused/nii/03-apps/postinstall similarity index 100% rename from linux-live/modules/03-apps/postinstall rename to .unused/nii/03-apps/postinstall diff --git a/linux-live/modules/03-apps/rootcopy/etc/cts/registration_number.json b/.unused/nii/03-apps/rootcopy/etc/cts/registration_number.json similarity index 100% rename from linux-live/modules/03-apps/rootcopy/etc/cts/registration_number.json rename to .unused/nii/03-apps/rootcopy/etc/cts/registration_number.json diff --git a/linux-live/modules/03-apps/rootcopy/etc/cts/settings-general.json b/.unused/nii/03-apps/rootcopy/etc/cts/settings-general.json similarity index 100% rename from linux-live/modules/03-apps/rootcopy/etc/cts/settings-general.json rename to .unused/nii/03-apps/rootcopy/etc/cts/settings-general.json diff --git a/linux-live/modules/03-apps/rootcopy/etc/cts/user_registration_info.json b/.unused/nii/03-apps/rootcopy/etc/cts/user_registration_info.json similarity index 100% rename from linux-live/modules/03-apps/rootcopy/etc/cts/user_registration_info.json rename to .unused/nii/03-apps/rootcopy/etc/cts/user_registration_info.json diff --git a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/helpers.rc b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/helpers.rc new file mode 100644 index 0000000..fc0f325 --- /dev/null +++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/helpers.rc @@ -0,0 +1 @@ +WebBrowser=google-chrome \ No newline at end of file diff --git a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop new file mode 100644 index 0000000..19e8d6c --- /dev/null +++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-19/16093657651.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=exo-open --launch FileManager %u +Icon=system-file-manager +StartupNotify=true +Terminal=false +Categories=Utility;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +X-XFCE-MimeType=inode/directory;x-scheme-handler/trash; +Name=File Manager +Name[ru]=Файловый менеджер +Comment=Browse the file system +Comment[ru]=Просмотреть файловую систему +X-XFCE-Source=file:///usr/share/applications/exo-file-manager.desktop diff --git a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop new file mode 100644 index 0000000..0298d34 --- /dev/null +++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-23/16093659533.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=exo-open --launch WebBrowser %u +Icon=web-browser +StartupNotify=true +Terminal=false +Categories=Network;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https; +Name=Web Browser +Name[ru]=Веб-браузер +Comment=Browse the web +Comment[ru]=Смотреть в Интернете +X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop +Path= diff --git a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop new file mode 100644 index 0000000..2034e66 --- /dev/null +++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/launcher-24/16093659584.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=exo-open --launch TerminalEmulator +Icon=utilities-terminal +StartupNotify=true +Terminal=false +Categories=Utility;X-XFCE;X-Xfce-Toplevel; +OnlyShowIn=XFCE; +Name=Terminal Emulator +Name[ru]=Эмулятор терминала +Comment=Use the command line +Comment[ru]=Использовать командную строку +X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop diff --git a/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc new file mode 100644 index 0000000..d6d7db6 --- /dev/null +++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc @@ -0,0 +1,68 @@ +favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop +recent= +button-title=Applications Menu +button-icon=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/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 0000000..38aef24 --- /dev/null +++ b/.unused/nii/03-apps/rootcopy/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linux-live/modules/03-apps/rootcopy/etc/skel/.cts/settings.conf b/.unused/nii/03-apps/rootcopy/etc/skel/.cts/settings.conf similarity index 100% rename from linux-live/modules/03-apps/rootcopy/etc/skel/.cts/settings.conf rename to .unused/nii/03-apps/rootcopy/etc/skel/.cts/settings.conf diff --git a/linux-live/modules/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb b/.unused/nii/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb similarity index 100% rename from linux-live/modules/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb rename to .unused/nii/03-apps/rootcopy/root/cts-4.0.0-104.ks1_amd64.deb diff --git a/linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop b/.unused/nii/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop similarity index 100% rename from linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop rename to .unused/nii/03-apps/rootcopy/usr/share/applications/RDWebAccess.desktop diff --git a/linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop b/.unused/nii/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop similarity index 100% rename from linux-live/modules/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop rename to .unused/nii/03-apps/rootcopy/usr/share/applications/RDWebClient.desktop diff --git a/linux-live/modules/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png b/.unused/nii/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png similarity index 100% rename from linux-live/modules/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png rename to .unused/nii/03-apps/rootcopy/usr/share/icons/hicolor/apps/microsoft-remote-desktop.png diff --git a/.unused/wg-gen-web.yml b/.unused/wg-gen-web.yml new file mode 100644 index 0000000..95080af --- /dev/null +++ b/.unused/wg-gen-web.yml @@ -0,0 +1,34 @@ +version: "3.6" +services: + wg-gen-web: + image: vx3r/wg-gen-web:latest + container_name: wg-gen-web + restart: unless-stopped + expose: + - "8080/tcp" + environment: + - WG_CONF_DIR=/data + - WG_INTERFACE_NAME=wg0.conf + - SMTP_HOST=mail.crims0n.ru + - SMTP_PORT=587 + - SMTP_USERNAME=no-reply@crims0n.ru + - SMTP_PASSWORD=4ys4eUVNcVCuvJ + - SMTP_FROM=Wg Gen Web + - OAUTH2_PROVIDER_NAME=github + - OAUTH2_PROVIDER=https://github.com + - OAUTH2_CLIENT_ID=1347a6c5a942ca0a52ed + - OAUTH2_CLIENT_SECRET=2f1d162b2d8d82bc58f685660e6875d2544d059c + - OAUTH2_REDIRECT_URL=http://140.238.172.15:8080 + - WG_STATS_API=http://10.0.0.2:8182 + volumes: + - /etc/wireguard:/data + ports: + - 8080:8080 + wg-json-api: + image: james/wg-api:latest + container_name: wg-json-api + restart: unless-stopped + cap_add: + - NET_ADMIN + network_mode: "host" + command: wg-api --device wg0 --listen 0.0.0.0:8182 diff --git a/docker/02-build.sh b/docker/02-build.sh index 336289f..1e7a43e 100755 --- a/docker/02-build.sh +++ b/docker/02-build.sh @@ -1,4 +1,4 @@ #!/bin/bash -#docker run --rm -it --privileged -v /build:/build local/mlc +docker run --rm -it --privileged -v /build:/build local/mlc #docker run -it --name mlc --privileged -v /build:/build local/mlc -docker run -d --name mlc --privileged -v /build:/build local/mlc \ No newline at end of file +#docker run -d --name mlc --privileged -v /build:/build local/mlc \ No newline at end of file diff --git a/linux-live/buildconfig b/linux-live/buildconfig index f455b4e..af0f4e9 100644 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -31,4 +31,7 @@ APT_OPTIONS="-y" #--no-install-recommends" #LIVE_TYPE="casper" LIVE_TYPE="livekit" +UNION_BUILD_TYPE="overlayfs" +#UNION_BUILD_TYPE="aufs" + INSTALL_OPTIONAL="1" diff --git a/linux-live/config b/linux-live/config index 442a4ea..681ccbb 100644 --- a/linux-live/config +++ b/linux-live/config @@ -33,7 +33,7 @@ DISTRIBUTION_VARIANT="minbase" DISTRIBUTION_URL="http://ru.archive.ubuntu.com/ubuntu" # -COMP_TYPE="lz4" +COMP_TYPE="xz" # Kernel file, will be copied to your Live Kit # Your kernel must support aufs and squashfs. Debian Jessie's kernel is ready diff --git a/linux-live/minioslib b/linux-live/minioslib index 14a63bd..cc1df86 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -1037,7 +1037,8 @@ function build_iso() { E="EFI/boot/efiboot.img -no-emul-boot" - VER="$SYSTEMNAME $VER" + #VER="$SYSTEMNAME $VER" + VER="$SYSTEMNAME" if [ REMOVE_OLD_ISO = "1" ]; then rm $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-*.iso >>$OUTPUT 2>&1 @@ -1610,19 +1611,36 @@ function module_chroot_mount_fs() { module_check_mounted - MODULES_LIST="" - MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT) - for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do - MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT) - mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower - mount ${MODULES[$i]} $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower - MODULES_LIST=$MODULES_LIST":""$MODULES_DIR/lower/$MODULE_LOWER_DIR-lower" - done - MODULES_LIST=${MODULES_LIST:1} + if [ $UNION_BUILD_TYPE = "overlayfs" ]; then + MODULES_LIST="" + MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT) + for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do + MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT) + mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower + mount ${MODULES[$i]} $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower + MODULES_LIST=$MODULES_LIST":""$MODULES_DIR/lower/$MODULE_LOWER_DIR-lower" + done + MODULES_LIST=${MODULES_LIST:1} + + mkdir -p $MODULE_UPPER_DIR $MODULE_WORK_DIR $MODULE_MERGED_DIR + + mount -t overlay overlay -o lowerdir=$MODULES_LIST,upperdir=$MODULE_UPPER_DIR,workdir=$MODULE_WORK_DIR $MODULE_MERGED_DIR + elif [ $UNION_BUILD_TYPE = "aufs" ]; then + MODULES_LIST="" + MODULES=($PARENT_DIR/image/$LIVEKITNAME/*.$BEXT) + for ((i = ${#MODULES[@]} - 1; i >= 0; i--)); do + MODULE_LOWER_DIR=$(basename ${MODULES[$i]} .$BEXT) + mkdir -p $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower + mount ${MODULES[$i]} $MODULES_DIR/lower/$MODULE_LOWER_DIR-lower + MODULES_LIST=$MODULES_LIST":""$MODULES_DIR/lower/$MODULE_LOWER_DIR-lower""=ro" + done + MODULES_LIST=${MODULES_LIST:1} - mkdir -p $MODULE_UPPER_DIR $MODULE_WORK_DIR $MODULE_MERGED_DIR + mkdir -p $MODULE_UPPER_DIR $MODULE_WORK_DIR $MODULE_MERGED_DIR - mount -t overlay overlay -o lowerdir=$MODULES_LIST,upperdir=$MODULE_UPPER_DIR,workdir=$MODULE_WORK_DIR $MODULE_MERGED_DIR + mount -t aufs -o br:$MODULE_UPPER_DIR=rw:$MODULES_LIST aufs $MODULE_MERGED_DIR + #echo "mount -t aufs -o br:$MODULE_UPPER_DIR=rw:$MODULES_LIST aufs $MODULE_MERGED_DIR" + fi if [ ! -d $MODULE_MERGED_DIR/dev ]; then mkdir -p $MODULE_MERGED_DIR/dev @@ -1728,7 +1746,7 @@ function module_cleanup() { } function module_chroot_finish_up() { - current_process + echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." # truncate machine id (why??) chroot $MODULE_MERGED_DIR /bin/bash -x <>$OUTPUT 2>&1 dpkg-divert --rename --remove /sbin/initctl >>$OUTPUT 2>&1 EOF +} +function module_chroot_cleanup() { + echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..." # clean up useless stuff rm -rf $MODULE_UPPER_DIR/boot $MODULE_UPPER_DIR/dev $MODULE_UPPER_DIR/proc $MODULE_UPPER_DIR/sys $MODULE_UPPER_DIR/rmp $MODULE_UPPER_DIR/run rm -f $MODULE_UPPER_DIR/root/.bash_history >>$OUTPUT 2>&1 @@ -1760,10 +1781,10 @@ EOF rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/*InRelease >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/var/lib/apt/lists/deb.* >>$OUTPUT 2>&1 rm -f $MODULE_UPPER_DIR/var/lib/dpkg/*-old >>$OUTPUT 2>&1 - rm -f $MODULE_UPPER_DIR/preinstall - rm -f $MODULE_UPPER_DIR/install - rm -f $MODULE_UPPER_DIR/packages.list - rm -f $MODULE_UPPER_DIR/postinstall + rm -f $MODULE_UPPER_DIR/preinstall >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/install >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/package.list >>$OUTPUT 2>&1 + rm -f $MODULE_UPPER_DIR/postinstall >>$OUTPUT 2>&1 } function build_modules_chroot() { @@ -1892,6 +1913,8 @@ function build_modules_chroot() { module_chroot_umount_fs + module_chroot_cleanup + if [ ! -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT ]; then build_modules_live fi @@ -1919,7 +1942,7 @@ function build_modules_live() { for MODULE in *; do - if [ -f $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT ]; then + if (ls $PARENT_DIR/image/$LIVEKITNAME/*.$BEXT | grep -q $MODULE 2>/dev/null); then echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" echo -e "Please remove ${MAGENTA}$PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT${ENDCOLOUR} if you want to build ${MAGENTA}$MODULE${ENDCOLOUR}." echo -e "${RED}!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!${ENDCOLOUR}" diff --git a/linux-live/modules/02-xubuntu/postinstall b/linux-live/modules/02-xubuntu/postinstall index 52fbf87..85fe0a7 100644 --- a/linux-live/modules/02-xubuntu/postinstall +++ b/linux-live/modules/02-xubuntu/postinstall @@ -32,6 +32,10 @@ EOF dpkg-reconfigure -f noninteractive network-manager fi +if [ -f /usr/lib/udev/rules.d/90-slax-automount.rules ]; then + rm /usr/lib/udev/rules.d/90-slax-automount.rules +fi + if [ -f /usr/share/xfce4/backdrops/xubuntu-wallpaper.png ]; then rm /usr/share/xfce4/backdrops/xubuntu-wallpaper.png fi diff --git a/linux-live/modules/03-apps/install b/linux-live/modules/03-apps/install index 421ed79..52a2330 100644 --- a/linux-live/modules/03-apps/install +++ b/linux-live/modules/03-apps/install @@ -14,24 +14,3 @@ if [ -f $SCRIPT_DIR/package.list ]; then $APT_CMD install $APT_OPTIONS \ $(grep -vE "^\s*#" $SCRIPT_DIR/package.list | tr "\n" " ") >>$OUTPUT 2>&1 fi - -cd /root -#apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CB2DE8E5 >>$OUTPUT 2>&1 -#echo "deb https://download.onlyoffice.com/repo/debian squeeze main" >/etc/apt/sources.list.d/onlyoffice.list >>$OUTPUT 2>&1 -wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - >>$OUTPUT 2>&1 -wget -c https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb >>$OUTPUT 2>&1 -sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD update -#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ -# $APT_CMD install $APT_OPTIONS onlyoffice-desktopeditors -sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS /root/google-chrome-stable_current_amd64.deb /root/cts-4.0.0-104.ks1_amd64.deb >>$OUTPUT 2>&1 - -if [ -d /home/live ]; then - mkdir -p /home/live/.cts - cp /etc/skel/.cts/settings.conf /home/live/.cts/ - chmod 755 /home/live/.cts - chown live:live /home/live/.cts - chmod 644 /home/live/.cts/settings.conf - chown live:live /home/live/.cts/settings.conf -fi diff --git a/linux-live/modules/03-apps/package.list b/linux-live/modules/03-apps/package.list index 057677a..b69350b 100644 --- a/linux-live/modules/03-apps/package.list +++ b/linux-live/modules/03-apps/package.list @@ -1,8 +1,8 @@ open-vm-tools-desktop -#firefox -#firefox-locale-ru +firefox +firefox-locale-ru remmina parole recordmydesktop -compizconfig-settings-manager -compiz-plugins \ No newline at end of file +#compizconfig-settings-manager +#compiz-plugins \ No newline at end of file diff --git a/linux-live/modules/04-drivers/postinstall b/linux-live/modules/04-drivers/postinstall index f70cc1e..43589d6 100644 --- a/linux-live/modules/04-drivers/postinstall +++ b/linux-live/modules/04-drivers/postinstall @@ -6,5 +6,5 @@ set -u # treat unset variable as error SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD remove linux-headers-generic-hwe-20.04 $APT_OPTIONS >>$OUTPUT 2>&1 \ No newline at end of file +#sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + #$APT_CMD remove linux-headers-generic-hwe-20.04 $APT_OPTIONS >>$OUTPUT 2>&1 \ No newline at end of file diff --git a/linux-live/rootcopy-casper/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/rootcopy-casper/etc/skel/.config/xfce4/panel/whiskermenu-1.rc index d6d7db6..f0539a5 100644 --- a/linux-live/rootcopy-casper/etc/skel/.config/xfce4/panel/whiskermenu-1.rc +++ b/linux-live/rootcopy-casper/etc/skel/.config/xfce4/panel/whiskermenu-1.rc @@ -1,4 +1,4 @@ -favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop +favorites=ubiquity.desktop recent= button-title=Applications Menu button-icon=MiniOS-white diff --git a/linux-live/rootcopy-livekit/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/rootcopy-livekit/etc/skel/.config/xfce4/panel/whiskermenu-1.rc index d6d7db6..f0539a5 100644 --- a/linux-live/rootcopy-livekit/etc/skel/.config/xfce4/panel/whiskermenu-1.rc +++ b/linux-live/rootcopy-livekit/etc/skel/.config/xfce4/panel/whiskermenu-1.rc @@ -1,4 +1,4 @@ -favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop +favorites=ubiquity.desktop recent= button-title=Applications Menu button-icon=MiniOS-white diff --git a/linux-live/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc b/linux-live/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc index d6d7db6..f0539a5 100644 --- a/linux-live/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc +++ b/linux-live/rootcopy/etc/skel/.config/xfce4/panel/whiskermenu-1.rc @@ -1,4 +1,4 @@ -favorites=RDWebAccess.desktop,RDWebClient.desktop,org.remmina.Remmina.desktop,ctsg.desktop,ctskeyimportg.desktop,ubiquity.desktop +favorites=ubiquity.desktop recent= button-title=Applications Menu button-icon=MiniOS-white