root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util] reset packages file path; fix iso filename if no Packages-Custom

Browse source
This commit is contained in:
udeved 2015-12-21 12:03:17 +01:00
parent 87d97c779e
commit 5df64bb9bc
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/util-iso.sh
View file

@ -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
fn="${iso_name}-${custom}-${initsys}-${dist_release}-${arch}"
fi
else
echo "${iso_name}-${custom}-${dist_release}-${arch}"
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() {

2
lib/util.sh
View file

@ -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(){