From patchwork Fri Jun 10 03:39:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 1870 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 10 Jun 2022 13:39:51 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 25ABdpVv013998 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 10 Jun 2022 13:39:51 +0200 Received: by mail-lf1-f63.google.com with SMTP id e13-20020a19674d000000b0047944c80861sf7004413lfj.19 for ; Fri, 10 Jun 2022 04:39:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654861186; cv=pass; d=google.com; s=arc-20160816; b=0djqcbv+yC0Xa0L1hnf3UPWEqzfkF5uRJkkI1ZinENWfmTdEp6lRvGE81X2aiGmS/+ sIScePgOTk8n9PJqPY1JEt1Nd91kzmMsIh7lTfEypPpnkGhXsr1LLHK5CQ98sosM0gSU 2RrwtkS03Yfwep+bL8w87B/9mYEqsEubbn+nXLeH519W6B5d/hmXZI/Wi0Q/xmqUKNYe FAhlcnIilLw/kBrYNUaYJ20UGONkyW881xA0IpnLUXqiw4uSt2AdZ0tnJBkUeL6QRuSh 2lhQXFPGE6HugKC51PSZC013XEL4pP0L1S9mf67VgnikGzPiSy9hvVOWlVdSAg04U04h VPfg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:sender :dkim-signature; bh=qyfJCE+eK4XBi16QUmsJE4JLEedUNJ1aOfhXtyYhai0=; b=x/Jr8UvPW2YsiW7HAzfFdcMnYXAgeQ14VX92fMY/oeS27UHUw9vA+21BaMicIzLDTt zF23zaW9swwm2c8aXxY9G8SZB+iQHkxXxmKVHKaSjQoSNBBjAny9mT46G1GWtjgeMlRQ gFtlEL8cYXIjVmGs/0qE0/+7G/0OHmi30SYYfb195KARJCFmuV1Zf/z6r5ZGaKadiwDt Bnjs2KbNa8m1UYpi7eJXWe4yV6eAoEr4VTfci+wIbNxtKyg0Ekv9uP5thmUIiFMT/yoV VcNvnol9Kxo8n4+FnmasEw5ZtgovxKPPoaCPIqrokuKoC3hq0E/rA3LDH6rgY2vJ5Dnt +pwA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:ironport-sdr:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=qyfJCE+eK4XBi16QUmsJE4JLEedUNJ1aOfhXtyYhai0=; b=Bq4ea87yENmOFCiZC9CJixSxJed3ZnecITTdj+SfvOf0XfOERANvJGYHB0m/KckvCF DdW39SLFun0Ktwm3DGLUvLngL1VOEd+8giTA2DEtdwDR2/IrE9XwhCSx982FX946TVom yeZt3IVUQjHi4U+MbIMcj/MPX4HBbiUkJ7YrpBQtUHxBIj/++RO1+OydEVbbmgtUdky6 LQYkx1Wuo74LLi0D7bRai7XR/7mCPdt3qm771OErlkBnco7+ImX+0+xnbnh9xeZvbklf 8h8QzEwYIcnQZ/xer65D2TJ/qURu7UeceNEeM3RARSubtwI+f5XQ5PWJrqLzHLpxseoK 5lmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:ironport-sdr:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=qyfJCE+eK4XBi16QUmsJE4JLEedUNJ1aOfhXtyYhai0=; b=SNKd3G3MWCX8HEkPb+F/x6zlKmCH/QFqqudJd9J7G3QLH3j06XyOAhhmRwJTXEayXd NDClsKjjqLdjX8Hd78mcSlWqrMLtNvR3HdwDS/Kk7lxc9U/PHnTK4oaioSMTuGYJ9fEo OJ866PSSZMDTJ89LaVwRrw2VR2+SrBuvEgwAACuSbmupU0sOg0+ucUlvUda5NxaTZsXm uUOYMZJtSHzwMEfSXraYGMYwUibxbBAP17h5t4FerCjd4kb0t6YkHiR9sB8rxEDxDMkQ O0TW+cHXw+wIZtgZyybDMv7ve3ALWt7PZapuqyEIrZ3eI/Uvcg4CfwyVG32TU9w0Wvus 7IHA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532ErpjPSxL363wLiq2GK1xCLiSY1ArfIgsws6fzr6v5sg100eoE +sm76pmGiYpU41u/HouZl78= X-Google-Smtp-Source: ABdhPJwyJbPwqsJD1LKSEOgqZin0yXUT9Vr1oParFvk7dDWyVnjnq2tV6tV+r8h85dNP3gbMQMXJhw== X-Received: by 2002:a05:6512:3f92:b0:447:769c:1b2c with SMTP id x18-20020a0565123f9200b00447769c1b2cmr77073129lfa.387.1654861186178; Fri, 10 Jun 2022 04:39:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8857:0:b0:255:80fd:9161 with SMTP id z23-20020a2e8857000000b0025580fd9161ls1382960ljj.3.gmail; Fri, 10 Jun 2022 04:39:44 -0700 (PDT) X-Received: by 2002:a2e:934f:0:b0:24f:ea1:6232 with SMTP id m15-20020a2e934f000000b0024f0ea16232mr63751196ljh.135.1654861184656; Fri, 10 Jun 2022 04:39:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654861184; cv=none; d=google.com; s=arc-20160816; b=Wl0g42NmOA0wVICjA9iJQtepKsrRo9COhfdn1vF4wCMmAaCyvZwSs/sFE6FGxorvl7 1a+NyK3sXoLyFMkc6jA9HUFoJfJtaEZSOQuU7WDJOw2P/ce3piU/4TrF0LojIMX2cMIt BRP3EvWfliHPhuPOv8GC5i35woRAsZhmtH/aEneDfYXmpOV9sKaZvTZa0ZS+SsrQQ/MB NIVX5fXN80F1tlUxB+rTdP7mIE21Hv2NhRcX2n0W8UO3rMzvTcye6HmV8XbYpW2EqR5P mnr2lv2/5BO94umhGU6hgnMl1je2rJBo+/T3YqZ92StjsoLb63SVi8p155u5gXd6h1yj hpXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr; bh=5LLuhYE8wPT9V+Y2tRmGoft77mr98l1QN9KFZdyCYME=; b=uQsSrkE/Z1OGLg9Pmvbtuk+vMpTcs68q7fuW4VZFdOVLkW8tcK6arKXRWLJ1orF44X RQ4hRFx/DpRj4HQUwamNvAz+Roo9fDHkpZaFi7c+nwEeMfuKwSob/DzQIjsa/g7+Zj8/ sxSHM9kdlBRL1Ew8390bW3Vqixz9EGIz5U1Mpd+b9Ubfv25XqwqfwX9oJIo5uZiFyZYw vbBfM6f//pB2gcSg0YgCEPXB2M+LqVckQKLLwdl2WkH2E6D8XbQg7yo3heMxLinjp8Pq /UL/OiH/nTRY0yQgaEMUY6Q+i3p7xA4v3J/0Yfq8VC9VzJTWQy5h/YScEbcB0eE5QWM/ Gv5w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id 6-20020a2eb946000000b00255889ba526si682577ljs.5.2022.06.10.04.39.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Jun 2022 04:39:44 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; X-IronPort-AV: E=Sophos;i="5.91,290,1647331200"; d="scan'208";a="77081593" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 10 Jun 2022 03:39:44 -0800 IronPort-SDR: V+wnEcDaf3wAe+IK+8Oyg3tpIMTADidn/XnsfxhgYsC8y0XQxOwj/xUheXAikY28pdguqwa64r +VHW7K0UadkAE2L0KNv4mHeWIJ+fkz35sFSS7sKkyofoGBBeucUR/YMqgUPOeQLazhWK7uXpPK 8Y5FZ/iLBCS+N9eA6k0iFOQTCg6TRIC/0/I7fEXbbEMIChXdNMDQvRHnx81YsFuV/Uvx0QXKQe b/GQVYbXdTz0Y3QqotrYceu8URwRPgJO/tcVWOBsCQ5UPxsa6zRNvnwrhj9DXYr1PHzYFfWkq3 s6g= From: Vijai Kumar K To: CC: , , Vijai Kumar K Subject: [PATCH 2/2] wic: Update to the latest revision Date: Fri, 10 Jun 2022 17:09:19 +0530 Message-ID: <20220610113919.2051302-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> References: <20220610113919.2051302-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-02.mgc.mentorg.com (147.34.90.202) To svr-orw-mbx-12.mgc.mentorg.com (147.34.90.212) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Update to the latest wic from OE-core. OE-core Revision: 06ed2aa93fc25a681e3a00ee120d9395b04845da Signed-off-by: Vijai Kumar K --- scripts/lib/wic/help.py | 6 ++++++ scripts/lib/wic/ksparser.py | 1 + scripts/lib/wic/partition.py | 1 + scripts/lib/wic/plugins/imager/direct.py | 5 +++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 4ff7470..73e3380 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py @@ -940,6 +940,12 @@ DESCRIPTION quotes. If not specified, the default string is "defaults". + --fspassno: Specifies the order in which filesystem checks are done + at boot time by fsck. See fs_passno parameter of + fstab(5). This parameter will be copied into the + /etc/fstab file of the installed system. If not + specified the default value of "0" will be used. + --label label: Specifies the label to give to the filesystem to be made on the partition. If the given label is already in use by another filesystem, diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py index 0df9eb0..a49b7b9 100644 --- a/scripts/lib/wic/ksparser.py +++ b/scripts/lib/wic/ksparser.py @@ -155,6 +155,7 @@ class KickStart(): part.add_argument('--change-directory') part.add_argument("--extra-space", type=sizetype("M")) part.add_argument('--fsoptions', dest='fsopts') + part.add_argument('--fspassno', dest='fspassno') part.add_argument('--fstype', default='vfat', choices=('ext2', 'ext3', 'ext4', 'btrfs', 'squashfs', 'vfat', 'msdos', 'erofs', diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 09e491d..e50871b 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -33,6 +33,7 @@ class Partition(): self.include_path = args.include_path self.change_directory = args.change_directory self.fsopts = args.fsopts + self.fspassno = args.fspassno self.fstype = args.fstype self.label = args.label self.use_label = args.use_label diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 4d0b836..c44159b 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -117,7 +117,7 @@ class DirectPlugin(ImagerPlugin): updated = False for part in self.parts: if not part.realnum or not part.mountpoint \ - or part.mountpoint == "/" or not part.mountpoint.startswith('/'): + or not part.mountpoint.startswith('/'): continue if part.use_uuid: @@ -138,8 +138,9 @@ class DirectPlugin(ImagerPlugin): device_name = "/dev/%s%s%d" % (part.disk, prefix, part.realnum) opts = part.fsopts if part.fsopts else "defaults" + passno = part.fspassno if part.fspassno else "0" line = "\t".join([device_name, part.mountpoint, part.fstype, - opts, "0", "0"]) + "\n" + opts, "0", passno]) + "\n" fstab_lines.append(line) updated = True