diff --git a/linux-live/minioslib b/linux-live/minioslib index 5492b15..c7f5f40 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -883,7 +883,7 @@ EOF COREFS="$COREFS $i" fi done - mksquashfs $COREFS $PARENT_DIR/image/$LIVEKITNAME/01-core.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit + mksquashfs $COREFS $PARENT_DIR/image/$LIVEKITNAME/01-core-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit build_modules @@ -1126,7 +1126,7 @@ function build_iso() { fi fi if [ $BUILD_TEST_ISO = "1" ]; then - if [ -f $ISO_DIR/$LIVEKITNAME.iso ]; then + if [ -L $ISO_DIR/$LIVEKITNAME.iso ]; then rm $ISO_DIR/$LIVEKITNAME.iso fi if ln -s $LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$LIVE_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then @@ -1342,9 +1342,6 @@ EOF # Set system locale echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ru_RU.UTF-8 UTF-8" | debconf-set-selections -v >>$OUTPUT 2>&1 echo "locales locales/default_environment_locale select ru_RU.UTF-8" | debconf-set-selections -v >>$OUTPUT 2>&1 - #echo 'LANGUAGE="ru_RU.UTF-8"' >/etc/default/locale && - # echo 'LANG="ru_RU.UTF-8"' >/etc/default/locale && - # echo 'LC_ALL="ru_RU.UTF-8"' >/etc/default/locale && dpkg-reconfigure -f noninteractive locales >>$OUTPUT 2>&1 update-locale LANGUAGE=ru_RU.UTF-8 >>$OUTPUT 2>&1 update-locale LANG=ru_RU.UTF-8 >>$OUTPUT 2>&1 @@ -1353,13 +1350,12 @@ EOF echo "localepurge localepurge/nopurge debconf-set-selections multiselect en_US.UTF-8, ru_RU.UTF-8" | debconf-set-selections -v >>$OUTPUT 2>&1 echo "localepurge localepurge/use-dpkg-feature boolean true" | debconf-set-selections -v >>$OUTPUT 2>&1 dpkg-reconfigure -f noninteractive localepurge >>$OUTPUT 2>&1 - #localepurge -v >>$OUTPUT 2>&1 fi # 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 echo "resolvconf resolvconf/linkify-resolvconf boolean true" | debconf-set-selections - dpkg-reconfigure resolvconf >>$OUTPUT 2>&1 + dpkg-reconfigure -f noninteractive resolvconf >>$OUTPUT 2>&1 fi if [ $LIVE_TYPE = "livekit" ]; then @@ -1596,8 +1592,15 @@ function module_chroot_mount_fs() { ln -s /sys $MODULE_MERGED_DIR/sys ln -s /tmp $MODULE_MERGED_DIR/tmp else' + mount --bind /dev $MODULE_MERGED_DIR/dev - mount --bind /run $MODULE_MERGED_DIR/run + if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then + mkdir -p $MODULE_MERGED_DIR/run/resolvconf + touch $MODULE_MERGED_DIR/run/resolvconf/resolv.conf + mount --bind /etc/resolv.conf $MODULE_MERGED_DIR/run/resolvconf/resolv.conf + else + mount --bind /run $MODULE_MERGED_DIR/run + fi mount none -t proc $MODULE_MERGED_DIR/proc mount none -t sysfs $MODULE_MERGED_DIR/sys mount none -t devpts $MODULE_MERGED_DIR/dev/pts @@ -1625,8 +1628,13 @@ function module_chroot_umount_fs() { umount $MODULE_MERGED_DIR/dev/pts >>$OUTPUT 2>&1 umount $MODULE_MERGED_DIR/tmp >>$OUTPUT 2>&1 umount $MODULE_MERGED_DIR/dev >>$OUTPUT 2>&1 - umount $MODULE_MERGED_DIR/run >>$OUTPUT 2>&1 - + if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then + umount $MODULE_MERGED_DIR/run/resolvconf/resolv.conf >>$OUTPUT 2>&1 + rm -f $MODULE_MERGED_DIR/run/resolvconf/resolv.conf + rmdir -f $MODULE_MERGED_DIR/run/resolvconf + else + umount $MODULE_MERGED_DIR/run >>$OUTPUT 2>&1 + fi umount $MODULE_MERGED_DIR >>$OUTPUT 2>&1 set -e #fi @@ -1705,8 +1713,11 @@ function build_modules() { if [ $LIVE_TYPE = "casper" ]; then return 0 fi - if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then - return 0 + + if [ $CONTAINER_TYPE = "1" ]; then + if [ ! -f /.minios-live ]; then + setup_host + fi fi MODULES_DIR=$PARENT_DIR/modules @@ -1835,7 +1846,7 @@ EOF done mksquashfs $COREFS $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -keep-as-directory -noappend || exit' - mksquashfs $MODULE_UPPER_DIR $PARENT_DIR/image/$LIVEKITNAME/$MODULE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit + mksquashfs $MODULE_UPPER_DIR $PARENT_DIR/image/$LIVEKITNAME/$MODULE-$COMP_TYPE.$BEXT -comp $COMP_TYPE -b 1024K -always-use-fragments -noappend || exit fi done diff --git a/linux-live/pkglists/hostreq.list b/linux-live/pkglists/hostreq.list index adf7096..ef942b5 100644 --- a/linux-live/pkglists/hostreq.list +++ b/linux-live/pkglists/hostreq.list @@ -3,6 +3,8 @@ sudo binutils debootstrap squashfs-tools +xz-utils +lz4 xorriso grub-pc-bin grub-efi-amd64-bin