|
|
@ -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 <<EOF >/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 |
|
|
|