diff options
author | Dan Streetman <ddstreet@canonical.com> | 2021-01-17 17:46:12 -0500 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2021-01-20 08:31:47 +0000 |
commit | 23afa884d4f3bcd97160a893816f9ba170f62ad4 (patch) | |
tree | 6cf615d515c40169ea5934ef0948ca4ae3bbf70b | |
parent | 741bfd7f4e60fdc07ecaadbd93f1196dbee657ca (diff) | |
download | systemd-23afa884d4f3bcd97160a893816f9ba170f62ad4.tar.gz |
udev: use DEFINE_MAIN_FUNCTION in cdrom_id
This was failing s390x ubuntu ci due to an old version of binutils;
the binutils package in use for ubuntu ci tests has been updated and
the build no longer fails, so this can use the macro again.
Fixes: #18165
-rw-r--r-- | src/udev/cdrom_id/cdrom_id.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index a97ed8eabd..f6f45f4e2a 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -11,6 +11,7 @@ #include <unistd.h> #include "fd-util.h" +#include "main-func.h" #include "memory-util.h" #include "random-util.h" #include "sort-util.h" @@ -1005,17 +1006,4 @@ work: return 0; } -int main(int argc, char *argv[]) { - int r; - - log_set_target(LOG_TARGET_AUTO); - udev_parse_config(); - log_parse_environment(); - log_open(); - - r = run(argc, argv); - - log_close(); - - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -} +DEFINE_MAIN_FUNCTION(run); |