apply post-1.16.0 fixes, bump version to 1.16.11_16_1

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 7 insertions, 3 deletions

diff --git a/util-linux/script.c b/util-linux/script.c
index 37213eec8..d9a62fbfe 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -119,7 +119,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                                  * for example, try "script -c true" */
                                 break;
                         }
-                        if (pfd[0].revents & POLLIN) {
+                        if (pfd[0].revents) {
                                 errno = 0;
                                 count = safe_read(pty, buf, sizeof(buf));
                                 if (count <= 0 && errno != EAGAIN) {
@@ -143,7 +143,7 @@ int script_main(int argc UNUSED_PARAM, char **argv)
                                         }
                                 }
                         }
-                        if (pfd[1].revents & POLLIN) {
+                        if (pfd[1].revents) {
                                 count = safe_read(STDIN_FILENO, buf, sizeof(buf));
                                 if (count <= 0) {
                                         /* err/eof from stdin: don't read stdin anymore */
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 1b5488f9e..574354611 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -52,7 +52,11 @@ int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/)
                                 goto found;
                         }
 
-                        if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
+                        if (memcmp(buf, "SWAPSPACE2", 10) == 0
+                         || memcmp(buf, "S1SUSPEND", 9) == 0
+                         || memcmp(buf, "S2SUSPEND", 9) == 0
+                         || memcmp(buf, "ULSUSPEND", 9) == 0
+                        ) {
                                 sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
                                 if (sw == NULL)
                                         return -1;