I am uploading util-linux_2.20.1-5.1_i386.changes to DELAYED/1 now.

Here's the patch.

Cheers,
-Hilko

diff --git a/debian/changelog b/debian/changelog
index f11355a..e4faa44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+util-linux (2.20.1-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * agetty: don't use log_err() for non-fatal errors
+  * agetty: Eliminate another log_err() call. Closes: #675569
+  * Fix watch file
+
+ -- Hilko Bengen <ben...@debian.org>  Fri, 22 Jun 2012 00:00:36 +0200
+
 util-linux (2.20.1-5) unstable; urgency=low
 
   [Petr Uzel]
diff --git a/debian/watch b/debian/watch
index 57a0ae1..453e07c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v([\.\d]+)/util-linux-([\.\d]+)\.tar\.bz2
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/v([\.\d]+)/util-linux-([\.\d]+)\.tar\.bz2
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index b068164..b0a1f45 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -919,7 +919,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
 
 		if (((tid = tcgetsid(fd)) < 0) || (pid != tid)) {
 			if (ioctl(fd, TIOCSCTTY, 1) == -1)
-				log_err("/dev/%s: cannot get controlling tty: %m", tty);
+				log_warn("/dev/%s: cannot get controlling tty: %m", tty);
 		}
 
 		if (op->flags & F_HANGUP) {
@@ -944,7 +944,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
 			log_err(_("/dev/%s: cannot open as standard input: %m"), tty);
 		if (((tid = tcgetsid(STDIN_FILENO)) < 0) || (pid != tid)) {
 			if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) == -1)
-				log_err("/dev/%s: cannot get controlling tty: %m", tty);
+				log_warn("/dev/%s: cannot get controlling tty: %m", tty);
 		}
 
 	} else {
@@ -960,7 +960,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
 	}
 
 	if (tcsetpgrp(STDIN_FILENO, pid))
-		log_err("/dev/%s: cannot set process group: %m", tty);
+		log_warn("/dev/%s: cannot set process group: %m", tty);
 
 	/* Get rid of the present outputs. */
 	close(STDOUT_FILENO);

Reply via email to