Skip to content

Commit ad7dacd

Browse files
committed
use hostname -I instead of hostname -i
1 parent 52bd332 commit ad7dacd

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

saltboot/hostname.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package saltboot
22

33
import (
44
"io/ioutil"
5-
"strings"
65
"log"
6+
"strings"
77
)
88

99
const DEFAULT_DOMAIN = ".example.com"
1010
const HOST_FILE_NAME = "/etc/hosts"
1111

1212
func getIpv4Address() (string, error) {
13-
return ExecCmd("hostname", "-i")
13+
return ExecCmd("hostname -I | head -1")
1414
}
1515

1616
func getFQDN() (string, error) {
@@ -26,7 +26,7 @@ func getDomain() (string, error) {
2626
}
2727

2828
// This is required due to: https://github.com/saltstack/salt/issues/32719
29-
func ensureIpv6Resolvable(customDomain string) (error) {
29+
func ensureIpv6Resolvable(customDomain string) error {
3030
hostname, hostNameErr := getHostName()
3131
log.Printf("[ensureIpv6Resolvable] hostName: %s", hostname)
3232
if hostNameErr != nil {
@@ -36,7 +36,7 @@ func ensureIpv6Resolvable(customDomain string) (error) {
3636
domain, domainError := getDomain()
3737
log.Printf("[ensureIpv6Resolvable] origin domain: %s", domain)
3838
if customDomain == "" {
39-
if domainError != nil || domain == "" {
39+
if domainError != nil || domain == "" {
4040
domain = DEFAULT_DOMAIN
4141
}
4242
} else {
@@ -47,7 +47,7 @@ func ensureIpv6Resolvable(customDomain string) (error) {
4747
return nil
4848
}
4949

50-
func updateIpv6HostName(hostName string, domain string) (error) {
50+
func updateIpv6HostName(hostName string, domain string) error {
5151
log.Printf("[updateIpv6HostName] hostName: %s, domain: %s", hostName, domain)
5252
b, err := ioutil.ReadFile(HOST_FILE_NAME)
5353
if err != nil {
@@ -72,4 +72,3 @@ func updateIpv6HostName(hostName string, domain string) (error) {
7272

7373
return nil
7474
}
75-

0 commit comments

Comments
 (0)