.pct-helpers

@@ -313,7 +313,7 @@ reviewApplyChanges(){
 				break
 				;;
 			e|edit)
-				${EDITOR} "${file}.new"
+				${EDITOR} "${file}"
 				;;
 			s|skip)
 				echo "# file saved as: ${file}.new"
@@ -469,9 +469,9 @@ readCTVars(){
 }
 readBridgeVars(){
 	# bridge config...
-	xread "ADMIN bridge: vmbr" ADMIN_BRIDGE
 	xread "WAN bridge: vmbr" WAN_BRIDGE
 	xread "LAN bridge: vmbr" LAN_BRIDGE
+	xread "ADMIN bridge: vmbr" ADMIN_BRIDGE
 }
 readVars(){
 	xread -n "Email: " EMAIL

Makefile

@@ -60,17 +60,6 @@ check: check-message $(foreach dep,$(DEPENDENCIES),require($(dep)))
 FORCE:
 
 
-# XXX should thisbe an env var or an arg to make.sh???
-%-bootstrap: export BOOTSTRAP=1
-%-bootstrap: %
-	true
-
-
-%-bootstrap-clean: export BOOTSTRAP_CLEAN=1
-%-bootstrap-clean: %
-	true
-
-
 %: config %/make.sh FORCE
 	$*/make.sh
 
@@ -108,12 +97,7 @@ gate: gate-traefik
 # 	...not yet sure of the best way to do this...
 # 	
 .PHONY: bootstrap
-bootstrap: host-bootstrap gate-bootstrap \
+bootstrap: host
-		ns \
-		bootstrap-clean
-
-.PHONY: bootstrap-clean
-bootstrap-clean: host-bootstrap-clean
 
 
 

config.global.example

@@ -30,13 +30,10 @@
 #
 # NOTE: on a clean Proxmox install ADMIN is pre-setup, we will use it 
 # 	for bootstrapping and reconfigure it later.
-# NOTE: to make things simpler it is recommmended to number bridges 
-# 	connecting to physical ports the same as ports and virtual 
-# 	bridges with numbers greater than X (10 in the example below)
 #
-ADMIN_BRIDGE=0
+ADMIN_BRIDGE=vmbr0
-WAN_BRIDGE=3
+WAN_BRIDGE=
-LAN_BRIDGE=10
+LAN_BRIDGE=
 
 
 # NOTE: it is simpler to statically assign these than to configure dhcp

host/make.sh

@@ -75,18 +75,13 @@ if xreadYes "# Create bridges?" BRIDGES ; then
 				"vmbr\(${WAN_BRIDGE}\|${LAN_BRIDGE}\|${ADMIN_BRIDGE}\)" \
 				"$INTERFACES" ; then
 		conflict=
-		#for br in WAN_BRIDGE LAN_BRIDGE ADMIN_BRIDGE ; do
+		for br in WAN_BRIDGE LAN_BRIDGE ADMIN_BRIDGE ; do
-		for br in WAN_BRIDGE LAN_BRIDGE ; do
 			if grep -q "vmbr${!br}" "$INTERFACES" ; then
 				conflict="${conflict}, vmbr${!br} (${br})"
 			fi
 		done
-		if grep -q "vmbr${ADMIN_BRIDGE}" "$INTERFACES" ; then
+		echo "ERROR: will not overwrite existing bridges: ${conflict:2}" >&2
-			echo "NOTE: reusing vmbr${ADMIN_BRIDGE} for ADMIN."
+		exit 1
-		else
-			echo "ERROR: will not overwrite existing bridges: ${conflict:2}" >&2
-			exit 1
-		fi
 	fi
 
 	@ cp "$INTERFACES"{,.bak}