From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 21 Jan 2009 13:42:30 +0000 (+0100)
Subject: Merge commit '5f03ed8a56d308af72db8a48ab66ed68667af2c6'
X-Git-Tag: 174~1190
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2c7b88c4a55426087955a12aad33c1935e639876;p=elogind.git

Merge commit '5f03ed8a56d308af72db8a48ab66ed68667af2c6'

Conflicts:
	udev/udevd.c
---

2c7b88c4a55426087955a12aad33c1935e639876
diff --cc udev/udevd.c
index 9a278ce1f,9a8d79180..13a10240d
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@@ -641,10 -633,13 +641,11 @@@ static void export_initial_seqnum(struc
  int main(int argc, char *argv[])
  {
  	struct udev *udev;
 -	int err;
  	int fd;
  	struct sigaction act;
 -	fd_set readfds;
  	const char *value;
  	int daemonize = 0;
+ 	int resolve_names = 1;
  	static const struct option options[] = {
  		{ "daemon", no_argument, NULL, 'd' },
  		{ "debug-trace", no_argument, NULL, 't' },
@@@ -736,7 -744,35 +749,7 @@@
  	}
  	udev_monitor_set_receive_buffer_size(kernel_monitor, 128*1024*1024);
  
- 	rules = udev_rules_new(udev, 1);
 -	err = pipe(signal_pipe);
 -	if (err < 0) {
 -		err(udev, "error getting pipes: %m\n");
 -		goto exit;
 -	}
 -
 -	err = fcntl(signal_pipe[READ_END], F_GETFL, 0);
 -	if (err < 0) {
 -		err(udev, "error fcntl on read pipe: %m\n");
 -		goto exit;
 -	}
 -	err = fcntl(signal_pipe[READ_END], F_SETFL, err | O_NONBLOCK);
 -	if (err < 0) {
 -		err(udev, "error fcntl on read pipe: %m\n");
 -		goto exit;
 -	}
 -
 -	err = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
 -	if (err < 0) {
 -		err(udev, "error fcntl on write pipe: %m\n");
 -		goto exit;
 -	}
 -	err = fcntl(signal_pipe[WRITE_END], F_SETFL, err | O_NONBLOCK);
 -	if (err < 0) {
 -		err(udev, "error fcntl on write pipe: %m\n");
 -		goto exit;
 -	}
 -
+ 	rules = udev_rules_new(udev, resolve_names);
  	if (rules == NULL) {
  		err(udev, "error reading rules\n");
  		goto exit;