Docker-DCO-1.1-Signed-off-by: Charles Lindsay <chaz@chazomatic.us> (github: chazomaticus)
| ... | ... |
@@ -553,10 +553,11 @@ type KernelVersionInfo struct {
|
| 553 | 553 |
Kernel int |
| 554 | 554 |
Major int |
| 555 | 555 |
Minor int |
| 556 |
+ Flavor string |
|
| 556 | 557 |
} |
| 557 | 558 |
|
| 558 | 559 |
func (k *KernelVersionInfo) String() string {
|
| 559 |
- return fmt.Sprintf("%d.%d.%d", k.Kernel, k.Major, k.Minor)
|
|
| 560 |
+ return fmt.Sprintf("%d.%d.%d%s", k.Kernel, k.Major, k.Minor, k.Flavor)
|
|
| 560 | 561 |
} |
| 561 | 562 |
|
| 562 | 563 |
// Compare two KernelVersionInfo struct. |
| ... | ... |
@@ -610,13 +611,10 @@ func GetKernelVersion() (*KernelVersionInfo, error) {
|
| 610 | 610 |
func ParseRelease(release string) (*KernelVersionInfo, error) {
|
| 611 | 611 |
var ( |
| 612 | 612 |
kernel, major, minor, parsed int |
| 613 |
- err error |
|
| 613 |
+ flavor string |
|
| 614 | 614 |
) |
| 615 | 615 |
|
| 616 |
- parsed, err = fmt.Sscanf(release, "%d.%d.%d", &kernel, &major, &minor) |
|
| 617 |
- if err != nil {
|
|
| 618 |
- return nil, err |
|
| 619 |
- } |
|
| 616 |
+ parsed, _ = fmt.Sscanf(release, "%d.%d.%d%s", &kernel, &major, &minor, &flavor) |
|
| 620 | 617 |
if parsed < 3 {
|
| 621 | 618 |
return nil, errors.New("Can't parse kernel version " + release)
|
| 622 | 619 |
} |
| ... | ... |
@@ -625,6 +623,7 @@ func ParseRelease(release string) (*KernelVersionInfo, error) {
|
| 625 | 625 |
Kernel: kernel, |
| 626 | 626 |
Major: major, |
| 627 | 627 |
Minor: minor, |
| 628 |
+ Flavor: flavor, |
|
| 628 | 629 |
}, nil |
| 629 | 630 |
} |
| 630 | 631 |
|