diff options
| author | Richard Yao <ryao@gentoo.org> | 2013-01-07 08:50:34 -0500 |
|---|---|---|
| committer | Richard Yao <ryao@cs.stonybrook.edu> | 2013-01-14 12:19:33 -0500 |
| commit | f6b4945845bfefba07d4deac984a53138d3ff38b (patch) | |
| tree | cbc7bcf9846822683b549dc6abfd5b47d8b6c18a | |
| parent | 09f41d6de47b6e4a4aea9c0d9c73a3e07c5502b3 (diff) | |
Make binaries report udev version compatibility version instead of eudev version
Software such as dracut performs a sanity check on udev by querying the
udev tools for the version. Reporting the eudev version causes this
check to fail, so we resort to reporting the udev compatibility
versionj.
Signed-off-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
| -rw-r--r-- | src/udev/Makefile.am | 1 | ||||
| -rw-r--r-- | src/udev/udevadm-info.c | 2 | ||||
| -rw-r--r-- | src/udev/udevadm.c | 2 | ||||
| -rw-r--r-- | src/udev/udevd.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am index ea3b15f5b1..d43d4600e0 100644 --- a/src/udev/Makefile.am +++ b/src/udev/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -DUDEV_CONF_DIR=\"$(udevconfdir)\" \ -DUDEV_RULES_DIR=\"$(udevrulesdir)\" \ -DUDEV_LIBEXEC_DIR=\"$(udevlibexecdir)\" \ + -DUDEV_VERSION=\"$(UDEV_VERSION)\" \ -I $(top_srcdir)/src/libudev sbin_PROGRAMS = \ diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index 95f077ca95..5fbc77803b 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -432,7 +432,7 @@ static int uinfo(struct udev *udev, int argc, char *argv[]) export_prefix = optarg; break; case 'V': - printf("%s\n", VERSION); + printf("%s\n", UDEV_VERSION); goto exit; case 'h': printf("%s\n", usage); diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index b91d3ccb16..82852fb086 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -34,7 +34,7 @@ void udev_main_log(struct udev *udev, int priority, static int adm_version(struct udev *udev, int argc, char *argv[]) { - printf("%s\n", VERSION); + printf("%s\n", UDEV_VERSION); return 0; } diff --git a/src/udev/udevd.c b/src/udev/udevd.c index ba7b0e211b..77b0f66ef5 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1141,7 +1141,7 @@ int main(int argc, char *argv[]) "\n"); goto exit; case 'V': - printf("%s\n", VERSION); + printf("%s\n", UDEV_VERSION); goto exit; default: goto exit; |