@@ -79,7 +79,7 @@ func getPackagingConfigurer(series string) (config.PackagingConfigurer, error) {
79
79
func configureZFS () {
80
80
/* create a 100 GB pool by default (sparse, so it won't actually fill
81
81
* that immediately)
82
- */
82
+ */
83
83
output , err := exec .Command (
84
84
"lxd" ,
85
85
"init" ,
@@ -134,7 +134,6 @@ func configureLXDBridge() error {
134
134
return errors .Trace (err )
135
135
}
136
136
137
-
138
137
/* non-systemd systems don't have the lxd-bridge service, so this always fails */
139
138
_ = exec .Command ("service" , "lxd-bridge" , "restart" ).Run ()
140
139
return exec .Command ("service" , "lxd" , "restart" ).Run ()
@@ -186,16 +185,16 @@ func editLXDBridgeFile(input string, subnet string) string {
186
185
buffer := bytes.Buffer {}
187
186
188
187
newValues := map [string ]string {
189
- "USE_LXD_BRIDGE" : "true" ,
190
- "EXISTING_BRIDGE" : "" ,
191
- "LXD_BRIDGE" : "lxdbr0" ,
192
- "LXD_IPV4_ADDR" : fmt .Sprintf ("10.0.%s.1" , subnet ),
193
- "LXD_IPV4_NETMASK" : "255.255.255.0" ,
194
- "LXD_IPV4_NETWORK" : fmt .Sprintf ("10.0.%s.1/24" , subnet ),
188
+ "USE_LXD_BRIDGE" : "true" ,
189
+ "EXISTING_BRIDGE" : "" ,
190
+ "LXD_BRIDGE" : "lxdbr0" ,
191
+ "LXD_IPV4_ADDR" : fmt .Sprintf ("10.0.%s.1" , subnet ),
192
+ "LXD_IPV4_NETMASK" : "255.255.255.0" ,
193
+ "LXD_IPV4_NETWORK" : fmt .Sprintf ("10.0.%s.1/24" , subnet ),
195
194
"LXD_IPV4_DHCP_RANGE" : fmt .Sprintf ("10.0.%s.2,10.0.%s.254" , subnet , subnet ),
196
- "LXD_IPV4_DHCP_MAX" : "253" ,
197
- "LXD_IPV4_NAT" : "true" ,
198
- "LXD_IPV6_PROXY" : "false" ,
195
+ "LXD_IPV4_DHCP_MAX" : "253" ,
196
+ "LXD_IPV4_NAT" : "true" ,
197
+ "LXD_IPV6_PROXY" : "false" ,
199
198
}
200
199
found := map [string ]bool {}
201
200
0 commit comments