From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128466769373560832 X-Received: by 2002:adf:fb49:0:b0:21a:3ccc:fb77 with SMTP id c9-20020adffb49000000b0021a3cccfb77mr4963161wrs.280.1659725506938; Fri, 05 Aug 2022 11:51:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d236:0:b0:21e:e644:c8 with SMTP id k22-20020adfd236000000b0021ee64400c8ls8128681wrh.3.-pod-prod-gmail; Fri, 05 Aug 2022 11:51:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR6NHUiwUaMCc9w+tmiC8yZMXdAsSJZfOIjcKzUxI/tiAiOfBwIvgsS0TiTFchAfWCwo2Rr6 X-Received: by 2002:adf:ee09:0:b0:21e:f4e4:aa68 with SMTP id y9-20020adfee09000000b0021ef4e4aa68mr5102438wrn.324.1659725505769; Fri, 05 Aug 2022 11:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659725505; cv=none; d=google.com; s=arc-20160816; b=jMlPf7P678u47U4bUgPdNneHO6fiL98LCESZaGApQk4NLm00OcAJgx7IlVMk06KUKW G4DafOEe5/amL/oJxuFTA8PEUVrDH/mF7JHSvIyuN05k3WVToxfO3cqXenHx/Ctae7yy S/A0OZieBC1/ZXdazWqZ8lm9eImODFcq6EjDbz4UVJGeD0b5XOZZiQf3U4reUsiiJqJY mpE/ENvE+GyC4eEfh0RB06z1Jtn4XAtWZPkGEhdvszqYqa3a0gGBTpYlaY5VqX4RTCxk eNNtx6W9pnsW+3J6pDgS77MTg4jOeZeGm4ELFzuArSabTxgjEwvDQaqVxGylFGLudtT0 pTwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=5lCPlWmOhJlVoDfwlci2pfcrACJLhZyGBpMdEtFKmCs=; b=k1LjmbHUAi/CGHKDwfefn85AyIO/ypy5I5HdtNMEmKIKFET/0gWZYfZXUxBCsGLq0q I5xVdx2fhVkqijmMcmkWDRCq+BBEpQF0C20apSRBig7a5P3cY3Ku42FKJwkogrBKVvl3 TzGAYWhu8hP3IYqC8gtaG2TlRJqWH7Ro7tDh4ue1UuELUvItL3GqqnVWxjXfFzvogsZO +EafcFlboJkPN1csKVMgHVlFTKicLOQcL0X8fiwzkL8l3FWrHeOmOwzOxBDDmeTzV7vJ h06Nqrijs10XmISRgFIM131rg7X/uv5RfcySeMfhnBB2LX/pORWr6nm0C4pQWn6jBZiU CAmw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=W34haU4W; spf=pass (google.com: domain of fm-294854-2022080518514504468d1b58833b77d9-woq8_z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2022080518514504468d1b58833b77d9-WoQ8_z@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 189-20020a1c19c6000000b003a31bb11cdfsi470325wmz.2.2022.08.05.11.51.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Aug 2022 11:51:45 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2022080518514504468d1b58833b77d9-woq8_z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=W34haU4W; spf=pass (google.com: domain of fm-294854-2022080518514504468d1b58833b77d9-woq8_z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-2022080518514504468d1b58833b77d9-WoQ8_z@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 2022080518514504468d1b58833b77d9 for ; Fri, 05 Aug 2022 20:51:45 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=5lCPlWmOhJlVoDfwlci2pfcrACJLhZyGBpMdEtFKmCs=; b=W34haU4WWk6KLIznAL07w28SiE0ZMGTQHe3a3gR54gMEUCrlIIBfcfg4McWWxWUtb0PwqU WBy6wvm1uRHSpdVofWbZQxdXJDQtCLFt48mD2s+KAbsQHrjWnXj+YQooMVX/9oMs1ip89bjp nyuIAf/ANcSTAFhyUlSMPXO8wo47I=; From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 1/9] wic: added fspassno parameter to partition Date: Fri, 5 Aug 2022 20:51:36 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: e1I7Xs8SKmJp From: Claudius Heine The `fspassno` parameter allows to overwrite the value of the last column (`fs_passno`) in the /etc/fstab of the target root file system. This allows to have periodic file system checks. Signed-off-by: Claudius Heine Signed-off-by: Vijai Kumar K Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- 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 | 3 ++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 4ff7470a..73e3380c 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 0df9eb0d..a49b7b97 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 09e491dd..e50871b8 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 4d0b836e..da483dae 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -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 -- 2.35.3