rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Check the validity of the service name

Browse Source 
if user want to switch to `ubuntu-console` and type the wrong
service name `ubuntu-consile`, the command `sudo ros service enable
ubuntu-consile` run with no error. after the reboot, the console is
still the busybox console.

It is better to Warn user that the `ubuntu-consile` is no a valid
service name.

This patch also check the validity of the service name when disable and
delete service.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
This commit is contained in:
Wang Long
2016-04-08 19:00:24 +08:00
parent 099b8f6f4a
commit 5180c7e937
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/control/service.go
View File

@@ -95,7 +95,7 @@ func disable(c *cli.Context) {
for _, service := range c.Args() {
if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
continue
logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service)
}
cfg.Rancher.ServicesInclude[service] = false
@@ -118,7 +118,7 @@ func del(c *cli.Context) {
for _, service := range c.Args() {
if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
continue
logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service)
}
delete(cfg.Rancher.ServicesInclude, service)
changed = true
@@ -137,6 +137,11 @@ func enable(c *cli.Context) {
logrus.Fatal(err)
}
services, err := util.GetServices(cfg.Rancher.Repositories.ToArray())
if err != nil {
logrus.Fatalf("Failed to get services: %v", err)
}
var enabledServices []string
for _, service := range c.Args() {
@@ -145,6 +150,10 @@ func enable(c *cli.Context) {
logrus.Fatalf("ERROR: Service should be in path /var/lib/rancher/conf")
}
if !util.Contains(services, service) {
logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service)
}
cfg.Rancher.ServicesInclude[service] = true
enabledServices = append(enabledServices, service)
}