From patchwork Fri Sep 28 23:01:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Marangi X-Patchwork-Id: 976490 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qlC8ZqQi"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AV8nD8xz"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42MRxn635Wz9s1x for ; Sat, 29 Sep 2018 09:01:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=c4L2epx7gtkSrBEzXUAe1MTrQg6CijM+X2KIiAcEKWU=; b=qlC8ZqQi/vRkPw TfG3E6OtDpWLUUiIKlBmqPmTbTiDsJOnpwnUYb0JttDH4hFEw27aj+HA2Uh/iX6vtKS7UwlO/aYka 9W3mPVKwUldbqrbXI8l2f/jVPyBC19Tjty7UwJlscezyZmaFeHj7vfOpUWt27OvIO+37k0NqWBZ8R WrT87MKNGs5Jr7XLSjPVgb2R8axoT9dkLHhFiB6L+HfYSdsoJjJskSWDff6vHtCavf+xnJW/OAtci 4P3/7C8GdggKTl3xW5bYD9WTzsFVUAUhDLgwR1ylWGpTb5x/pYXd/qnPfmqI5ZIPW4cmiS5+dRFOz EZNTtLsWVDM+s8mzPXQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g61lH-0007HW-Ty; Fri, 28 Sep 2018 23:01:27 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g61lE-0007Gg-Fe for openwrt-devel@lists.openwrt.org; Fri, 28 Sep 2018 23:01:25 +0000 Received: by mail-wr1-x444.google.com with SMTP id s14-v6so7924998wrw.6 for ; Fri, 28 Sep 2018 16:01:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vmnEN+IgFkl4D1x79h2vGH+6jssW7xheyfwAQjUIlj8=; b=AV8nD8xzxkEUve2zV8/q/5L+flf2aG/lA4H8Qr7G68LiDq7pQb5+WiyFUemcWJNtT8 hf86444IGLObWmQKceqxuugItioxkN8Eli4iHtMRlhGfM0y6gmyRj1XP9tDO1GThcT2H zDpTnIcHO1aIKJX2aDGbBC32m+YkCEWKqPMmRusyi4piBliXV7449QCbxbT282eXcpMl LBbBnUJZff1ZGJFL1pMBDgY4WdB463tPmn7z8BD0v0Mt3BWeHQdAZ2+a+6uT2Si8EaM+ uq/KqbdL/TWmFp9KlADPs6RASSDEwAP5bQD7wZa+2A8gYE1J28MhdGehBzmeetECjhUc pULw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vmnEN+IgFkl4D1x79h2vGH+6jssW7xheyfwAQjUIlj8=; b=X8/1DuQVRykrFz8GTwaT5noHtJClAKPqNlJbrtnfjv15YEEy579b7xDbk8brsyxdvV 7NUei+4gQgYTxT+xIX7nNygXtdLqp4R2haO+1II4PTZbXfzvYypRmbrrfv0HtPkjLKJf dfMKTNyukVTwkJ22wNfDVcjrn5NXjDuGSUSYCJVGUXPkovyLPjj2EWNriM5e0jOgnucN aUjSrOaVIBckh8W+06ow+w/gOck9NkolTSD6ygqidY4SbI/Rg9DnbhX9fmL4lY8yCnJN Q/xFOILVRzSdbbMMCtp+ZYvfgPA8hR1bOA7CTZXLMIy252yq0ys+kAA+7/hs2OMWgbMo cZrQ== X-Gm-Message-State: ABuFfojtHfKLf2dAtKTr6rvEZVwkoRudGiIy1PZ00oGpNdxYkWmMoxER cw8HUbV+YqEs41tdxldwX1TikRCZ X-Google-Smtp-Source: ACcGV61sh/y+rmgaVaxKP7jn8gxtofyIC+Z+0ctJi3aXy9x79u7UETgpiwV5ikPuveKmuJoQ+m+w+w== X-Received: by 2002:adf:d249:: with SMTP id o9-v6mr412570wri.66.1538175671821; Fri, 28 Sep 2018 16:01:11 -0700 (PDT) Received: from Ansuel-XPS.localdomain (93-44-105-95.ip96.fastwebnet.it. [93.44.105.95]) by smtp.gmail.com with ESMTPSA id u191-v6sm3868173wmd.31.2018.09.28.16.01.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Sep 2018 16:01:11 -0700 (PDT) From: Ansuel Smith To: openwrt-devel@lists.openwrt.org Date: Sat, 29 Sep 2018 01:01:02 +0200 Message-Id: <20180928230102.251-1-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180928_160124_550000_7EACD472 X-CRM114-Status: GOOD ( 10.32 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ansuelsmth[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH] fstools: add ntfs support X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ansuel Smith MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This adds ntfs support to block-mount Signed-off-by: Ansuel Smith Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
--- block.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index b377429..2e3841a 100644 --- a/block.c +++ b/block.c @@ -711,6 +711,7 @@ static void check_filesystem(struct probe_info *pr) const char *f2fsck = "/usr/sbin/fsck.f2fs"; const char *dosfsck = "/usr/sbin/dosfsck"; const char *btrfsck = "/usr/bin/btrfsck"; + const char *ntfsck = "/usr/bin/ntfsfix"; const char *ckfs; /* UBIFS does not need stuff like fsck */ @@ -725,6 +726,8 @@ static void check_filesystem(struct probe_info *pr) ckfs = e2fsck; } else if (!strncmp(pr->type, "btrfs", 5)) { ckfs = btrfsck; + } else if (!strncmp(pr->type, "ntfs", 4)) { + ckfs = ntfsck; } else { ULOG_ERR("check_filesystem: %s is not supported\n", pr->type); return; @@ -743,6 +746,9 @@ static void check_filesystem(struct probe_info *pr) } else if(!strncmp(pr->type, "btrfs", 5)) { execl(ckfs, ckfs, "--repair", pr->dev, NULL); exit(-1); + } else if(!strncmp(pr->type, "ntfs", 4)) { + execl(ckfs, ckfs, "-b", pr->dev, NULL); + exit(-1); } else { execl(ckfs, ckfs, "-p", pr->dev, NULL); exit(-1); @@ -1437,8 +1443,9 @@ static int mount_extroot(char *cfg) if (strncmp(pr->type, "ext", 3) && strncmp(pr->type, "f2fs", 4) && strncmp(pr->type, "btrfs", 5) && + strncmp(pr->type, "ntfs", 4) && strncmp(pr->type, "ubifs", 5)) { - ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs, btrfs or ubifs\n", pr->type); + ULOG_ERR("extroot: unsupported filesystem %s, try ext4, f2fs, btrfs, ntfs or ubifs\n", pr->type); return -1; }