forked from pool/util-linux
Accepting request 229044 from Base:System
- remove unnecessarily added patches from SLE11:
* util-linux-update-default-commit-interval.patch, openSUSE has
never changed the default and neither will SLE12
* sfdisk-warn-about-2TB-limit.patch, fixed by upstream years ago
* umount-avoid-readlink.patch, this patch only affects unused
code and the used code does not have this bug
- edit util-linux-lscpu-improve-hypervisor-detection.patch to not
change the default behaviour of "lscpu -p" as documented in it's
man page. Now this patch only affects the summary output.
Also see discussion here
http://lists.opensuse.org/opensuse-factory/2014-03/msg00256.html (forwarded request 228719 from rudi_m)
OBS-URL: https://build.opensuse.org/request/show/229044
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=183
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
86222fff02
@ -1,31 +0,0 @@
|
||||
Index: util-linux-2.19.1/fdisk/sfdisk.c
|
||||
===================================================================
|
||||
--- util-linux-2.24.1.orig/fdisks/sfdisk.c
|
||||
+++ util-linux-2.24.1/fdisks/sfdisk.c
|
||||
@@ -1271,6 +1271,26 @@ partitions_ok(int fd, struct disk_desc *
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
+ /* Are the data partitions and the extended partition
|
||||
+ within the DOS 2TB limit? */
|
||||
+ for (p = partitions; p < partitions+partno; p++) {
|
||||
+ if (p->size && !is_extended(p->p.sys_type)) {
|
||||
+ if( p->size >= (unsigned long) 0xffffffff ) {
|
||||
+ warn(_("Warning: partition %s of size %lu exceeds "
|
||||
+ "msdos 2TB limit.\n"),
|
||||
+ PNO(p), p->size);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ for (q = partitions; q < partitions+partno; q++)
|
||||
+ if (is_extended(q->p.sys_type))
|
||||
+ if ( q->size >= (unsigned long) 0xffffffff ) {
|
||||
+ warn(_("Warning: partition %s of size %lu exceeds "
|
||||
+ "msdos 2TB limit.\n"),
|
||||
+ PNO(q), q->size);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
|
||||
/*
|
||||
* Do all partitions start at a cylinder boundary ?
|
||||
@ -1,46 +0,0 @@
|
||||
Subject: umount: avoid calling readlink on mountpoints.
|
||||
References: bnc#794529
|
||||
|
||||
We normally want to canonicalize a path given to umount
|
||||
in case it contains symlinks. This ensure the right entry
|
||||
is removed from /etc/mtab.
|
||||
However if the mountpoint is for a non-responsive NFS server,
|
||||
that readlink could hang (*will* have if mounted with -o noac).
|
||||
|
||||
In the normal case where no symlinks are used we don't need the
|
||||
readlink() and we can easily detect this by checking if the
|
||||
mount table contains the given name.
|
||||
If it does, use the name as-is.
|
||||
If it doesn't, then call canonicalize()
|
||||
|
||||
---
|
||||
mount/umount.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
Index: util-linux-2.19.1/mount/umount.c
|
||||
===================================================================
|
||||
--- util-linux-2.19.1.orig/mount-deprecated/umount.c
|
||||
+++ util-linux-2.19.1/mount-deprecated/umount.c
|
||||
@@ -588,12 +588,22 @@ umount_file (char *arg) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
+ /* If the name given is listed in the mount table, don't
|
||||
+ * bother with canonicalize() - it can block an a non-responsive
|
||||
+ * NFS server.
|
||||
+ */
|
||||
+ file = arg;
|
||||
+ mc = getmntdirbackward(arg, NULL);
|
||||
+ if (!mc && !nocanonicalize)
|
||||
file = canonicalize(arg); /* mtab paths are canonicalized */
|
||||
+ else
|
||||
+ file = strdup(arg);
|
||||
|
||||
try_loopdev:
|
||||
if (verbose > 1)
|
||||
printf(_("Trying to unmount %s\n"), file);
|
||||
|
||||
+ if (!mc)
|
||||
mc = getmntdirbackward(file, NULL);
|
||||
if (!mc) {
|
||||
mc = getmntdevbackward(file, NULL);
|
||||
@ -1,7 +1,3 @@
|
||||
---
|
||||
sys-utils/lscpu.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
|
||||
1 file changed, 152 insertions(+), 4 deletions(-)
|
||||
|
||||
Index: util-linux-2.24.1/sys-utils/lscpu.c
|
||||
===================================================================
|
||||
--- util-linux-2.24.1.orig/sys-utils/lscpu.c
|
||||
@ -192,25 +188,6 @@ Index: util-linux-2.24.1/sys-utils/lscpu.c
|
||||
|
||||
/* IBM PR/SM */
|
||||
} else if (path_exist(_PATH_PROC_SYSINFO)) {
|
||||
@@ -1181,6 +1322,7 @@ print_parsable(struct lscpu_desc *desc,
|
||||
}
|
||||
fputs(data && *data ? data : "", stdout);
|
||||
}
|
||||
+ printf(",HvVendor,VirtType");
|
||||
putchar('\n');
|
||||
|
||||
/*
|
||||
@@ -1210,7 +1352,9 @@ print_parsable(struct lscpu_desc *desc,
|
||||
buf, sizeof(buf));
|
||||
fputs(data && *data ? data : "", stdout);
|
||||
}
|
||||
- putchar('\n');
|
||||
+ printf(",%s,%s\n",
|
||||
+ hv_vendors[desc->hyper] ? hv_vendors[desc->hyper] : "none",
|
||||
+ virt_types[desc->virtype]);
|
||||
}
|
||||
}
|
||||
|
||||
Index: util-linux-2.24.1/sys-utils/lscpu.h
|
||||
===================================================================
|
||||
--- util-linux-2.24.1.orig/sys-utils/lscpu.h
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
---
|
||||
mount/mount.8 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: util-linux-2.19.1/mount/mount.8
|
||||
===================================================================
|
||||
--- util-linux-2.19.1.orig/sys-utils/mount.8
|
||||
+++ util-linux-2.19.1/sys-utils/mount.8
|
||||
@@ -1384,7 +1384,7 @@ disabling barriers may safely improve pe
|
||||
.BI commit= nrsec
|
||||
Sync all data and metadata every
|
||||
.I nrsec
|
||||
-seconds. The default value is 5 seconds. Zero means default.
|
||||
+seconds. The default value is 15 seconds. Zero means default.
|
||||
.TP
|
||||
.BR user_xattr
|
||||
Enable Extended User Attributes. See the
|
||||
Index: util-linux-2.19.1/mount/mount.8
|
||||
===================================================================
|
||||
--- util-linux-2.19.1.orig/mount-deprecated/mount.8
|
||||
+++ util-linux-2.19.1/mount-deprecated/mount.8
|
||||
@@ -1384,7 +1384,7 @@ disabling barriers may safely improve pe
|
||||
.BI commit= nrsec
|
||||
Sync all data and metadata every
|
||||
.I nrsec
|
||||
-seconds. The default value is 5 seconds. Zero means default.
|
||||
+seconds. The default value is 15 seconds. Zero means default.
|
||||
.TP
|
||||
.BR user_xattr
|
||||
Enable Extended User Attributes. See the
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 1 18:49:26 UTC 2014 - sweet_f_a@gmx.de
|
||||
|
||||
- remove unnecessarily added patches from SLE11:
|
||||
* util-linux-update-default-commit-interval.patch, openSUSE has
|
||||
never changed the default and neither will SLE12
|
||||
* sfdisk-warn-about-2TB-limit.patch, fixed by upstream years ago
|
||||
* umount-avoid-readlink.patch, this patch only affects unused
|
||||
code and the used code does not have this bug
|
||||
- edit util-linux-lscpu-improve-hypervisor-detection.patch to not
|
||||
change the default behaviour of "lscpu -p" as documented in it's
|
||||
man page. Now this patch only affects the summary output.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 17 22:36:58 CET 2014 - sbrabec@suse.cz
|
||||
|
||||
|
||||
@ -120,16 +120,10 @@ Patch19: util-linux-setarch-uname26.patch
|
||||
Patch20: util-linux-HACK-boot.localfs.diff
|
||||
# PATCH-FEATURE-SLES util-linux-ng-2.16-squashfs3-detect.patch bnc666893 mszeredi@suse.cz -- Detect squashfs version <= 3 as squashfs3 and version >= 4 as squashfs.
|
||||
Patch21: util-linux-ng-2.16-squashfs3-detect.patch
|
||||
# PATCH-FEATURE-SLES fdisk-warn-about-2TB-limit.patch bnc495657 puzel@novell.com -- Warn about 2TB limit.
|
||||
Patch22: sfdisk-warn-about-2TB-limit.patch
|
||||
# PATCH-FEATURE-SLES util-linux-ng-2.19.1-barrier_documentation.patch bnc489740 jack@suse.cz -- Document barrier option in mount.8.
|
||||
Patch23: util-linux-ng-2.19.1-barrier_documentation.patch
|
||||
# PATCH-FEATURE-SLES util-linux-lscpu-improve-hypervisor-detection.patch fate310255 puzel@novell.com -- Improve hypervisor detection.
|
||||
Patch24: util-linux-lscpu-improve-hypervisor-detection.patch
|
||||
# PATCH-FIX-SLES umount-avoid-readlink.patch bnc794529 puzel@suse.com -- umount: avoid calling readlink on mountpoints if not necessary.
|
||||
Patch25: umount-avoid-readlink.patch
|
||||
# PATCH-FIX-SLES util-linux-update-default-commit-interval.patch bnc#809480 puzel@suse.com -- Update default commit interval.
|
||||
Patch26: util-linux-update-default-commit-interval.patch
|
||||
##
|
||||
## klogconsole
|
||||
##
|
||||
@ -260,11 +254,8 @@ xzcat %{S:0} | %gpg_verify %{S:12} -
|
||||
%patch20 -p1
|
||||
#
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
%patch25 -p1
|
||||
%patch26 -p1
|
||||
#
|
||||
# setctsid
|
||||
cp -p %{S:22} %{S:23} .
|
||||
|
||||
Loading…
Reference in New Issue
Block a user