diff --git a/linux-live/buildconfig b/linux-live/buildconfig index 663c7a1..34835ff 100644 --- 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/install_chroot b/linux-live/install_chroot index 8746992..949166f 100644 --- a/linux-live/install_chroot +++ b/linux-live/install_chroot @@ -6,12 +6,7 @@ set -u # treat unset variable as error SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" -set +u -if [ -z $OUTPUT ]; then - . $SCRIPT_DIR/buildconfig || exit 1 -fi -set -u - +. $SCRIPT_DIR/buildconfig || exit 1 . $SCRIPT_DIR/minioslib || exit 1 . $SCRIPT_DIR/config || exit 1 diff --git a/linux-live/minioslib b/linux-live/minioslib index ff487bf..2ee7529 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -502,9 +502,9 @@ function build_bootstrap() { setup_host fi fi - - export DEBIAN_FRONTEND=noninteractive - debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $BUILD_DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT + + sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ + debootstrap --arch=$DISTRIBUTION_ARCH --variant=$DISTRIBUTION_VARIANT $DISTRIBUTION $BUILD_DIR $DISTRIBUTION_URL >>$OUTPUT 2>>$OUTPUT } function copy_build_scripts() { @@ -757,7 +757,7 @@ EOF sudo sed -i '/os-prober/d' $PARENT_DIR/image/casper/filesystem.manifest-desktop # compress rootfs - sudo mksquashfs $BUILD_DIR $PARENT_DIR/image/casper/filesystem.squashfs -noappend -comp lz4 -b 1048576 + sudo mksquashfs $BUILD_DIR $PARENT_DIR/image/casper/filesystem.squashfs -noappend -comp $COMP_TYPE -b 1048576 printf $(sudo du -sx --block-size=1 $BUILD_DIR | cut -f1) >$PARENT_DIR/image/casper/filesystem.size # create diskdefines @@ -1055,6 +1055,7 @@ function main_pkg_list() { 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-live >>$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 @@ -1082,14 +1083,15 @@ function main_pkg_list() { fi if [ -f $SCRIPT_DIR/pkglists/ubuntu-gui.list ]; then $APT_CMD install $APT_OPTIONS tasksel && - tasksel install xubuntu-core && + tasksel && $APT_CMD install $APT_OPTIONS \ $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") #$APT_CMD install $APT_OPTIONS /linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb 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" " ") + echo "" + # $APT_CMD install $APT_OPTIONS \ + # $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") fi fi fi @@ -1211,13 +1213,13 @@ EOF fi elif [ $DEBIAN_FRONTEND_TYPE = "dialog" ]; then - dpkg-reconfigure console-setup + #dpkg-reconfigure console-setup # configure timezone and locale dpkg-reconfigure tzdata dpkg-reconfigure locales #dpkg-reconfigure localepurge - #localepurge + localepurge # configure resolvconf if grep resolvconf $SCRIPT_DIR/pkglists/main.list >>$OUTPUT 2>&1 || grep resolvconf $SCRIPT_DIR/pkglists/other.list || [ $DISTRIBUTION != "xenial" ] >>$OUTPUT 2>&1; then @@ -1299,7 +1301,12 @@ EOF 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 + + if [ $COMP_TYPE = "xz" ]; then + sed -i "s,COMPRESS=lz4,COMPRESS=xz,g" /etc/initramfs-tools/initramfs.conf + fi update-initramfs -u + if [ -f /usr/share/xfce4/backdrops/xubuntu-wallpaper.png ]; then rm /usr/share/xfce4/backdrops/xubuntu-wallpaper.png fi @@ -1316,7 +1323,7 @@ EOF echo "Set up password for user 'live'" >>$OUTPUT 2>&1 echo live:evil | chpasswd >>$OUTPUT 2>&1' - echo "Set up user 'ubuntu'" >>$OUTPUT 2>&1 + echo "Set up user 'ubuntu'" >>$OUTPUT 2>&1 adduser --gecos '' ubuntu --disabled-password >>$OUTPUT 2>&1 : 'echo "Set up password for user 'ubuntu'" >>$OUTPUT 2>&1 echo ubuntu:ubuntu | chpasswd >>$OUTPUT 2>&1 diff --git a/linux-live/pkglists/main.list b/linux-live/pkglists/main.list index c06eae8..0bbf78e 100644 --- a/linux-live/pkglists/main.list +++ b/linux-live/pkglists/main.list @@ -3,6 +3,7 @@ ubuntu-minimal resolvconf xz-utils +localepurge # имя этого ▼ пакета нужно задавать в зависимости от необходимого типа ядра #linux-image-generic-hwe-18.04 #linux-image-generic diff --git a/linux-live/pkglists/ubuntu-main.list b/linux-live/pkglists/ubuntu-main.list index 81ceee2..27f8eb1 100644 --- a/linux-live/pkglists/ubuntu-main.list +++ b/linux-live/pkglists/ubuntu-main.list @@ -5,5 +5,4 @@ laptop-detect os-prober network-manager net-tools -wireless-tools -#localepurge \ No newline at end of file +wireless-tools \ No newline at end of file diff --git a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/logo.png b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/logo.png index fa55179..44582ed 100644 Binary files a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/logo.png and b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/logo.png differ