From 5733e82809115f19543781e630e75e16c163ef0f Mon Sep 17 00:00:00 2001 From: crims0n Date: Mon, 25 Jan 2021 06:23:11 +0300 Subject: [PATCH] update --- linux-live/buildconfig | 4 +-- linux-live/minioslib | 50 ++++++++++++++++++++-------- linux-live/pkglists/ubuntu-gui.list | 3 +- linux-live/pkglists/ubuntu-main.list | 3 +- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/linux-live/buildconfig b/linux-live/buildconfig index e2e371a..0ba14ff 100755 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -21,8 +21,8 @@ DEV_SYSTEM="0" # если ="1", создаёт резервную копию в родительской папке CREATE_BACKUP="0" -#DEBIAN_FRONTEND_TYPE="noninteractive" -DEBIAN_FRONTEND_TYPE="dialog" +DEBIAN_FRONTEND_TYPE="noninteractive" +#DEBIAN_FRONTEND_TYPE="dialog" APT_CMD="apt-get" diff --git a/linux-live/minioslib b/linux-live/minioslib index d2584a9..9f80d35 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -1015,17 +1015,19 @@ function main_pkg_list() { if [ -f $SCRIPT_DIR/pkglists/ubuntu-main.list ]; then sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") >>$OUTPUT 2>&1 + $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") >>$OUTPUT 2>&1 fi if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + $APT_CMD install $APT_OPTIONS tasksel >>$OUTPUT 2>&1 && + tasksel install xubuntu-core >>$OUTPUT 2>&1 && $APT_CMD install $APT_OPTIONS \ $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") >>$OUTPUT 2>&1 fi if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1 + $APT_CMD install $APT_OPTIONS --no-install-recommends \ + $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1 fi fi elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then @@ -1039,16 +1041,18 @@ function main_pkg_list() { fi if [ $LIVE_TYPE = "ubuntu" ]; then if [ -f $SCRIPT_DIR/pkglists/ubuntu-main.list ]; then - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") + $APT_CMD install $APT_OPTIONS \ + $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-main.list | tr "\n" " ") fi if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then + $APT_CMD install $APT_OPTIONS tasksel && + tasksel install xubuntu-core && $APT_CMD install $APT_OPTIONS \ $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") fi if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then - $APT_CMD install $APT_OPTIONS \ - $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") + $APT_CMD install $APT_OPTIONS --no-install-recommends \ + $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") fi fi fi @@ -1149,6 +1153,18 @@ EOF echo "resolvconf resolvconf/linkify-resolvconf boolean true" | debconf-set-selections dpkg-reconfigure resolvconf >>$OUTPUT 2>&1 fi + if [ $LIVE_TYPE = "ubuntu" ]; then + # network manager + cat </etc/NetworkManager/NetworkManager.conf +[main] +rc-manager=resolvconf +plugins=ifupdown,keyfile +dns=dnsmasq +[ifupdown] +managed=false +EOF + dpkg-reconfigure network-manager >>$OUTPUT 2>&1 + fi elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then dpkg-reconfigure console-setup @@ -1163,9 +1179,9 @@ EOF if grep resolvconf $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1 || grep resolvconf $SCRIPT_DIR/pkglists/other.list || [ $DISTRIBUTION != "xenial" ] >>$OUTPUT 2>&1; then dpkg-reconfigure resolvconf fi - - # network manager - cat </etc/NetworkManager/NetworkManager.conf + if [ $LIVE_TYPE = "ubuntu" ]; then + # network manager + cat </etc/NetworkManager/NetworkManager.conf [main] rc-manager=resolvconf plugins=ifupdown,keyfile @@ -1173,8 +1189,8 @@ dns=dnsmasq [ifupdown] managed=false EOF - dpkg-reconfigure network-manager - + dpkg-reconfigure network-manager + fi fi # remove unused @@ -1235,12 +1251,18 @@ EOF #rm /etc/alternatives/default.plymouth #rm /etc/alternatives/text.plymouth update-alternatives --install /usr/share/plymouth/themes/default.plymouth default.plymouth /usr/share/plymouth/themes/minios-logo/minios-logo.plymouth 200 + update-alternatives --install /usr/share/plymouth/themes/text.plymouth text.plymouth /usr/share/plymouth/themes/minios-text/minios-text.plymouth 200 update-alternatives --config default.plymouth --skip-auto #ln -s /usr/share/plymouth/themes/minios-logo/minios-logo.plymouth /etc/alternatives/default.plymouth #ln -s /usr/share/plymouth/themes/minios-logo/minios-text.plymouth /etc/alternatives/text.plymouth update-initramfs -u - rm /usr/share/xfce4/backdrops/xubuntu-wallpaper.png - ln -s /usr/share/backgrounds/MiniOS.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png + if [ -f /usr/share/xfce4/backdrops/xubuntu-wallpaper.png ]; then + rm /usr/share/xfce4/backdrops/xubuntu-wallpaper.png + fi + if [ ! -d /usr/share/xfce4/backdrops ]; then + mkdir -p /usr/share/xfce4/backdrops + ln -s /usr/share/backgrounds/MiniOS.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png + fi : 'echo "Set up user 'ubuntu'" >>$OUTPUT 2>&1 adduser --gecos '' ubuntu --disabled-password >>$OUTPUT 2>&1 diff --git a/linux-live/pkglists/ubuntu-gui.list b/linux-live/pkglists/ubuntu-gui.list index 313da33..3b746b6 100644 --- a/linux-live/pkglists/ubuntu-gui.list +++ b/linux-live/pkglists/ubuntu-gui.list @@ -1,4 +1,5 @@ -xubuntu-core +# xubuntu-core ставим через tasksel, иначе он тянет за собой части gnome-desktop и gdm3 +#xubuntu-core mousepad blueman ristretto diff --git a/linux-live/pkglists/ubuntu-main.list b/linux-live/pkglists/ubuntu-main.list index 27f8eb1..4f7dd1f 100644 --- a/linux-live/pkglists/ubuntu-main.list +++ b/linux-live/pkglists/ubuntu-main.list @@ -5,4 +5,5 @@ laptop-detect os-prober network-manager net-tools -wireless-tools \ No newline at end of file +wireless-tools +localepurge \ No newline at end of file