From nobody Thu Feb 17 12:54:30 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7197B19CA988; Thu, 17 Feb 2022 12:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jzvsz2JQ9z3Ffv; Thu, 17 Feb 2022 12:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NGR41YYHB2JzPX8IhQfNsq6vrTHRJPUwP10ilDr5QE=; b=iemaCh6D8s+BlWExOCQ7PltU7TGAxS542Vz0WwtVvQAZA9y4qByfgLD6cTOJ33py1F8xWB irwU09T4ZU37z1eoXc/w9YuKlcmeP0ptCiHajHFFYhjFhc0Ca0wt7rQRGaOUvqwRV++sYD SpveVxy5VTjZOQsNo5ANonzXaUVI60CbYge/sH0RcxEcfMLNcZ1RN7htKnc0IWcyiUED/X 9CNXujNtLoYdIUF7uoh1fmCZHDmSlsd/UX0G7PaI0iyYsiCsG1yGM9SU1JgSSVKUWRkDTo 6kiml5ZwHAYo9YMRS1IHZOVfq7fVmwbFlNChwnkAsNyKOJFO65Zq4mb18vGgSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19DD620BC; Thu, 17 Feb 2022 12:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21HCsUOp080277; Thu, 17 Feb 2022 12:54:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HCsURn080276; Thu, 17 Feb 2022 12:54:30 GMT (envelope-from git) Date: Thu, 17 Feb 2022 12:54:30 GMT Message-Id: <202202171254.21HCsURn080276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 6bddc3116668 - stable/13 - linux: improve FUSE support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6bddc3116668b0856407fc99e4452753863e9062 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NGR41YYHB2JzPX8IhQfNsq6vrTHRJPUwP10ilDr5QE=; b=OnKw0jyB3RjUFJ8NKrlRz2DQzZoDRa3XrDzGGFLH3Z2bqL4uhIu7HB1ZJPRyotVaikKHav 5pPrBbf4I4y3GUjFaIWs9Z0gSXhd2i4DGUGd2Goaf9SiLry5GC6RCNjTzxnXcMYqsbksWe wRjXsyetSD2QO76gZKQ0eac5kNHxBL3Xzr0IuT9BQmr+sAc5o6QS5Q7X7CW4FHK4DdUCsz /LIkqVrlo+LLuKrAWZTMlz5p5xkinzbcnJKu+V4dNss+yFWcMxAlL4hJpdoNedylXF009N 2eXxZsfhxL0Gv+rz/aFRWsNj6W70xlHbfNgo00qhzYwNizTlHD2fETDxS21aCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645102471; a=rsa-sha256; cv=none; b=Fmly1vLDZzQSjVdpHIZd7qmgyceQgh+PgqWVh3k82bUMBC4uhEYeSwOECA77QHG05Y4vai HDcsNxAQZmuXwqHvWkkmbkrK+Q+P4RqOBxaLqfwlAaH3LXC4eAgUCeLzYkm842i5TLS5Og 3GXM+xiGY2XB0GALB0byVoEMTziqHDNB47f5iJq5hmz8tuBnRVkirG3L+Yb6cmDer+wYP5 fsBxnDgpSOrMDB/X8yw7PwkN8TM/RtQ9DobKDVQoXN5OmTndptFcCwTt6NixfeBphWYidb PYCrXnirmKauUNnDGXR+oTUrfccBe8LQeQYA/rWPdTDBjX05HOgEWk/UhqN8+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=6bddc3116668b0856407fc99e4452753863e9062 commit 6bddc3116668b0856407fc99e4452753863e9062 Author: Edward Tomasz Napierala AuthorDate: 2021-06-07 09:43:23 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-13 22:23:41 +0000 linux: improve FUSE support This fixes a number of AppImages; tested with scribus-1.5.6.1-linux-x86_64.AppImage. Reported By: @probonopd Reviewed By: asomers, emaste Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30606 (cherry picked from commit 128a1db806daac088a79314cee060b8a204e8481) --- sys/compat/linux/linux_file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 6b02c2efb88e..e6b142b179f6 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1316,12 +1316,11 @@ linux_mount(struct thread *td, struct linux_mount_args *args) strcpy(fstypename, "linprocfs"); } else if (strcmp(fstypename, "vfat") == 0) { strcpy(fstypename, "msdosfs"); - } else if (strcmp(fstypename, "fuse") == 0) { + } else if (strcmp(fstypename, "fuse") == 0 || + strncmp(fstypename, "fuse.", 5) == 0) { char *fuse_options, *fuse_option, *fuse_name; - if (strcmp(mntfromname, "fuse") == 0) - strcpy(mntfromname, "/dev/fuse"); - + strcpy(mntfromname, "/dev/fuse"); strcpy(fstypename, "fusefs"); data = malloc(MNAMELEN, M_TEMP, M_WAITOK); error = copyinstr(args->data, data, MNAMELEN - 1, NULL);