Browse Source

не работает инсталлер, остальное работает

master
crims0n 5 years ago
parent
commit
f5643b78b3
  1. 2
      linux-live/buildconfig
  2. 54
      linux-live/minioslib
  3. BIN
      linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb
  4. 2
      linux-live/pkglists/ubuntu-gui.list
  5. 2
      linux-live/pkglists/ubuntu-main.list
  6. 2
      linux-live/pkglists/ubuntu-other.list
  7. 6
      linux-live/rootcopy-ubuntu/etc/casper.conf
  8. 63
      linux-live/rootcopy-ubuntu/etc/locale.nopurge
  9. 1
      linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/default.plymouth
  10. 4
      linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/details/details.plymouth
  11. 2
      linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth
  12. 4
      linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-text/minios-text.plymouth
  13. 1
      linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/text.plymouth
  14. 63
      linux-live/rootcopy/etc/locale.nopurge

2
linux-live/buildconfig

@ -8,7 +8,7 @@ OUTPUT="/dev/stdout"
# if = "1", creates a second iso with a constant filename # if = "1", creates a second iso with a constant filename
# если ="1", создаёт второй iso с постоянным именем файла # если ="1", создаёт второй iso с постоянным именем файла
BUILD_TEST_ISO="0" BUILD_TEST_ISO="1"
# удаляет старые файлы iso для данного типа сборки # удаляет старые файлы iso для данного типа сборки
REMOVE_OLD_ISO="0" REMOVE_OLD_ISO="0"

54
linux-live/minioslib

