From: Dan Streetman <ddstreet@canonical.com>
Date: Sun, 17 Jan 2021 22:46:12 +0000 (-0500)
Subject: udev: use DEFINE_MAIN_FUNCTION in cdrom_id
X-Git-Tag: v248-rc1~290
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23afa884d4f3bcd97160a893816f9ba170f62ad4;p=thirdparty%2Fsystemd.git

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
---

diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index a97ed8eabdd..f6f45f4e2a8 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);