diff --git a/buildall b/buildall index dd36f83..44421a9 100755 --- a/buildall +++ b/buildall @@ -14,7 +14,7 @@ function build() { sed -i -e "/DISTRIBUTION_ARCH=/s/=.*/=$DISTRIBUTION_ARCH/" $SCRIPT_DIR/linux-live/buildconfig sed -i -e "/DESKTOP_ENVIRONMENT=/s/=.*/=$DESKTOP_ENVIRONMENT/" $SCRIPT_DIR/linux-live/buildconfig sed -i -e "/COMP_TYPE=/s/=.*/=$COMP_TYPE/" $SCRIPT_DIR/linux-live/buildconfig - ./install - + $SCRIPT_DIR/install - } # bullseye xfce @@ -98,7 +98,7 @@ DISTRIBUTION_ARCH="amd64" DESKTOP_ENVIRONMENT="slax" PACKAGE_VARIANT="minimal" COMP_TYPE="xz" -build +build' # stretch xfce DISTRIBUTION_TYPE="debian" @@ -108,14 +108,14 @@ DESKTOP_ENVIRONMENT="xfce" PACKAGE_VARIANT="standard" COMP_TYPE="xz" build - +: ' DISTRIBUTION_TYPE="debian" DISTRIBUTION="stretch" DISTRIBUTION_ARCH="i386" DESKTOP_ENVIRONMENT="xfce" PACKAGE_VARIANT="standard" COMP_TYPE="xz" -build +build' DISTRIBUTION_TYPE="debian" DISTRIBUTION="stretch" @@ -131,7 +131,7 @@ DISTRIBUTION_ARCH="i386" DESKTOP_ENVIRONMENT="xfce" PACKAGE_VARIANT="minimal" COMP_TYPE="xz" -build' +build # focal xfce DISTRIBUTION_TYPE="ubuntu" diff --git a/docker/02-build.sh b/docker/02-build.sh index 3b79872..9f325cf 100755 --- a/docker/02-build.sh +++ b/docker/02-build.sh @@ -1,3 +1,3 @@ #!/bin/bash -#docker run -d --name mlc --privileged -v /build:/build local/mlc -docker run -d --name mlc-modules --privileged -v /build:/build local/mlc /build/minios-slax/install build_modules - +docker run -d --name mlc --privileged -v /build:/build local/mlc +#docker run -d --name mlc-modules --privileged -v /build:/build local/mlc /build/minios-slax/install build_modules - diff --git a/docker/Dockerfile.py b/docker/Dockerfile.py index 2944c37..2418c44 100755 --- a/docker/Dockerfile.py +++ b/docker/Dockerfile.py @@ -12,8 +12,8 @@ class DockerFile(pydocker.DockerFile): """ add here your custom features """ #d = DockerFile(base_img='ubuntu:focal', name='local/mlc:latest') -#d = DockerFile(base_img='ubuntu:bionic', name='local/mlc:latest') -d = DockerFile(base_img='debian:buster', name='local/mlc:latest') +d = DockerFile(base_img='ubuntu:bionic', name='local/mlc:latest') +#d = DockerFile(base_img='debian:buster', name='local/mlc:latest') d.RUN_bash_script('/opt/install.sh', r''' touch /.minios-live-container diff --git a/linux-live/minioslib b/linux-live/minioslib index 8895ed5..819c406 100644 --- a/linux-live/minioslib +++ b/linux-live/minioslib @@ -604,6 +604,7 @@ function new_run() { echo "=================================================================" >>$OUTPUT 2>&1 echo "=================================================================" >>$OUTPUT 2>&1 echo "========== Distributution: $DISTRIBUTION" >>$OUTPUT 2>&1 + echo "========== Desktop Environment: $DESKTOP_ENVIRONMENT" >>$OUTPUT 2>&1 echo "========== Arch: $DISTRIBUTION_ARCH" >>$OUTPUT 2>&1 echo "========== Compression: $COMP_TYPE" >>$OUTPUT 2>&1 echo ""