util-linux/util-linux-2.23.1-noenc-suse.diff

--- util-linux-2.23.1/libmount/src/context_loopdev.c
+++ util-linux-2.23.1/libmount/src/context_loopdev.c	2013-06-05 09:44:37.081939564 +0000
@@ -213,6 +213,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, mnt_debug_h(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;
 	}
Accepting request 177962 from Base:System - util-linux.spec: work around su(1) PAM problems based on su(1) being provided by both the coreutils and the util-linux package. Fix macro typo in %post and %verifyscript sections related to su(1): s/sysvinit_tools/enable_su/ (forwarded request 177950 from bernhard-voelker) OBS-URL: https://build.opensuse.org/request/show/177962 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=160 2013-06-07 10:12:05 +02:00			`--- util-linux-2.23.1/libmount/src/context_loopdev.c`
			`+++ util-linux-2.23.1/libmount/src/context_loopdev.c 2013-06-05 09:44:37.081939564 +0000`
			`@@ -213,6 +213,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, mnt_debug_h(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;`
			`}`