Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.7 Relocate Systemd Files #11147

Merged
merged 2 commits into from
Jan 24, 2020
+117 −110
Merged

2.7 Relocate Systemd Files #11147

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25a0b4d
Removes unused series argument from newSeries function.
manadart Jan 22, 2020
8009b40
Changes the location of systemd unit files and start-up scripts.
manadart Jan 23, 2020
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
Next Next commit
Removes unused series argument from newSeries function.
  • Loading branch information
@manadart
manadart committed Jan 22, 2020
commit 25a0b4d903d767d4846e25000eab8ba34211381a
5 changes: 2 additions & 3 deletions service/discovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ import (
// DiscoverService returns an interface to a service appropriate
// for the current system
func DiscoverService(name string, conf common.Conf) (Service, error) {
hostSeries := series.MustHostSeries()
initName, err := discoverInitSystem(hostSeries)
initName, err := discoverInitSystem(series.MustHostSeries())
if err != nil {
return nil, errors.Trace(err)
}

service, err := newService(name, conf, initName, hostSeries)
service, err := newService(name, conf, initName)
if err != nil {
return nil, errors.Trace(err)
}
Expand Down
4 changes: 2 additions & 2 deletions service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ var NewService = func(name string, conf common.Conf, series string) (Service, er
if err != nil {
return nil, errors.Trace(err)
}
return newService(name, conf, initSystem, series)
return newService(name, conf, initSystem)
}

// this needs to be stubbed out in some tests
func newService(name string, conf common.Conf, initSystem, series string) (Service, error) {
func newService(name string, conf common.Conf, initSystem string) (Service, error) {
var svc Service
var err error

Expand Down