diff --git a/linux-live/buildconfig b/linux-live/buildconfig old mode 100755 new mode 100644 index 0ba14ff..663c7a1 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -8,7 +8,7 @@ OUTPUT="/dev/stdout" # if = "1", creates a second iso with a constant filename # если ="1", создаёт второй iso с постоянным именем файла -BUILD_TEST_ISO="0" +BUILD_TEST_ISO="1" # удаляет старые файлы iso для данного типа сборки REMOVE_OLD_ISO="0" diff --git a/linux-live/minioslib b/linux-live/minioslib index 2bad7b0..ff487bf 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -618,6 +618,8 @@ function build_initrd() { fi fi + (cd $SCRIPT_DIR/linux-live/rootcopy-ubuntu && cp --parents -afr * $BUILD_DIR/) + chroot_mount_fs if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then @@ -699,32 +701,32 @@ set default="0" set timeout=10 menuentry "Try MiniOS without installing (persistent live)" { - linux /casper/vmlinuz boot=casper quiet splash persistent --- + linux /casper/vmlinuz boot=casper quiet splash persistent fsck.mode=skip --- initrd /casper/initrd } menuentry "Try MiniOS without installing (live)" { - linux /casper/vmlinuz boot=casper quiet splash --- + linux /casper/vmlinuz boot=casper quiet splash fsck.mode=skip --- initrd /casper/initrd } menuentry "Try MiniOS without installing (persistent live to ram)" { - linux /casper/vmlinuz boot=casper toram quiet splash persistent --- + linux /casper/vmlinuz boot=casper toram quiet splash persistent fsck.mode=skip--- initrd /casper/initrd } menuentry "Try MiniOS without installing (live to ram)" { - linux /casper/vmlinuz boot=casper toram quiet splash --- + linux /casper/vmlinuz boot=casper toram quiet splash fsck.mode=skip --- initrd /casper/initrd } menuentry "Install MiniOS" { - linux /casper/vmlinuz boot=casper only-ubiquity quiet splash --- + linux /casper/vmlinuz boot=casper only-ubiquity quiet splash fsck.mode=skip --- initrd /casper/initrd } menuentry "Install MiniOS (from ram)" { - linux /casper/vmlinuz boot=casper only-ubiquity toram quiet splash --- + linux /casper/vmlinuz boot=casper only-ubiquity toram quiet splash fsck.mode=skip --- initrd /casper/initrd } @@ -915,6 +917,11 @@ function build_iso() { "/EFI/efiboot.img=isolinux/efiboot.img" \ "/boot/grub/bios.img=isolinux/bios.img" \ "." + if [ $BUILD_TEST_ISO = "1" ]; then + if cp -f $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then + echo ">>> $ISO_DIR/$LIVEKITNAME.iso created" + fi + fi fi } @@ -1051,10 +1058,11 @@ function main_pkg_list() { 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 + #$APT_CMD install $APT_OPTIONS /linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb >>$OUTPUT 2>&1 fi if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ - $APT_CMD install $APT_OPTIONS --no-install-recommends \ + $APT_CMD install $APT_OPTIONS \ $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1 fi fi @@ -1077,9 +1085,10 @@ function main_pkg_list() { tasksel install xubuntu-core && $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 --no-install-recommends \ + $APT_CMD install $APT_OPTIONS \ $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") fi fi @@ -1132,6 +1141,12 @@ function chroot_pkg_install() { other_pkg_list + if [ $LIVE_TYPE = "linux-live" ]; then + (cd /linux-live/rootcopy && cp --parents -afr * /) + elif [ $LIVE_TYPE = "ubuntu" ]; then + (cd /linux-live/rootcopy-ubuntu && cp --parents -afr * /) + fi + if [ $DEBIAN_FRONTEND_TYPE = "noninteractive" ]; then # configure console and keyboard cat </etc/default/console-setup @@ -1175,6 +1190,7 @@ EOF echo 'LANG="ru_RU.UTF-8"' >/etc/default/locale && dpkg-reconfigure -f noninteractive locales >>$OUTPUT 2>&1 && update-locale LANG=ru_RU.UTF-8 >>$OUTPUT 2>&1 + #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 @@ -1200,8 +1216,8 @@ EOF # configure timezone and locale dpkg-reconfigure tzdata dpkg-reconfigure locales - dpkg-reconfigure localepurge - localepurge + #dpkg-reconfigure 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 @@ -1231,7 +1247,7 @@ EOF function chroot_configure() { current_process if [ $LIVE_TYPE = "linux-live" ]; then - (cd /linux-live/rootcopy && cp --parents -afr * /) + #(cd /linux-live/rootcopy && cp --parents -afr * /) echo "Set up password for user 'root'" >>$OUTPUT 2>&1 echo root:toor | chpasswd >>$OUTPUT 2>&1 @@ -1275,7 +1291,7 @@ EOF systemctl disable grub-initrd-fallback.service >>$OUTPUT 2>&1 fi elif [ $LIVE_TYPE = "ubuntu" ]; then - (cd /linux-live/rootcopy-ubuntu && cp --parents -afr * /) + #(cd /linux-live/rootcopy-ubuntu && cp --parents -afr * /) #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 @@ -1289,12 +1305,20 @@ EOF 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 + ln -s /usr/share/backgrounds/MiniOS.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png + + : 'echo "Set up password for user 'root'" >>$OUTPUT 2>&1 + echo root:toor | chpasswd >>$OUTPUT 2>&1' + + : 'echo "Set up user 'live'" >>$OUTPUT 2>&1 + adduser --gecos '' live --disabled-password >>$OUTPUT 2>&1 + 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 "Set up password for user 'ubuntu'" >>$OUTPUT 2>&1 echo ubuntu:ubuntu | chpasswd >>$OUTPUT 2>&1 addgroup ubuntu adm >>$OUTPUT 2>&1 addgroup ubuntu sudo >>$OUTPUT 2>&1 diff --git a/linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb b/linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb new file mode 100644 index 0000000..de56b99 Binary files /dev/null and b/linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb differ diff --git a/linux-live/pkglists/ubuntu-gui.list b/linux-live/pkglists/ubuntu-gui.list old mode 100644 new mode 100755 index 3b746b6..82204e5 --- a/linux-live/pkglists/ubuntu-gui.list +++ b/linux-live/pkglists/ubuntu-gui.list @@ -8,4 +8,6 @@ gigolo gparted xfce4-taskmanager xfce4-xkb-plugin +firefox +firefox-locale-ru language-pack-gnome-ru \ No newline at end of file diff --git a/linux-live/pkglists/ubuntu-main.list b/linux-live/pkglists/ubuntu-main.list index 4f7dd1f..81ceee2 100644 --- a/linux-live/pkglists/ubuntu-main.list +++ b/linux-live/pkglists/ubuntu-main.list @@ -6,4 +6,4 @@ os-prober network-manager net-tools wireless-tools -localepurge \ No newline at end of file +#localepurge \ No newline at end of file diff --git a/linux-live/pkglists/ubuntu-other.list b/linux-live/pkglists/ubuntu-other.list index af72970..4d416c3 100644 --- a/linux-live/pkglists/ubuntu-other.list +++ b/linux-live/pkglists/ubuntu-other.list @@ -1,2 +1,2 @@ open-vm-tools-desktop -samba-common \ No newline at end of file +#samba-common \ No newline at end of file diff --git a/linux-live/rootcopy-ubuntu/etc/casper.conf b/linux-live/rootcopy-ubuntu/etc/casper.conf index 0598dde..ed7594b 100644 --- a/linux-live/rootcopy-ubuntu/etc/casper.conf +++ b/linux-live/rootcopy-ubuntu/etc/casper.conf @@ -2,10 +2,10 @@ # Supported variables are: # USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM, FLAVOUR -export USERNAME="live" +export USERNAME="ubuntu" export USERFULLNAME="Live session user" -export HOST="minios" -export BUILD_SYSTEM="MiniOS" +export HOST="ubuntu" +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 diff --git a/linux-live/rootcopy-ubuntu/etc/locale.nopurge b/linux-live/rootcopy-ubuntu/etc/locale.nopurge new file mode 100644 index 0000000..9346c6c --- /dev/null +++ b/linux-live/rootcopy-ubuntu/etc/locale.nopurge @@ -0,0 +1,63 @@ +#################################################### +# This is the configuration file for localepurge(8). +#################################################### + +#################################################### +# Uncommenting this string enables the use of dpkg's +# --path-exclude feature. In this mode, localepurge +# will configure dpkg to exclude the desired locales +# at unpack time. +# +# If enabled, the following 3 options will be +# disabled: +# +# QUICKNDIRTYCALC +# SHOWFREEDSPACE +# VERBOSE +# +# And the following option will be enabled and cannot +# be disabled (unless USE_DPKG is disabled): +# +# DONTBOTHERNEWLOCALE +# + +USE_DPKG +#################################################### + +#################################################### +# Uncommenting this string enables removal of localized +# man pages based on the configuration information for +# locale files defined below: + +MANDELETE + +#################################################### +# Uncommenting this string causes localepurge to simply delete +# locales which have newly appeared on the system without +# bothering you about it: + +#DONTBOTHERNEWLOCALE + +#################################################### +# Uncommenting this string enables display of freed disk +# space if localepurge has purged any superfluous data: + +SHOWFREEDSPACE + +##################################################### +# Commenting out this string enables faster but less +# accurate calculation of freed disk space: + +QUICKNDIRTYCALC + +##################################################### +# Commenting out this string disables verbose output: + +#VERBOSE + +##################################################### +# Following locales won't be deleted from this system +# after package installations done with apt-get(8): + +en_US.UTF-8 +ru_RU.UTF-8 diff --git a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/default.plymouth b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/default.plymouth new file mode 120000 index 0000000..b251b32 --- /dev/null +++ b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/default.plymouth @@ -0,0 +1 @@ +/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth \ No newline at end of file diff --git a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/details/details.plymouth b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/details/details.plymouth new file mode 100644 index 0000000..bd84964 --- /dev/null +++ b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/details/details.plymouth @@ -0,0 +1,4 @@ +[Plymouth Theme] +Name=Details +Description=Verbose fallback theme +ModuleName=details diff --git a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth index 89402c3..db7715b 100644 --- a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth +++ b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth @@ -1,5 +1,5 @@ [Plymouth Theme] -Name=Xubuntu Logo +Name=MiniOS Logo Description=A theme that features a background with a logo. ModuleName=script diff --git a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-text/minios-text.plymouth b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-text/minios-text.plymouth index db38ddf..3376c71 100644 --- a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-text/minios-text.plymouth +++ b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-text/minios-text.plymouth @@ -1,6 +1,6 @@ [Plymouth Theme] -Name=Xubuntu Text -Description=Text mode theme based on xubuntu-logo theme +Name=MiniOS Text +Description=Text mode theme based on minios-logo theme ModuleName=ubuntu-text [ubuntu-text] diff --git a/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/text.plymouth b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/text.plymouth new file mode 120000 index 0000000..740f19a --- /dev/null +++ b/linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/text.plymouth @@ -0,0 +1 @@ +/usr/share/plymouth/themes/minios-text/minios-text.plymouth \ No newline at end of file diff --git a/linux-live/rootcopy/etc/locale.nopurge b/linux-live/rootcopy/etc/locale.nopurge new file mode 100644 index 0000000..9346c6c --- /dev/null +++ b/linux-live/rootcopy/etc/locale.nopurge @@ -0,0 +1,63 @@ +#################################################### +# This is the configuration file for localepurge(8). +#################################################### + +#################################################### +# Uncommenting this string enables the use of dpkg's +# --path-exclude feature. In this mode, localepurge +# will configure dpkg to exclude the desired locales +# at unpack time. +# +# If enabled, the following 3 options will be +# disabled: +# +# QUICKNDIRTYCALC +# SHOWFREEDSPACE +# VERBOSE +# +# And the following option will be enabled and cannot +# be disabled (unless USE_DPKG is disabled): +# +# DONTBOTHERNEWLOCALE +# + +USE_DPKG +#################################################### + +#################################################### +# Uncommenting this string enables removal of localized +# man pages based on the configuration information for +# locale files defined below: + +MANDELETE + +#################################################### +# Uncommenting this string causes localepurge to simply delete +# locales which have newly appeared on the system without +# bothering you about it: + +#DONTBOTHERNEWLOCALE + +#################################################### +# Uncommenting this string enables display of freed disk +# space if localepurge has purged any superfluous data: + +SHOWFREEDSPACE + +##################################################### +# Commenting out this string enables faster but less +# accurate calculation of freed disk space: + +QUICKNDIRTYCALC + +##################################################### +# Commenting out this string disables verbose output: + +#VERBOSE + +##################################################### +# Following locales won't be deleted from this system +# after package installations done with apt-get(8): + +en_US.UTF-8 +ru_RU.UTF-8