From patchwork Sun Feb 22 15:27:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 5862081 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3B1909F37F for ; Sun, 22 Feb 2015 15:27:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F9BB20384 for ; Sun, 22 Feb 2015 15:27:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F59D20120 for ; Sun, 22 Feb 2015 15:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751992AbbBVP1Y (ORCPT ); Sun, 22 Feb 2015 10:27:24 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:54755 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890AbbBVP1Y (ORCPT ); Sun, 22 Feb 2015 10:27:24 -0500 Received: by mail-wg0-f46.google.com with SMTP id a1so21371865wgh.5 for ; Sun, 22 Feb 2015 07:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=o9FRI58Jz+zFt3uu172q5vTD2Yxh7bmp4s2lQHxUVag=; b=INxyfXLtGIbmwXLXSrKOYbP/ItqkXmHo7gYcwvqcuPqdQcbaxVsznbv9XJisQHxXKR bfeeeQauNQpaRq7a3/Zvb8iUTex1X/p7sIzhTyQHZE89hDt/SKjXvzHJokggxhJTKNAw FLOdtxsyjgov2ZESgI1cpOBDtP5iPSwaynywXHHeD0w85hX5ARCetJ1mWZ78GMgCwrmD HEBJaAWtXjCVKs0LIwv37BS4XdTQjH6KZcHxw9de7BlH5UJftDPR5NYUGNejm5d3PfvP PGXtJQijQmH5Gz93HL4QBR5FCeOFjIOQ5OXWLRfTHFxDckTFA3n4Mg1jVbyjvTIiurwK 1sgQ== X-Received: by 10.180.14.196 with SMTP id r4mr12425624wic.77.1424618843228; Sun, 22 Feb 2015 07:27:23 -0800 (PST) Received: from fambox.fambox-domain ([46.115.130.84]) by mx.google.com with ESMTPSA id vq9sm51543859wjc.6.2015.02.22.07.27.18 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 22 Feb 2015 07:27:22 -0800 (PST) From: Sedat Dilek To: David Howells , Miklos Szeredi , Al Viro , linux-fsdevel Cc: Sedat Dilek Subject: [PATCH] mount_union.py: Filesystem type for overlayfs changed Date: Sun, 22 Feb 2015 16:27:06 +0100 Message-Id: <1424618826-5468-1-git-send-email-sedat.dilek@gmail.com> X-Mailer: git-send-email 2.3.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The filesystem type changed from "overlayfs" (old) to "overlay" (new) with Linux v3.18. See commit ef94b1864d1e ("ovl: rename filesystem type to "overlay"")). So mount_union.py needs to be adapted. TODO: Distinguish between old and new fs-type in mount_union.py script. Tested against Linux-v3.19-9526-ga135c717d5cd plus vfs.git#for-linus. Signed-off-by: Sedat Dilek --- mount_union.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mount_union.py b/mount_union.py index 4999daa40989..e1963d6eb22a 100644 --- a/mount_union.py +++ b/mount_union.py @@ -27,6 +27,6 @@ def mount_union(ctx): workdir = upper_mntroot + "/work" os.mkdir(upperdir) os.mkdir(workdir) - system("mount -t overlayfs overlayfs " + union_mntroot + + system("mount -t overlay overlay " + union_mntroot + " -olowerdir=" + lower_mntroot + ",upperdir=" + upperdir + ",workdir=" + workdir) ctx.note_upper_fs(upper_mntroot, testdir)