@@ -2,15 +2,15 @@ package saltboot
2
2
3
3
import (
4
4
"io/ioutil"
5
- "strings"
6
5
"log"
6
+ "strings"
7
7
)
8
8
9
9
const DEFAULT_DOMAIN = ".example.com"
10
10
const HOST_FILE_NAME = "/etc/hosts"
11
11
12
12
func getIpv4Address () (string , error ) {
13
- return ExecCmd ("hostname" , "-i " )
13
+ return ExecCmd ("hostname -I | head -1 " )
14
14
}
15
15
16
16
func getFQDN () (string , error ) {
@@ -26,7 +26,7 @@ func getDomain() (string, error) {
26
26
}
27
27
28
28
// This is required due to: https://github.com/saltstack/salt/issues/32719
29
- func ensureIpv6Resolvable (customDomain string ) ( error ) {
29
+ func ensureIpv6Resolvable (customDomain string ) error {
30
30
hostname , hostNameErr := getHostName ()
31
31
log .Printf ("[ensureIpv6Resolvable] hostName: %s" , hostname )
32
32
if hostNameErr != nil {
@@ -36,7 +36,7 @@ func ensureIpv6Resolvable(customDomain string) (error) {
36
36
domain , domainError := getDomain ()
37
37
log .Printf ("[ensureIpv6Resolvable] origin domain: %s" , domain )
38
38
if customDomain == "" {
39
- if domainError != nil || domain == "" {
39
+ if domainError != nil || domain == "" {
40
40
domain = DEFAULT_DOMAIN
41
41
}
42
42
} else {
@@ -47,7 +47,7 @@ func ensureIpv6Resolvable(customDomain string) (error) {
47
47
return nil
48
48
}
49
49
50
- func updateIpv6HostName (hostName string , domain string ) ( error ) {
50
+ func updateIpv6HostName (hostName string , domain string ) error {
51
51
log .Printf ("[updateIpv6HostName] hostName: %s, domain: %s" , hostName , domain )
52
52
b , err := ioutil .ReadFile (HOST_FILE_NAME )
53
53
if err != nil {
@@ -72,4 +72,3 @@ func updateIpv6HostName(hostName string, domain string) (error) {
72
72
73
73
return nil
74
74
}
75
-
0 commit comments