diff --git a/docker/scripts/mlc-bionic-amd64.sh b/docker/scripts/mlc-bionic-amd64.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/mlc-bionic-i386.sh b/docker/scripts/mlc-bionic-i386.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/mlc-bullseye-amd64.sh b/docker/scripts/mlc-bullseye-amd64.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/mlc-bullseye-i386.sh b/docker/scripts/mlc-bullseye-i386.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/mlc-focal-amd64.sh b/docker/scripts/mlc-focal-amd64.sh old mode 100644 new mode 100755 diff --git a/docker/scripts/mlc-focal-i386.sh b/docker/scripts/mlc-focal-i386.sh old mode 100644 new mode 100755 diff --git a/linux-live/basesystem/01-core/install b/linux-live/basesystem/01-core/install index 8807dcd..104c2ab 100644 --- a/linux-live/basesystem/01-core/install +++ b/linux-live/basesystem/01-core/install @@ -32,7 +32,7 @@ if [ $PACKAGE_VARIANT = "standard" ]; then #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD install $APT_OPTIONS \ zstd >>$OUTPUT 2>&1 - if [ $DISTRIBUTION = "stretch" ] || [ $DISTRIBUTION = "xenial" ]; then + if [ $DISTRIBUTION = "stretch" ] || [ $DISTRIBUTION = "xenial" ] || [ $DISTRIBUTION = "bionic" ]; then #sudo DEBIAN_FRONTEND=$DEBIAN_FRONTEND_TYPE \ $APT_CMD install $APT_OPTIONS \ liblz4-tool >>$OUTPUT 2>&1 @@ -62,7 +62,8 @@ elif [ $DISTRIBUTION_TYPE = "ubuntu" ]; then KERNEL_IMAGE="linux-image-4.4.0-210-generic" elif [ $DISTRIBUTION = "focal" ]; then KERNEL_IMAGE="linux-image-5.4.0-84-generic" - #KERNEL_IMAGE="linux-image-generic" + elif [ $DISTRIBUTION = "bionic" ]; then + KERNEL_IMAGE="linux-image-4.15.0-156-generic" fi fi diff --git a/linux-live/buildconfig b/linux-live/buildconfig index e916000..c727e46 100644 --- a/linux-live/buildconfig +++ b/linux-live/buildconfig @@ -2,11 +2,11 @@ # distribution type # тип дистрибутива -DISTRIBUTION_TYPE="ubuntu" +DISTRIBUTION_TYPE="debian" # distribution # дистрибутив -DISTRIBUTION="bionic" +DISTRIBUTION="bullseye" # distribution arch # note: stretch only works with amd64 diff --git a/linux-live/minioslib b/linux-live/minioslib index 18d62df..bd899e4 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -36,7 +36,6 @@ function common_variables() { fi if [ $DISTRIBUTION_ARCH = "amd64" ]; then - echo "+++++++++===amd64===+++++++++" KERNEL_ARCH="amd64" #PACKAGE_VARIANT="standard" elif [ $DISTRIBUTION_ARCH = "i386" ]; then