From ff51d0e050730f514c304382ca815904538f30ae Mon Sep 17 00:00:00 2001 From: Philip Date: Mon, 21 Dec 2015 11:44:26 +0100 Subject: [PATCH] buildiso: fix bug when using buildiso; reset profile vars --- bin/buildiso.in | 1 + lib/util-iso.sh | 1 + lib/util.sh | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/bin/buildiso.in b/bin/buildiso.in index aa0dd46..a708829 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -59,6 +59,7 @@ show_profile(){ msg2 "disable_openrc: ${disable_openrc[*]}" fi fi + unset_profile } display_settings(){ diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 71ce232..8229600 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -619,6 +619,7 @@ make_profile(){ build_images compress_images fi + unset_profile msg "Finished building [$1]" msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes" } diff --git a/lib/util.sh b/lib/util.sh index 95b084a..763f9e1 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -238,6 +238,33 @@ load_config(){ return 0 } +unset_profile(){ + unset initsys + unset displaymanager + unset autologin + unset multilib + unset pxe_boot + unset plymouth_boot + unset nonfree_xorg + unset default_desktop_executable + unset default_desktop_file + unset kernel + unset efi_boot_loader + unset efi_part_size + unset hostname + unset username + unset plymouth_theme + unset password + unset addgroups + unset start_systemd + unset disable_systemd + unset start_openrc + unset disable_openrc + unset start_systemd_live + unset start_openrc_live + unset use_overlayfs +} + load_profile_config(){ [[ -f $1 ]] || return 1