buildiso: always write netinstall.conf; unset netgroups

2016-08-20 23:17:46 +02:00 · 2016-08-20 23:17:46 +02:00 · abada0e5ba
commit abada0e5ba
parent 09cf136d78
2 changed files with 2 additions and 1 deletions
--- a/lib/util-iso-calamares.sh
+++ b/lib/util-iso-calamares.sh
@ -356,7 +356,7 @@ configure_calamares(){

 	write_finished_conf "$1"

-	${netinstall} && write_netinstall_conf "$1"
+	write_netinstall_conf "$1"

 	write_chrootcfg_conf "$1"

--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@ -677,6 +677,7 @@ reset_profile(){
 	unset piece_size
 	unset netinstall
 	unset unpackfs
+	unset netgroups
 }

 make_profile(){