@ -618,6 +618,8 @@ function build_initrd() {
fi fi
fi fi
(cd $SCRIPT_DIR/linux-live/rootcopy-ubuntu && cp --parents -afr * $BUILD_DIR/)
chroot_mount_fs chroot_mount_fs
if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then if [ -d /opt/minios-live ] || [ -f /.minios-live-container ]; then
@ -699,32 +701,32 @@ set default="0"
set timeout=10 set timeout=10
menuentry "Try MiniOS without installing (persistent live)" { 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 initrd /casper/initrd
} }
menuentry "Try MiniOS without installing (live)" { 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 initrd /casper/initrd
} }
menuentry "Try MiniOS without installing (persistent live to ram)" { 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 initrd /casper/initrd
} }
menuentry "Try MiniOS without installing (live to ram)" { 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 initrd /casper/initrd
} }
menuentry "Install MiniOS" { 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 initrd /casper/initrd
} }
menuentry "Install MiniOS (from ram)" { 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 initrd /casper/initrd
} }
@ -915,6 +917,11 @@ function build_iso() {
"/EFI/efiboot.img=isolinux/efiboot.img" \ "/EFI/efiboot.img=isolinux/efiboot.img" \
"/boot/grub/bios.img=isolinux/bios.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 fi
} }
@ -1051,10 +1058,11 @@ function main_pkg_list() {
tasksel install xubuntu-core >>$OUTPUT 2>&1 && tasksel install xubuntu-core >>$OUTPUT 2>&1 &&
$APT_CMD install $APT_OPTIONS \ $APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") >>$OUTPUT 2>&1 $(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 fi
if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then
sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ 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 $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ") >>$OUTPUT 2>&1
fi fi
fi fi
@ -1077,9 +1085,10 @@ function main_pkg_list() {
tasksel install xubuntu-core && tasksel install xubuntu-core &&
$APT_CMD install $APT_OPTIONS \ $APT_CMD install $APT_OPTIONS \
$(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-gui.list | tr "\n" " ") $(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 fi
if [ -f $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list ]; then 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" " ") $(grep -vE "^\s*#" $SCRIPT_DIR/pkglists/ubuntu-ubiquity.list | tr "\n" " ")
fi fi
fi fi
@ -1132,6 +1141,12 @@ function chroot_pkg_install() {
other_pkg_list 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 if [ $DEBIAN_FRONTEND_TYPE = "noninteractive" ]; then
# configure console and keyboard # configure console and keyboard
cat <<EOF >/etc/default/console-setup cat <<EOF >/etc/default/console-setup
@ -1175,6 +1190,7 @@ EOF
echo 'LANG="ru_RU.UTF-8"' >/etc/default/locale && echo 'LANG="ru_RU.UTF-8"' >/etc/default/locale &&
dpkg-reconfigure -f noninteractive locales >>$OUTPUT 2>&1 && dpkg-reconfigure -f noninteractive locales >>$OUTPUT 2>&1 &&
update-locale LANG=ru_RU.UTF-8 >>$OUTPUT 2>&1 update-locale LANG=ru_RU.UTF-8 >>$OUTPUT 2>&1
#localepurge
# configure resolvconf # 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 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 # configure timezone and locale
dpkg-reconfigure tzdata dpkg-reconfigure tzdata
dpkg-reconfigure locales dpkg-reconfigure locales
dpkg-reconfigure localepurge #dpkg-reconfigure localepurge
localepurge #localepurge
# configure resolvconf # 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 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() { function chroot_configure() {
current_process current_process
if [ $LIVE_TYPE = "linux-live" ]; then 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 "Set up password for user 'root'" >>$OUTPUT 2>&1
echo root:toor | chpasswd >>$OUTPUT 2>&1 echo root:toor | chpasswd >>$OUTPUT 2>&1
@ -1275,7 +1291,7 @@ EOF
systemctl disable grub-initrd-fallback.service >>$OUTPUT 2>&1 systemctl disable grub-initrd-fallback.service >>$OUTPUT 2>&1
fi fi
elif [ $LIVE_TYPE = "ubuntu" ]; then 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/default.plymouth
#rm /etc/alternatives/text.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/default.plymouth default.plymouth /usr/share/plymouth/themes/minios-logo/minios-logo.plymouth 200
@ -1289,12 +1305,20 @@ EOF
fi fi
if [ ! -d /usr/share/xfce4/backdrops ]; then if [ ! -d /usr/share/xfce4/backdrops ]; then
mkdir -p /usr/share/xfce4/backdrops mkdir -p /usr/share/xfce4/backdrops
ln -s /usr/share/backgrounds/MiniOS.png /usr/share/xfce4/backdrops/xubuntu-wallpaper.png
fi 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 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 echo ubuntu:ubuntu | chpasswd >>$OUTPUT 2>&1
addgroup ubuntu adm >>$OUTPUT 2>&1 addgroup ubuntu adm >>$OUTPUT 2>&1
addgroup ubuntu sudo >>$OUTPUT 2>&1 addgroup ubuntu sudo >>$OUTPUT 2>&1

BIN
linux-live/packages/chromium_88.0.4324.96~linuxmint1+ulyssa_amd64.deb

Binary file not shown.

2
linux-live/pkglists/ubuntu-gui.list

@ -8,4 +8,6 @@ gigolo
gparted gparted
xfce4-taskmanager xfce4-taskmanager
xfce4-xkb-plugin xfce4-xkb-plugin
firefox
firefox-locale-ru
language-pack-gnome-ru language-pack-gnome-ru

2
linux-live/pkglists/ubuntu-main.list

@ -6,4 +6,4 @@ os-prober
network-manager network-manager
net-tools net-tools
wireless-tools wireless-tools
localepurge #localepurge

2
linux-live/pkglists/ubuntu-other.list

@ -1,2 +1,2 @@
open-vm-tools-desktop open-vm-tools-desktop
samba-common #samba-common

6
linux-live/rootcopy-ubuntu/etc/casper.conf

@ -2,10 +2,10 @@
# Supported variables are: # Supported variables are:
# USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM, FLAVOUR # USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM, FLAVOUR
export USERNAME="live" export USERNAME="ubuntu"
export USERFULLNAME="Live session user" export USERFULLNAME="Live session user"
export HOST="minios" export HOST="ubuntu"
export BUILD_SYSTEM="MiniOS" export BUILD_SYSTEM="Ubuntu"
# USERNAME and HOSTNAME as specified above won't be honoured and will be set to # 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 # flavour string acquired at boot time, unless you set FLAVOUR to any

63
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

1
linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/default.plymouth

@ -0,0 +1 @@
/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth

4
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

2
linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-logo/minios-logo.plymouth

@ -1,5 +1,5 @@
[Plymouth Theme] [Plymouth Theme]
Name=Xubuntu Logo Name=MiniOS Logo
Description=A theme that features a background with a logo. Description=A theme that features a background with a logo.
ModuleName=script ModuleName=script

4
linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/minios-text/minios-text.plymouth

@ -1,6 +1,6 @@
[Plymouth Theme] [Plymouth Theme]
Name=Xubuntu Text Name=MiniOS Text
Description=Text mode theme based on xubuntu-logo theme Description=Text mode theme based on minios-logo theme
ModuleName=ubuntu-text ModuleName=ubuntu-text
[ubuntu-text] [ubuntu-text]

1
linux-live/rootcopy-ubuntu/usr/share/plymouth/themes/text.plymouth

@ -0,0 +1 @@
/usr/share/plymouth/themes/minios-text/minios-text.plymouth

63
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
Loading…
Cancel
Save