Skip to content

Commit 3b6a2da

Browse files
author
Tycho Andersen
committed
lxd container type: go fmt
Signed-off-by: Tycho Andersen <[email protected]>
1 parent 8257fb3 commit 3b6a2da

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

container/lxd/initialisation.go

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func getPackagingConfigurer(series string) (config.PackagingConfigurer, error) {
7979
func configureZFS() {
8080
/* create a 100 GB pool by default (sparse, so it won't actually fill
8181
* that immediately)
82-
*/
82+
*/
8383
output, err := exec.Command(
8484
"lxd",
8585
"init",
@@ -134,7 +134,6 @@ func configureLXDBridge() error {
134134
return errors.Trace(err)
135135
}
136136

137-
138137
/* non-systemd systems don't have the lxd-bridge service, so this always fails */
139138
_ = exec.Command("service", "lxd-bridge", "restart").Run()
140139
return exec.Command("service", "lxd", "restart").Run()
@@ -186,16 +185,16 @@ func editLXDBridgeFile(input string, subnet string) string {
186185
buffer := bytes.Buffer{}
187186

188187
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),
195194
"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",
199198
}
200199
found := map[string]bool{}
201200

0 commit comments

Comments
 (0)