|
|
@ -15,9 +15,9 @@ function common_variables() { |
|
|
|
#OUTPUT="/var/log/$LIVEKITNAME.log" |
|
|
|
OUTPUT="/dev/stdout" |
|
|
|
# |
|
|
|
if [ -f /.dockerenv ]; then |
|
|
|
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then |
|
|
|
OUTPUT="/dev/stdout" |
|
|
|
CONTAINER="docker" |
|
|
|
#CONTAINER="docker" |
|
|
|
fi |
|
|
|
|
|
|
|
# if = "1", creates a second iso with a constant filename |
|
|
@ -30,7 +30,7 @@ function common_variables() { |
|
|
|
|
|
|
|
# if ="1", creates backup in parent folder |
|
|
|
# если ="1", создаёт резервную копию в родительской папке |
|
|
|
CREATE_BACKUP="0" |
|
|
|
CREATE_BACKUP="1" |
|
|
|
|
|
|
|
DEBIAN_FRONTEND_TYPE="noninteractive" |
|
|
|
#DEBIAN_FRONTEND_TYPE="ncurses" |
|
|
@ -479,7 +479,7 @@ function create_apt_list() { |
|
|
|
function build_bootstrap() { |
|
|
|
current_process |
|
|
|
|
|
|
|
if [ -f /.dockerenv ]; then |
|
|
|
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then |
|
|
|
if [ ! -f /.minios-live ]; then |
|
|
|
setup_host |
|
|
|
fi |
|
|
@ -527,7 +527,7 @@ function copy_build_scripts() { |
|
|
|
function build_chroot() { |
|
|
|
current_process |
|
|
|
|
|
|
|
if [ -f /.dockerenv ]; then |
|
|
|
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then |
|
|
|
if [ ! -f /.minios-live ]; then |
|
|
|
setup_host |
|
|
|
fi |
|
|
@ -566,7 +566,7 @@ function build_chroot() { |
|
|
|
function build_live() { |
|
|
|
current_process |
|
|
|
|
|
|
|
if [ -f /.dockerenv ]; then |
|
|
|
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then |
|
|
|
if [ ! -f /.minios-live ]; then |
|
|
|
setup_host |
|
|
|
fi |
|
|
@ -590,7 +590,7 @@ EOF |
|
|
|
function build_iso() { |
|
|
|
current_process |
|
|
|
|
|
|
|
if [ -f /.dockerenv ]; then |
|
|
|
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then |
|
|
|
if [ ! -f /.minios-live ]; then |
|
|
|
setup_host |
|
|
|
fi |
|
|
@ -696,7 +696,7 @@ function chroot_setup_host() { |
|
|
|
function hostreq_pkg_list() { |
|
|
|
echo -e "${YELLOW}=====> installing required software for host system ...${ENDCOLOUR}" |
|
|
|
$APT_CMD update >>$OUTPUT 2>&1 |
|
|
|
if [ -f /.dockerenv ]; then |
|
|
|
if [ -f /.dockerenv ] || [ "$container" = "podman" ]; then |
|
|
|
touch /.minios-live |
|
|
|
$APT_CMD install -y wget patch >>$OUTPUT 2>&1 |
|
|
|
cd ~ |
|
|
|