[util] reset packages file path; fix iso filename if no Packages-Custom
This commit is contained in:
parent
87d97c779e
commit
5df64bb9bc
2 changed files with 14 additions and 2 deletions
|
@ -135,11 +135,21 @@ make_image_root() {
|
|||
}
|
||||
|
||||
gen_iso_fn(){
|
||||
local fn
|
||||
if [[ ${initsys} == 'openrc' ]];then
|
||||
echo "${iso_name}-${custom}-${initsys}-${dist_release}-${arch}"
|
||||
if [[ -z ${custom} ]]; then
|
||||
fn="${iso_name}-${initsys}-${dist_release}-${arch}"
|
||||
else
|
||||
echo "${iso_name}-${custom}-${dist_release}-${arch}"
|
||||
fn="${iso_name}-${custom}-${initsys}-${dist_release}-${arch}"
|
||||
fi
|
||||
else
|
||||
if [[ -z ${custom} ]]; then
|
||||
fn="${iso_name}-${dist_release}-${arch}"
|
||||
else
|
||||
fn="${iso_name}-${custom}-${dist_release}-${arch}"
|
||||
fi
|
||||
fi
|
||||
echo $fn
|
||||
}
|
||||
|
||||
make_image_custom() {
|
||||
|
|
|
@ -265,6 +265,8 @@ unset_profile(){
|
|||
unset start_systemd_live
|
||||
unset start_openrc_live
|
||||
unset use_overlayfs
|
||||
unset packages_custom
|
||||
unset packages_mhwd
|
||||
}
|
||||
|
||||
load_profile_config(){
|
||||
|
|
Loading…
Reference in a new issue