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

util-iso-cal: allow hybrid yaml netinstall file to separate pure netinstall from addtional software;

Browse source 
hybrid could be very attractive to sonar
This commit is contained in:
udeved 2016-08-20 22:42:58 +02:00
parent 6c92983f65
commit 1a8aa352a5
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/util-iso-calamares.sh
View file

@ -296,8 +296,13 @@ write_postcfg_conf(){
write_netinstall_conf(){
local conf="$1/etc/calamares/modules/netinstall.conf"
if ${unpackfs};then
local yaml="netinstall-hybrid.yaml"
[[ ${initsys} == 'openrc' ]] && yaml="netinstall-hybrid-${initsys}.yaml"
else
local yaml="netinstall.yaml"
[[ ${initsys} == 'openrc' ]] && yaml="netinstall-${initsys}.yaml"
fi
echo "---" > "$conf"
echo "groupsUrl: ${netgroups}/${yaml}" >> "$conf"
}
@ -344,7 +349,7 @@ configure_calamares(){
write_finished_conf "$1"
write_netinstall_conf "$1"
${netinstall} && write_netinstall_conf "$1"
write_chrootcfg_conf "$1"