diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-06-05 18:15:31 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-06-07 08:19:51 +0200 |
| commit | bb4fbe2130cd85727bbaf6c71b2d27b6769aa4aa (patch) | |
| tree | 94290322ade6299d2295a39c3dc778981800101a /libparted/arch | |
| parent | 08c0b3b62a7d48f87d99c3dd523f288c6350e0d8 (diff) | |
| download | parted-bb4fbe2130cd85727bbaf6c71b2d27b6769aa4aa.tar.gz | |
libparted: accommodate two-component linux version number like 3.0
* libparted/arch/linux.c (_get_linux_version): Also accept 2-component
version numbers.
* NEWS: (Bug fixes): Mention it.
Reported by Richard W.M. Jones.
Diffstat (limited to 'libparted/arch')
| -rw-r--r-- | libparted/arch/linux.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c index aeaf98f..111816c 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c @@ -610,7 +610,11 @@ _get_linux_version () if (uname (&uts)) return kver = 0; - if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) + if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) == 3) + ; /* ok */ + else if (sscanf (uts.release, "%u.%u", &major, &minor) == 2) + teeny = 0; + else return kver = 0; return kver = KERNEL_VERSION (major, minor, teeny); |