Fridrich Strba 2017-08-23 10:01:11 +00:00 committed by Git OBS Bridge
parent 85248ddb48
commit a27430f844
3 changed files with 44 additions and 0 deletions

View File

@ -0,0 +1,33 @@
--- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:40:26.690809603 +0200
+++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:44:28.314815334 +0200
@@ -74,20 +74,20 @@
} catch (UnixException x) {
x.rethrowAsIOException(parent);
}
- if (attrs.dev() != dev())
- break;
+ if (attrs.dev() != dev()) {
+
+ // step 3: lookup mounted file systems (use /proc/mounts to ensure we
+ // find the file system even when not in /etc/mtab)
+ byte[] dir = path.asByteArray();
+ for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
+ if (Arrays.equals(dir, entry.dir()))
+ return entry;
+ }
+ }
path = parent;
parent = parent.getParent();
}
- // step 3: lookup mounted file systems (use /proc/mounts to ensure we
- // find the file system even when not in /etc/mtab)
- byte[] dir = path.asByteArray();
- for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) {
- if (Arrays.equals(dir, entry.dir()))
- return entry;
- }
-
throw new IOException("Mount point not found");
}

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Aug 23 09:54:09 UTC 2017 - fstrba@suse.com
- Added patch:
* java-1_8_0-openjdk-linuxfilestore.patch
- Fix bsc#1032647, bsc#1052009 with btrfs subvolumes and
overlayfs
-------------------------------------------------------------------
Mon Jul 31 17:24:05 UTC 2017 - fstrba@suse.com

View File

@ -206,6 +206,7 @@ Patch1000: icedtea-3.0.1-sunec.patch
Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch
Patch2000: java-1_8_0-openjdk-gcc6.patch
Patch2001: disable-doclint-by-default.patch
Patch2002: java-1_8_0-openjdk-linuxfilestore.patch
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
BuildRequires: automake
@ -565,6 +566,8 @@ patch -p0 -i %{PATCH104}
patch -p0 -i %{PATCH2000}
patch -p0 -i %{PATCH2001}
patch -p0 -i %{PATCH2002}
(cd openjdk/common/autoconf
bash ./autogen.sh
)