keepalived: Fix track_* option in vrrp_instance defn

Also fix ordering of config stanzas

We were parsing the track_script and track_interface definitions to
include the weight param when configuring a vrrp_instance. This is not
correct, as the weight param inside a vrrp instance is used to augment
the one defined in the script.

We were also not taking into account vrrp_script stanzas

This commit skips the parsing and simply lists the name of the
track/vrrp object

Signed-off-by: Ben Kelly <ben@benjii.net>
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

net/keepalived/files/keepalived.init

@@ -279,7 +279,7 @@ vrrp_instance() {
 		[ -z "$optval" ] && continue
 		printf "$INDENT_1$opt {\n" >> $KEEPALIVED_CONF
 		for t in $optval; do
-			config_foreach print_track_elem_indent $opt $t $INDENT_2
+			printf "$INDENT_2$optval\n" >> $KEEPALIVED_CONF
 		done
 		printf "$INDENT_1}\n" >> $KEEPALIVED_CONF
 	done
@@ -356,9 +356,9 @@ process_config() {
 	config_foreach_wrapper static_routes
 	config_section_close
 
+	config_foreach_wrapper vrrp_script
 	config_foreach_wrapper vrrp_sync_group
 	config_foreach_wrapper vrrp_instance
-	config_foreach_wrapper vrrp_script
 	return 0
 }