root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

util-iso-yaml: don't write packages.yaml in display mode

Browse source
This commit is contained in:
udeved 2016-08-21 17:35:47 +02:00
parent 8129811708
commit 805c33bcd7
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/util-iso-yaml.sh
View file

@ -41,15 +41,6 @@ prepare_check(){
prepare_dir "${yaml_dir}"
chown "${OWNER}:${OWNER}" "${yaml_dir}"
load_pkgs "${profile_dir}/Packages-Root"
yaml="${yaml_dir}/Packages-Root-${target_arch}-${initsys}.yaml"
write_netgroup_yaml "$1" "${yaml}"
if [[ -f "${packages_custom}" ]]; then
load_pkgs "${packages_custom}"
yaml="${yaml_dir}/${packages_custom##*/}-${target_arch}-${initsys}.yaml"
write_netgroup_yaml "$1" "${yaml}"
fi
}
write_calamares_yaml(){
@ -63,7 +54,14 @@ write_calamares_yaml(){
make_profile_yaml(){
prepare_check "$1"
load_pkgs "${profile_dir}/Packages-Root"
yaml="${yaml_dir}/Packages-Root-${target_arch}-${initsys}.yaml"
write_netgroup_yaml "$1" "${yaml}"
if [[ -f "${packages_custom}" ]]; then
load_pkgs "${packages_custom}"
yaml="${yaml_dir}/${packages_custom##*/}-${target_arch}-${initsys}.yaml"
write_netgroup_yaml "$1" "${yaml}"
fi
${calamares} && write_calamares_yaml "$1"
user_own "${yaml_dir}"
reset_profile