Revert "udev: Introduce UDEV_PROPAGATE_LOG macro (#5302)"

This reverts commit c22569eeeafa94cf510267071f5b75c4ab714e09.

Let's revert this for now, since it apparently doesn't fix the problem
at hand.

diff --git a/Makefile.am b/Makefile.am
index c536df7788972d647f7acb89191ce985c1bdeb69..292f63c408a388f120c0231d8a4cc5f554ea5ab8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3914,8 +3914,7 @@ gperf_gperf_sources += \
 libudev_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(BLKID_CFLAGS) \
-       $(KMOD_CFLAGS) \
-       -D UDEV_PROPAGATE_LOG
+       $(KMOD_CFLAGS)
 
 libudev_core_la_LIBADD = \
        libsystemd-network.la \
@@ -4090,10 +4089,6 @@ EXTRA_DIST += \
 ata_id_SOURCES = \
        src/udev/ata_id/ata_id.c
 
-ata_id_CFLAGS = \
-       $(AM_CFLAGS)
-       -D UDEV_PROPAGATE_LOG
-
 ata_id_LDADD = \
        libshared.la
 
@@ -4104,10 +4099,6 @@ udevlibexec_PROGRAMS += \
 cdrom_id_SOURCES = \
        src/udev/cdrom_id/cdrom_id.c
 
-cdrom_id_CFLAGS = \
-       $(AM_CFLAGS)
-       -D UDEV_PROPAGATE_LOG
-
 cdrom_id_LDADD = \
        libshared.la
 
@@ -4121,10 +4112,6 @@ dist_udevrules_DATA += \
 collect_SOURCES = \
        src/udev/collect/collect.c
 
-collect_CFLAGS = \
-       $(AM_CFLAGS)
-       -D UDEV_PROPAGATE_LOG
-
 collect_LDADD = \
        libshared.la
 
@@ -4138,10 +4125,6 @@ scsi_id_SOURCES =\
        src/udev/scsi_id/scsi.h \
        src/udev/scsi_id/scsi_id.h
 
-scsi_id_CFLAGS = \
-       $(AM_CFLAGS)
-       -D UDEV_PROPAGATE_LOG
-
 scsi_id_LDADD = \
        libshared.la
 
@@ -4170,10 +4153,6 @@ mtd_probe_SOURCES =  \
        src/udev/mtd_probe/mtd_probe.h \
        src/udev/mtd_probe/probe_smartmedia.c
 
-mtd_probe_CFLAGS = \
-       $(AM_CFLAGS)
-       -D UDEV_PROPAGATE_LOG
-
 dist_udevrules_DATA += \
        rules/75-probe_mtd.rules
 

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 7c6aeef8dc0cf56cab504accd44900ab4f20f6c0..d8e13288b025ca533dd67fb168e729d40b778db7 100644 (file)
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -103,8 +103,6 @@ _public_ struct udev *udev_new(void) {
         }
         udev->refcount = 1;
 
-#ifdef UDEV_PROPAGATE_LOG
-
         f = fopen("/etc/udev/udev.conf", "re");
         if (f != NULL) {
                 char line[UTIL_LINE_SIZE];
@@ -180,7 +178,6 @@ _public_ struct udev *udev_new(void) {
                         }
                 }
         }
-#endif
 
         return udev;
 }