Merge pull request #2199 from xiang90/coreos

mian: detects coreos
This commit is contained in:
Xiang Li 2015-01-30 12:10:23 -08:00
commit 894f1aadce
2 changed files with 30 additions and 0 deletions

View File

@ -30,6 +30,7 @@ import (
"github.com/coreos/etcd/etcdmain"
"github.com/coreos/etcd/migrate/starter"
"github.com/coreos/etcd/pkg/coreos"
)
func main() {
@ -41,6 +42,8 @@ func main() {
if v {
starter.StartDesiredVersion(os.Args[1:])
}
} else if coreos.IsCoreOS() {
starter.StartDesiredVersion(os.Args[1:])
}
etcdmain.Main()
}

27
pkg/coreos/coreos.go Normal file
View File

@ -0,0 +1,27 @@
// Copyright 2015 CoreOS, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package coreos
import (
"io/ioutil"
"strings"
)
func IsCoreOS() bool {
b, err := ioutil.ReadFile("/usr/lib/os-release")
if err != nil {
return false
}
return strings.Contains(string(b), "ID=coreos")
}