Browse Source

added podman support

master
crims0n 5 years ago
parent
commit
cd7af6c9cd
  1. 16
      linux-live/minioslib

16
linux-live/minioslib

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

Loading…
Cancel
Save