Raise error if /etc/hostid not readable
This commit is contained in:
parent
0f97270a6a
commit
e0f371693a
11
cmd/list.go
11
cmd/list.go
@ -20,7 +20,11 @@ func ListJailsProps(args []string) {
|
|||||||
var conf Jail
|
var conf Jail
|
||||||
var result []string
|
var result []string
|
||||||
// Mandatory constructor to init default values
|
// Mandatory constructor to init default values
|
||||||
jailconf := NewJailConfig()
|
jailconf, err := NewJailConfig()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Error allocating JailConfig: %s\n", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
conf.Config = jailconf
|
conf.Config = jailconf
|
||||||
|
|
||||||
@ -215,7 +219,10 @@ func getJailConfig(jailConfigPath string) (JailConfig, error) {
|
|||||||
if err != nil { log.Fatalln(fmt.Sprintf("Unable to read %s, check path and/or rights", jailConfigPath)) }
|
if err != nil { log.Fatalln(fmt.Sprintf("Unable to read %s, check path and/or rights", jailConfigPath)) }
|
||||||
|
|
||||||
// Mandatory constructor to init default values
|
// Mandatory constructor to init default values
|
||||||
jc := NewJailConfig()
|
jc, err := NewJailConfig()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
err = json.Unmarshal([]byte(content), &jc)
|
err = json.Unmarshal([]byte(content), &jc)
|
||||||
if err != nil { log.Fatalln(fmt.Sprintf("Error occured during unmarshaling %s: %s", jailConfigPath, err.Error())) }
|
if err != nil { log.Fatalln(fmt.Sprintf("Error occured during unmarshaling %s: %s", jailConfigPath, err.Error())) }
|
||||||
|
|
||||||
|
@ -18,12 +18,12 @@ import (
|
|||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Mandatory constructor for JailConfig type. It set default values
|
* Mandatory constructor for JailConfig type. It set default values
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
func NewJailConfig() JailConfig {
|
func NewJailConfig() (JailConfig, error) {
|
||||||
var jc JailConfig
|
var jc JailConfig
|
||||||
|
|
||||||
hostid, err := ioutil.ReadFile("/etc/hostid")
|
hostid, err := ioutil.ReadFile("/etc/hostid")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
hostid = []byte("12345678-abcd-ef98-7654-321012345678")
|
return err
|
||||||
} else {
|
} else {
|
||||||
hostid = []byte(strings.Replace(string(hostid), "\n", "", -1))
|
hostid = []byte(strings.Replace(string(hostid), "\n", "", -1))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user