Update for LSB compliance
Signed-off-by: jcsiadal <jeremy.c.siadal@intel.com>
This commit is contained in:
@@ -63,7 +63,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
|
||||
return errors.New("found pidfile " + PIDFile + " not starting")
|
||||
}
|
||||
|
||||
if os.Args[0] == path.Join(buildconfig.WWCLIENTLOC(), "wwclient") {
|
||||
if os.Args[0] == path.Join(buildconfig.WWCLIENTDIR(), "wwclient") {
|
||||
err := os.Chdir("/")
|
||||
if err != nil {
|
||||
wwlog.Printf(wwlog.ERROR, "failed to change dir: %s", err)
|
||||
@@ -75,7 +75,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
|
||||
} else {
|
||||
fmt.Printf("Called via: %s\n", os.Args[0])
|
||||
fmt.Printf("Runtime overlay is being put in '/warewulf/wwclient-test' rather than '/'\n")
|
||||
fmt.Printf("For full functionality call with: %s\n", path.Join(buildconfig.WWCLIENTLOC(), "wwclient"))
|
||||
fmt.Printf("For full functionality call with: %s\n", path.Join(buildconfig.WWCLIENTDIR(), "wwclient"))
|
||||
err := os.MkdirAll("/warewulf/wwclient-test", 0755)
|
||||
if err != nil {
|
||||
wwlog.Printf(wwlog.ERROR, "failed to create dir: %s", err)
|
||||
|
||||
@@ -15,7 +15,7 @@ var (
|
||||
wwprovisiondir string = "UNDEF"
|
||||
version string = "UNDEF"
|
||||
release string = "UNDEF"
|
||||
wwclientloc string = "UNDEF"
|
||||
wwclientdir string = "UNDEF"
|
||||
datadir string = "UNDEF"
|
||||
)
|
||||
|
||||
@@ -84,7 +84,7 @@ func RELEASE() string {
|
||||
return release
|
||||
}
|
||||
|
||||
func WWCLIENTLOC() string {
|
||||
wwlog.Printf(wwlog.DEBUG, "WWCLIENTLOC = '%s'\n", wwclientloc)
|
||||
return wwclientloc
|
||||
func WWCLIENTDIR() string {
|
||||
wwlog.Printf(wwlog.DEBUG, "WWCLIENTDIR = '%s'\n", wwclientdir)
|
||||
return wwclientdir
|
||||
}
|
||||
|
||||
@@ -14,5 +14,5 @@ func init() {
|
||||
wwprovisiondir = "@WWPROVISIONDIR@"
|
||||
version = "@VERSION@"
|
||||
release = "@RELEASE@"
|
||||
wwclientloc = "@WWCLIENTLOC@"
|
||||
wwclientdir = "@WWCLIENTDIR@"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user