forked from pool/util-linux
6c689062ac
- Update to version 2.25 (using work of Ruediger Meier <sweet_f_a@gmx.de>): * based on the git master branch of util-linux * many fixes (including bnc#869355, bnc#871951 and bnc#871698#c49) * new Python binding sub-package for libmount: python-libmount * new library: libsmartcols * new commands: lslogins, setpriv * add fstrim systemd timer * better systemd integration * DROPPED command: * cytune: Upstream decided to remove tool untested for years that supports this old hardware. - Dropped patches included in the upstream: (*git) Included with no changes (+git) Included with improvements (!git) Included with differences * support-other-tty-lines-not-vconsole.patch (*b9c7390) * agetty-fooled-on-serial-line-due-plymouth.patch, * sulogin-fooled-on-tty-line-due-plymouth.patch (*bb280f7) * agetty-on-s390-on-dev-3270-tty1-line.patch (*f2bcda5) * sulogin-does-not-find-any-console.patch (*624b204) * util-linux-setarch-uname26.patch (*f6eb160) * util-linux-ng-2.16-squashfs3-detect.patch (*11402f5) * util-linux-lscpu-improve-hypervisor-detection.patch (!b774473, b32488c, 5bd31c6, 0f0c558, 96ce475) WARNING, INCOMPATIBLE CHANGE: "lscpu -p" no more reports hypervisor, as it breaks standard behavior. Use standard output instead! (FATE#310255) * blkid-stop-scanning-on-I-O-error.patch (+296d96e) OBS-URL: https://build.opensuse.org/request/show/245630 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=189
15 lines
710 B
Diff
15 lines
710 B
Diff
Index: util-linux/libmount/src/context_loopdev.c
|
|
===================================================================
|
|
--- util-linux.orig/libmount/src/context_loopdev.c
|
|
+++ util-linux/libmount/src/context_loopdev.c
|
|
@@ -212,6 +212,9 @@ int mnt_context_setup_loopdev(struct lib
|
|
if (rc == 0 && (cxt->user_mountflags & MNT_MS_ENCRYPTION) &&
|
|
mnt_optstr_get_option(optstr, "encryption", &val, &len) == 0) {
|
|
DBG(CXT, ul_debugobj(cxt, "encryption no longer supported"));
|
|
+ // XXX: nasty for the lib but there's on better way to give a hint atm
|
|
+ fprintf(stderr, "mount: encryption no longer supported.\n"
|
|
+ " Please use /etc/crypttab instead (man 5 crypttab)\n");
|
|
rc = -MNT_ERR_MOUNTOPT;
|
|
}
|
|
|