From 0719523b9aa281b49eb5c68ca526af258a8f4236eb2bc44088f6913a9b0fe3d3 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 27 Aug 2007 15:55:17 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=27

---
 util-linux-2.13-mount_create_mtab.patch       | 13 +++++
 ...linux-2.13-schedutils_error_handling.patch | 55 +++++++++++++++++++
 util-linux.changes                            |  7 +++
 util-linux.spec                               | 10 +++-
 4 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 util-linux-2.13-mount_create_mtab.patch
 create mode 100644 util-linux-2.13-schedutils_error_handling.patch

diff --git a/util-linux-2.13-mount_create_mtab.patch b/util-linux-2.13-mount_create_mtab.patch
new file mode 100644
index 0000000..4d26d69
--- /dev/null
+++ b/util-linux-2.13-mount_create_mtab.patch
@@ -0,0 +1,13 @@
+Index: util-linux-ng-2.13rc2+git20070725/mount/mount.c
+===================================================================
+--- util-linux-ng-2.13rc2+git20070725.orig/mount/mount.c
++++ util-linux-ng-2.13rc2+git20070725/mount/mount.c
+@@ -546,7 +546,7 @@ create_mtab (void) {
+ 		char *extra_opts;
+ 		parse_opts (fstab->m.mnt_opts, &flags, &extra_opts);
+ 		mnt.mnt_dir = "/";
+-		mnt.mnt_fsname = canonicalize (fstab->m.mnt_fsname);
++		mnt.mnt_fsname = fsprobe_get_devname(fstab->m.mnt_fsname);
+ 		mnt.mnt_type = fstab->m.mnt_type;
+ 		mnt.mnt_opts = fix_opts_string (flags, extra_opts, NULL);
+ 		mnt.mnt_freq = mnt.mnt_passno = 0;
diff --git a/util-linux-2.13-schedutils_error_handling.patch b/util-linux-2.13-schedutils_error_handling.patch
new file mode 100644
index 0000000..2bd26b2
--- /dev/null
+++ b/util-linux-2.13-schedutils_error_handling.patch
@@ -0,0 +1,55 @@
+Original patch from Bernhard Voelker.
+
+Index: util-linux-ng-2.13rc2+git20070725/schedutils/ionice.c
+===================================================================
+--- util-linux-ng-2.13rc2+git20070725.orig/schedutils/ionice.c
++++ util-linux-ng-2.13rc2+git20070725/schedutils/ionice.c
+@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
+ 		case 'h':
+ 		default:
+ 			usage();
+-			exit(0);
++			exit(EXIT_SUCCESS);
+ 		}
+ 	}
+ 
+@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
+ 			break;
+ 		default:
+ 			printf("bad prio class %d\n", ioprio_class);
+-			return 1;
++			exit(EXIT_FAILURE);
+ 	}
+ 
+ 	if (!set) {
+@@ -134,9 +134,10 @@ int main(int argc, char *argv[])
+ 
+ 		ioprio = ioprio_get(IOPRIO_WHO_PROCESS, pid);
+ 
+-		if (ioprio == -1)
++		if (ioprio == -1) {
+ 			perror("ioprio_get");
+-		else {
++			exit(EXIT_FAILURE);
++		} else {
+ 			ioprio_class = ioprio >> IOPRIO_CLASS_SHIFT;
+ 			if (ioprio_class != IOPRIO_CLASS_IDLE) {
+ 				ioprio = ioprio & 0xff;
+@@ -147,11 +148,15 @@ int main(int argc, char *argv[])
+ 	} else {
+ 		if (ioprio_set(IOPRIO_WHO_PROCESS, pid, ioprio | ioprio_class << IOPRIO_CLASS_SHIFT) == -1) {
+ 			perror("ioprio_set");
+-			return 1;
++			exit(EXIT_FAILURE);
+ 		}
+ 
+-		if (argv[optind])
++		if (argv[optind]) {
+ 			execvp(argv[optind], &argv[optind]);
++			/* execvp should never return */
++			perror("execvp");
++			exit(EXIT_FAILURE);
++		}
+ 	}
+ 
+ 	return 0;
diff --git a/util-linux.changes b/util-linux.changes
index bf017e4..6e9c3cf 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 24 14:09:19 CEST 2007 - mkoenig@suse.de
+
+- avoid duplicates of root fs if defined with LABEL in fstab
+  [#297959] 
+- fix ionice error handling [#301675]
+
 -------------------------------------------------------------------
 Thu Aug 16 18:34:30 CEST 2007 - ssommer@suse.de
 
diff --git a/util-linux.spec b/util-linux.spec
index 8c59804..9c30509 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -21,7 +21,7 @@ License:        BSD 3-Clause, GPL v2 or later
 Group:          System/Base
 Autoreqprov:    on
 Version:        2.12r+2.13rc2+git20070725
-Release:        8
+Release:        12
 %define upver 2.13rc2+git20070725
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%upver.tar.bz2
@@ -69,6 +69,8 @@ Patch38:        util-linux-2.12r-mount_swapon_swsuspend_resume.patch
 Patch45:        util-linux-2.13-sys_utils_build_rdev_x86_64.patch
 # 297172 - mount does not free loop devices if it fails
 Patch46:        util-linux-2.13-loop.patch 
+Patch47:        util-linux-2.13-mount_create_mtab.patch
+Patch48:        util-linux-2.13-schedutils_error_handling.patch
 ##
 ## adjtimex
 ##
@@ -113,6 +115,8 @@ Authors:
 #%patch38 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
+%patch48 -p1
 #
 cd adjtimex-*
 %patch50 -p1
@@ -553,6 +557,10 @@ fi
 #%endif
 
 %changelog
+* Fri Aug 24 2007 - mkoenig@suse.de
+- avoid duplicates of root fs if defined with LABEL in fstab
+  [#297959]
+- fix ionice error handling [#301675]
 * Thu Aug 16 2007 - ssommer@suse.de
 - free loop devices when mount fails [#297172]
 * Wed Jul 25 2007 - mkoenig@suse.de