buildiso: fix bug when using buildiso; reset profile vars
This commit is contained in:
parent
ac44e01b5c
commit
ff51d0e050
3 changed files with 29 additions and 0 deletions
|
@ -59,6 +59,7 @@ show_profile(){
|
|||
msg2 "disable_openrc: ${disable_openrc[*]}"
|
||||
fi
|
||||
fi
|
||||
unset_profile
|
||||
}
|
||||
|
||||
display_settings(){
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
|
27
lib/util.sh
27
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
|
||||
|
|
Loading…
Reference in a new issue