diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2017-02-23 15:06:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-23 15:06:03 +0300 |
| commit | c07afaa5e51d079691c74230377ce6fcc97228e5 (patch) | |
| tree | 8b8889fff715bcdb1455060fe5acc78dbccfe713 | |
| parent | b4e7bdcb535e52632d63be819b7d1cf908223f1e (diff) | |
| parent | b90ef60fbc8e110cbcc47d335032e9ef2ff6d44e (diff) | |
Merge pull request #5434 from poettering/udev-log-revert
Udev log revert
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | src/libudev/libudev.c | 3 |
2 files changed, 1 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index c89fa93beb..292f63c408 100644 --- 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 7c6aeef8dc..d8e13288b0 100644 --- 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; } |