Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

functional: poweroff machine using machinectl instead of systemctl #1587

Merged
merged 1 commit into from
May 24, 2016
Merged

functional: poweroff machine using machinectl instead of systemctl #1587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions functional/platform/nspawn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,15 +591,9 @@ func (nc *nspawnCluster) ReplaceMember(m Member) (Member, error) {
count := len(nc.members)
label := fmt.Sprintf("%s%s", nc.name, m.ID())

// The `machinectl poweroff` command does not cleanly shut down
// the nspawn container, so we must use systemctl
cmd := fmt.Sprintf("systemctl -M %s poweroff", label)
if _, stderr, _ := run(cmd); !strings.Contains(stderr, "Success") {
if strings.Contains(stderr, "Warning! D-Bus connection terminated.") {
log.Printf("poweroff failed: %s", stderr)
} else {
return nil, fmt.Errorf("poweroff failed: %s", stderr)
}
cmd := fmt.Sprintf("machinectl poweroff %s", label)
if _, _, err := run(cmd); err != nil {
return nil, fmt.Errorf("poweroff failed: %v", err)
}

var mN Member
Expand Down