rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-27 15:26:50 +00:00
Code Issues Releases Wiki Activity

Change reboot error messages and timeout

Browse Source
This commit is contained in:
Darren Shepherd 2015-02-23 14:52:11 -07:00
parent db94dfa2d1
commit e5192ddc5e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/power/power.go
View File

@ -19,8 +19,7 @@ const (
func PowerOff() { func PowerOff() {
if os.Geteuid() != 0 { if os.Geteuid() != 0 {
log.Info("poweroff: Permission Denied") log.Fatalf("%s: Permission Denied", os.Args[0])
return
} }
syscall.Sync() syscall.Sync()
reboot(syscall.LINUX_REBOOT_CMD_POWER_OFF) reboot(syscall.LINUX_REBOOT_CMD_POWER_OFF)
@ -28,8 +27,7 @@ func PowerOff() {
func Reboot() { func Reboot() {
if os.Geteuid() != 0 { if os.Geteuid() != 0 {
log.Info("reboot: Permission Denied") log.Fatalf("%s: Permission Denied", os.Args[0])
return
} }
syscall.Sync() syscall.Sync()
reboot(syscall.LINUX_REBOOT_CMD_RESTART) reboot(syscall.LINUX_REBOOT_CMD_RESTART)
@ -37,8 +35,7 @@ func Reboot() {
func Halt() { func Halt() {
if os.Geteuid() != 0 { if os.Geteuid() != 0 {
log.Info("reboot: Permission Denied") log.Fatalf("%s: Permission Denied", os.Args[0])
return
} }
syscall.Sync() syscall.Sync()
reboot(syscall.LINUX_REBOOT_CMD_HALT) reboot(syscall.LINUX_REBOOT_CMD_HALT)
@ -47,7 +44,7 @@ func Halt() {
func reboot(code int) { func reboot(code int) {
err := shutDownContainers() err := shutDownContainers()
if err != nil { if err != nil {
log.Fatal(err) log.Error(err)
} }
err = syscall.Reboot(code) err = syscall.Reboot(code)
if err != nil { if err != nil {
@ -58,7 +55,7 @@ func reboot(code int) {
func shutDownContainers() error { func shutDownContainers() error {
var err error var err error
shutDown := true shutDown := true
timeout := uint(0) timeout := uint(2)
for i := range os.Args { for i := range os.Args {
arg := os.Args[i] arg := os.Args[i]
if arg == "-f" || arg == "--f" || arg == "--force" { if arg == "-f" || arg == "--f" || arg == "--force" {