shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

Merge pull request #5434 from poettering/udev-log-revert

Browse Source 
Udev log revert
This commit is contained in:
Evgeny Vereshchagin 2017-02-23 15:06:03 +03:00 committed by GitHub
commit c07afaa5e5
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile.am
View File

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

3
src/libudev/libudev.c
View File

@ -103,8 +103,6 @@ _public_ struct udev *udev_new(void) {
} }
udev->refcount = 1; udev->refcount = 1;
#ifdef UDEV_PROPAGATE_LOG
f = fopen("/etc/udev/udev.conf", "re"); f = fopen("/etc/udev/udev.conf", "re");
if (f != NULL) { if (f != NULL) {
char line[UTIL_LINE_SIZE]; char line[UTIL_LINE_SIZE];
@ -180,7 +178,6 @@ _public_ struct udev *udev_new(void) {
} }
} }
} }
#endif
return udev; return udev;
} }