From patchwork Wed Jun 30 20:20:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 30848 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 25E2E27BC78; Wed, 30 Jun 2021 21:20:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A353727BC81 for ; Wed, 30 Jun 2021 21:20:21 +0100 (BST) Received: from localhost ([::1]:45442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lygh2-0002Ob-Lz for patchwork@mira.cbaines.net; Wed, 30 Jun 2021 16:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyggk-0002Nu-Qp for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyggk-0007w8-DJ for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyggk-0004Gy-9m for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49301] [PATCH 1/3] file-systems: Support forced checks & repairs. References: <87a6n7jef4.fsf@nckx> In-Reply-To: <87a6n7jef4.fsf@nckx> Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 20:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49301 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49301@debbugs.gnu.org Received: via spool by 49301-submit@debbugs.gnu.org id=B49301.162508438916377 (code B ref 49301); Wed, 30 Jun 2021 20:20:02 +0000 Received: (at 49301) by debbugs.gnu.org; 30 Jun 2021 20:19:49 +0000 Received: from localhost ([127.0.0.1]:58886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyggW-0004Fz-0O for submit@debbugs.gnu.org; Wed, 30 Jun 2021 16:19:49 -0400 Received: from tobias.gr ([80.241.217.52]:49468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyggU-0004Fr-4M for 49301@debbugs.gnu.org; Wed, 30 Jun 2021 16:19:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=EGeYUopkMOWKc fk+hopG/QLWBOOCp6fEnDXnv16rdOY=; h=date:subject:to:from; d=tobias.gr; b=GR+ZDo3VMkhbGdxAZ4kY+UJ9DjK6W6k3F65CKixQGy9+i/CuGkoqq1FLHG0CmYkBK+cT VR5fBiuU1ws9APuwO3PlcB9RQ47jV00CzaIMmuZdFJTlHEY7F4N6Hd7b6jHCrGXUnmaB/B jaMbA8DjrUVgmYRhBBySh/dsNfctRx7pMRqKIWa6xZlrdeeg/2GZ46mdtYdR5yUx53caXo j+CbvIS+ur/9kTLvDft3YWDZJaOkapn15K7qSFu1PGXBEs0zRlwHWlf7OTTHYYy0UrF0U4 9zF9VrNdFeLsqoc60u/mvf/UdNdzq8fhKNniAfPCvC54pswcgFGcy/dKHd0IxZoA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id ebe0d6e1 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <49301@debbugs.gnu.org>; Wed, 30 Jun 2021 20:19:43 +0000 (UTC) Date: Wed, 30 Jun 2021 22:20:16 +0200 Message-Id: <20210630202018.19124-1-me@tobias.gr> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice X-getmail-retrieved-from-mailbox: Patches * gnu/build/file-systems.scm (check-ext2-file-system) (check-bcachefs-file-system, check-btrfs-file-system) (check-fat-file-system, check-jfs-file-system, check-f2fs-file-system) (check-ntfs-file-system, check-file-system): Take and honour new FORCE? and REPAIR arguments. Update the docstring. Adjust all callers. * gnu/system/file-systems.scm : Add new SKIP-CHECK-IF-CLEAN? and REPAIR fields. (file-system->spec, spec->file-system): Adjust accordingly. * gnu/build/linux-boot.scm (mount-root-file-system): Take new SKIP-CHECK-IF-CLEAN? and REPAIR keyword arguments. Thread them through to CHECK-FILE-SYSTEM. (boot-system): Call MOUNT-FILE-SYSTEM with the new keyword arguments. * doc/guix.texi (File Systems): Document both new options. --- doc/guix.texi | 27 +++++++ gnu/build/file-systems.scm | 149 ++++++++++++++++++++++++++++-------- gnu/build/linux-boot.scm | 28 +++++-- gnu/system/file-systems.scm | 20 ++++- 4 files changed, 181 insertions(+), 43 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8681645021..9fb5709f4f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14045,6 +14045,33 @@ instance, for the root file system. This Boolean indicates whether the file system needs to be checked for errors before being mounted. +@item @code{skip-check-if-clean?} (default: @code{#t}) +When true, this boolean indicates that a file system check triggered +by @code{check?} may exit early if the file system is marked as +``clean'', meaning that it was previously correctly unmounted and +should not contain errors. + +When false, @code{check?} will always request a full consistency +check, which may take a very long time. + +Some file systems like @code{fat} do not support this feature and will +perform a full scan regardless of the value of this option. + +@item @code{repair} (default: @code{'preen}) +When @code{check?} finds errors, it can (try to) repair them and +continue booting. This option controls when and how to do so. + +If false, try not to modify the file system at all. Checking certain +file systems like @code{jfs} may still write to the device to replay +the journal. No repairs will be attempted. + +If @code{#t}, try to repair any errors found and assume ``yes'' to +all questions. This will fix the most errors, but may be risky. + +If @code{'preen}, repair only errors that are safe to fix without +human interaction. What that means is left up to the developers of +each file system and may be equivalent to ``none'' or ``all''. + @item @code{create-mount-point?} (default: @code{#f}) When true, the mount point is created if it does not exist yet. diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 4eeb81cf26..8f76d8d564 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -170,10 +170,19 @@ if DEVICE does not contain an ext2 file system." #f if SBLOCK has no volume name." (null-terminated-latin1->string (sub-bytevector sblock 120 16))) -(define (check-ext2-file-system device) - "Return the health of an ext2 file system on DEVICE." +(define (check-ext2-file-system device force? repair) + "Return the health of an ext2 file system on DEVICE. If FORCE? is true, check +the file system even if it's marked as clean. If REPAIR is false, do not write +to the file system to fix errors. If it's #t, fix all errors. Otherwise, fix +only those considered safe to repair automatically." (match (status:exit-val - (system* "e2fsck" "-v" "-p" "-C" "0" device)) + (apply system* `("e2fsck" "-v" "-C" "0" + ,@(if force? '("-f") '()) + ,@(match repair + (#f '("-n")) + (#t '("-y")) + (_ '("-p"))) + ,device))) (0 'pass) (1 'errors-corrected) (2 'reboot-required) @@ -260,15 +269,23 @@ bytevector." #f if SBLOCK has no volume name." (null-terminated-latin1->string (sub-bytevector sblock 72 32))) -(define (check-bcachefs-file-system device) - "Return the health of a bcachefs file system on DEVICE." +(define (check-bcachefs-file-system device force? repair) + "Return the health of a bcachefs file system on DEVICE. If FORCE? is true, +check the file system even if it's marked as clean. If REPAIR is false, do not +write to the file system to fix errors. If it's #t, fix all errors. Otherwise, +fix only those considered safe to repair automatically." (let ((ignored-bits (logior 2)) ; DEVICE was mounted read-only (status ;; A number, or #f on abnormal termination (e.g., assertion failure). (status:exit-val - (apply system* "bcachefs" "fsck" "-p" "-v" - ;; Make each multi-device member a separate argument. - (string-split device #\:))))) + (apply system* `("bcachefs" "fsck" "-v" + ,@(if force? '("-f") '()) + ,@(match repair + (#f '("-n")) + (#t '("-y")) + (_ '("-p"))) + ;; Make each multi-device member a separate argument. + ,@(string-split device #\:)))))) (match (and=> status (cut logand <> (lognot ignored-bits))) (0 'pass) (1 'errors-corrected) @@ -304,12 +321,27 @@ if DEVICE does not contain a btrfs file system." #f if SBLOCK has no volume name." (null-terminated-latin1->string (sub-bytevector sblock 299 256))) -(define (check-btrfs-file-system device) - "Return the health of a btrfs file system on DEVICE." - (match (status:exit-val - (system* "btrfs" "device" "scan")) - (0 'pass) - (_ 'fatal-error))) +(define (check-btrfs-file-system device force? repair) + "Return the health of a btrfs file system on DEVICE. If FORCE? is true, check +the file system even if it's marked as clean. This is not recommended! See +@uref{https://bugzilla.redhat.com/show_bug.cgi?id=625967#c8}. If REPAIR is +false, do not write to DEVICE. If it's #t, fix any errors found. Otherwise, +fix only those considered safe to repair automatically." + ;; XXX Why make this conditional on (check? #t) at all? + (system* "btrfs" "device" "scan") ; ignore errors + (if force? + (match (status:exit-val + (apply system* `("btrfs" "check" "--progress" + ;; Btrfs's ‘--force’ is not relevant to us here. + ,@(match repair + ;; Upstream considers ALL repairs dangerous + ;; and will warn the user at run time. + (#t '("--repair")) + (_ '("--readonly"))) ; a no-op for clarity + ,device))) + (0 'pass) + (_ 'fatal-error)) + 'pass)) ;;; @@ -338,10 +370,17 @@ if DEVICE does not contain a btrfs file system." Trailing spaces are trimmed." (string-trim-right (latin1->string (sub-bytevector sblock 71 11) (lambda (c) #f)) #\space)) -(define (check-fat-file-system device) - "Return the health of a fat file system on DEVICE." +(define (check-fat-file-system device force? repair) + "Return the health of a FAT file system on DEVICE. FORCE? is ignored: a full +file system scan is always performed. If REPAIR is false, do not write to the +file system to fix errors. Otherwise, automatically fix them using the least +destructive approach." (match (status:exit-val - (system* "fsck.vfat" "-v" "-a" device)) + (apply system* `("fsck.vfat" "-v" + ,@(match repair + (#f '("-n")) + (_ '("-a"))) ; no 'safe/#t distinction + ,device))) (0 'pass) (1 'errors-corrected) (_ 'fatal-error))) @@ -463,10 +502,28 @@ if DEVICE does not contain a JFS file system." #f if SBLOCK has no volume name." (null-terminated-latin1->string (sub-bytevector sblock 152 16))) -(define (check-jfs-file-system device) - "Return the health of a JFS file system on DEVICE." +(define (check-jfs-file-system device force? repair) + "Return the health of a JFS file system on DEVICE. If FORCE? is true, check +the file system even if it's marked as clean. If REPAIR is false, do not write +to the file system to fix errors, and replay the transaction log only if FORCE? +is true. Otherwise, replay the transaction log before checking and automatically +fix found errors." (match (status:exit-val - (system* "jfs_fsck" "-p" "-v" device)) + (apply system* + `("jfs_fsck" "-v" + ;; The ‘LEVEL’ logic is convoluted. To quote fsck/xchkdsk.c + ;; (‘-p’, ‘-a’, and ‘-r’ are aliases in every way): + ;; “If -f was chosen, have it override [-p] by [forcing] a + ;; check regardless of the outcome after the log is + ;; replayed”. + ;; “If -n is specified by itself, don't replay the journal. + ;; If -n is specified with [-p], replay the journal but + ;; don't make any other changes”. + ,@(if force? '("-f") '()) + ,@(match repair + (#f '("-n")) + (_ '("-p"))) ; no 'safe/#t distinction + ,device))) (0 'pass) (1 'errors-corrected) (2 'reboot-required) @@ -517,12 +574,22 @@ if DEVICE does not contain an F2FS file system." (sub-bytevector sblock (- (+ #x470 12) #x400) 512) %f2fs-endianness)) -(define (check-f2fs-file-system device) - "Return the health of a F2FS file system on DEVICE." +(define (check-f2fs-file-system device force? repair) + "Return the health of an F2FS file system on DEVICE. If FORCE? is true, check +the file system even if it's marked as clean. If either FORCE? or REPAIR are +true, automatically fix found errors." + ;; There's no ‘-n’ equivalent (‘--dry-run’ does not disable writes). + ;; ’-y’ is an alias of ‘-f’. The man page is bad: read main.c. + (when (and force? (not repair)) + (format (current-error-port) + "warning: forced check of F2FS ~a implies repairing any errors~%" + device)) (match (status:exit-val - (system* "fsck.f2fs" "-p" device)) - ;; 0 and -1 are the only two possibilities - ;; (according to the manpage) + (apply system* `("fsck.f2fs" + ,@(if force? '("-f") '()) + ,@(if repair '("-p") '("--dry-run")) + ,device))) + ;; 0 and -1 are the only two possibilities according to the man page. (0 'pass) (_ 'fatal-error))) @@ -600,10 +667,15 @@ if DEVICE does not contain a NTFS file system." ;; in the BOOT SECTOR like the UUID, but in the MASTER FILE TABLE, which seems ;; way harder to access. -(define (check-ntfs-file-system device) - "Return the health of a NTFS file system on DEVICE." +(define (check-ntfs-file-system device force? repair) + "Return the health of an NTFS file system on DEVICE. FORCE? is ignored: a +full check is always performed. Repair is not possible: if REPAIR is true and +the volume has been repaired by an external tool, clear the volume dirty flag to +indicate that it's now safe to mount." (match (status:exit-val - (system* "ntfsfix" device)) + (apply system* `("ntfsfix" + ,@(if repair '("--clear-dirty") '("--no-action")) + ,device))) (0 'pass) (_ 'fatal-error))) @@ -816,8 +888,13 @@ containing ':/')." (uuid-bytevector spec) uuid->string)))) -(define (check-file-system device type) - "Run a file system check of TYPE on DEVICE." +(define (check-file-system device type force? repair) + "Run a file system check of TYPE on DEVICE. If FORCE? is true, check the file +system even if it's marked as clean. If REPAIR is false, try not to write to +DEVICE at all. If it's #t, try to fix all errors found. Otherwise, fix only +those considered safe to repair automatically. Not all TYPEs support all values +or combinations of FORCE? and REPAIR. Do not return an error in such cases but +perform the closest sane action." (define check-procedure (cond ((string-prefix? "ext" type) check-ext2-file-system) @@ -831,7 +908,7 @@ containing ':/')." (else #f))) (if check-procedure - (match (check-procedure device) + (match (check-procedure device force? repair) ('pass #t) ('errors-corrected @@ -886,7 +963,11 @@ corresponds to the symbols listed in FLAGS." (() 0)))) -(define* (mount-file-system fs #:key (root "/root")) +(define* (mount-file-system fs #:key (root "/root") + (check? (file-system-check? fs)) + (skip-check-if-clean? + (file-system-skip-check-if-clean? fs)) + (repair (file-system-repair fs))) "Mount the file system described by FS, a object, under ROOT." (define (mount-nfs source mount-point type flags options) @@ -924,8 +1005,8 @@ corresponds to the symbols listed in FLAGS." (file-system-mount-flags (statfs source))) 0))) (options (file-system-options fs))) - (when (file-system-check? fs) - (check-file-system source type)) + (when check? + (check-file-system source type (not skip-check-if-clean?) repair)) (catch 'system-error (lambda () diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 461df9ff46..325e26c29a 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -412,12 +412,17 @@ the last argument of `mknod'." (define* (mount-root-file-system root type #:key volatile-root? (flags 0) options - check?) + check? skip-check-if-clean? repair) "Mount the root file system of type TYPE at device ROOT. If VOLATILE-ROOT? is true, mount ROOT read-only and make it an overlay with a writable tmpfs using the kernel built-in overlayfs. FLAGS and OPTIONS indicates the options to use to mount ROOT, and behave the same as for the `mount' procedure. -If CHECK? is true, first run ROOT's fsck tool (if any) non-interactively." + +If CHECK? is true, first run ROOT's fsck tool (if any) non-interactively. +If SKIP-CHECK-IF-CLEAN? is true, ask fsck to return immediately if ROOT is +marked as clean. If REPAIR is true, fsck may write to ROOT to perform repairs. +If REPAIR is also 'PREEN, ask fsck to perform only those repairs that it +considers safe." (if volatile-root? (begin @@ -439,7 +444,7 @@ If CHECK? is true, first run ROOT's fsck tool (if any) non-interactively." "lowerdir=/real-root,upperdir=/rw-root/upper,workdir=/rw-root/work")) (begin (when check? - (check-file-system root type)) + (check-file-system root type (not skip-check-if-clean?) repair)) (mount root "/root" type flags options))) ;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts. @@ -538,6 +543,8 @@ upon error." (call-with-error-handling (lambda () (mount-essential-file-systems) + ;; XXX Synthesise a root file-system object if needed and remove all the + ;; special case handling (e.g.: root-fs being #f; root-blah) below. (let* ((args (linux-command-line)) (to-load (find-long-option "--load" args)) (root-fs (find root-mount-point? mounts)) @@ -616,11 +623,22 @@ upon error." #:options root-options #:check? (if root-fs (file-system-check? root-fs) - #t)) + #t) + #:skip-check-if-clean? + (and=> root-fs + file-system-skip-check-if-clean?) + #:repair (if root-fs + (file-system-repair root-fs) + 'preen)) (mount "none" "/root" "tmpfs")) ;; Mount the specified file systems. - (for-each mount-file-system + (for-each (lambda (fs) + (mount-file-system fs + #:check? (file-system-check? fs) + #:skip-check-if-clean? + (file-system-skip-check-if-clean? fs) + #:repair (file-system-repair fs))) (remove root-mount-point? mounts)) (setenv "EXT2FS_NO_MTAB_OK" #f) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index fb87bfc85b..e982a95909 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Google LLC ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,8 @@ file-system-mount? file-system-mount-may-fail? file-system-check? + file-system-skip-check-if-clean? + file-system-repair file-system-create-mount-point? file-system-dependencies file-system-location @@ -124,6 +127,10 @@ (default #f)) (check? file-system-check? ; Boolean (default #t)) + (skip-check-if-clean? file-system-skip-check-if-clean? ; Boolean + (default #f)) + (repair file-system-repair ; symbol or #f + (default 'preen)) (create-mount-point? file-system-create-mount-point? ; Boolean (default #f)) (dependencies file-system-dependencies ; list of @@ -330,19 +337,22 @@ store--e.g., if FS is the root file system." initrd code." (match fs (($ device mount-point type flags options mount? - mount-may-fail? needed-for-boot? check?) + mount-may-fail? needed-for-boot? + check? skip-check-if-clean? repair) ;; Note: Add new fields towards the end for compatibility. (list (cond ((uuid? device) `(uuid ,(uuid-type device) ,(uuid-bytevector device))) ((file-system-label? device) `(file-system-label ,(file-system-label->string device))) (else device)) - mount-point type flags options mount-may-fail? check?)))) + mount-point type flags options mount-may-fail? + check? skip-check-if-clean? repair)))) (define (spec->file-system sexp) "Deserialize SEXP, a list, to the corresponding object." (match sexp - ((device mount-point type flags options mount-may-fail? check? + ((device mount-point type flags options mount-may-fail? + check? skip-check-if-clean? repair _ ...) ;placeholder for new fields (file-system (device (match device @@ -355,7 +365,9 @@ initrd code." (mount-point mount-point) (type type) (flags flags) (options options) (mount-may-fail? mount-may-fail?) - (check? check?))))) + (check? check?) + (skip-check-if-clean? skip-check-if-clean?) + (repair repair))))) (define (specification->file-system-mapping spec writable?) "Read the SPEC and return the corresponding . SPEC is From patchwork Wed Jun 30 20:20:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 30849 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 05EDC27BC83; Wed, 30 Jun 2021 21:20:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED, URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6763327BC78 for ; Wed, 30 Jun 2021 21:20:21 +0100 (BST) Received: from localhost ([::1]:45440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lygh2-0002Oa-6Q for patchwork@mira.cbaines.net; Wed, 30 Jun 2021 16:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyggl-0002Nv-5w for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47347) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyggk-0007wD-UN for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyggk-0004H8-QC for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49301] [PATCH 2/3] linux-boot: Honour fsck.mode & fsck.repair. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 20:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49301 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49301@debbugs.gnu.org Received: via spool by 49301-submit@debbugs.gnu.org id=B49301.162508439116387 (code B ref 49301); Wed, 30 Jun 2021 20:20:02 +0000 Received: (at 49301) by debbugs.gnu.org; 30 Jun 2021 20:19:51 +0000 Received: from localhost ([127.0.0.1]:58890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyggZ-0004GF-3h for submit@debbugs.gnu.org; Wed, 30 Jun 2021 16:19:51 -0400 Received: from tobias.gr ([80.241.217.52]:49468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyggV-0004Fr-KV for 49301@debbugs.gnu.org; Wed, 30 Jun 2021 16:19:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=l4cHhdsuxKAxy O970IdDcpg8NDgrOi1s9k5sAuq4SAE=; h=references:in-reply-to:date: subject:to:from; d=tobias.gr; b=hBSx5x2UeeK0C4AOhaj9csUZdAfT67X40RCQq9 PG9qaAtYMZHOtDNRBWIK4HWydJUNo6Do2TVN4O6tOv2E/HqtB1OGc43MgpGN80H4puRLod q9IMtvdA4iy5kUno8v9mYFu3aEPOX9pslLiatD2FwU7efw14AD0176Tl04FOHoljRCgKR4 C0qRWQAXetVptFrnq9wcbVt444m1wyDXm/PvAKqZ956leOx9567ZN0MMGZ4jXSHqyS+u1C 4/dEGsSF5O89hb2sdOhPHo15xj1PhjqFTuMqivxE9NxdAImpZCYWnbstjE/phfCn+S/f2v kmAL2drY+RZi3fP4rM37ZqLg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 661ca2db (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <49301@debbugs.gnu.org>; Wed, 30 Jun 2021 20:19:43 +0000 (UTC) Date: Wed, 30 Jun 2021 22:20:17 +0200 Message-Id: <20210630202018.19124-2-me@tobias.gr> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210630202018.19124-1-me@tobias.gr> References: <20210630202018.19124-1-me@tobias.gr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice X-getmail-retrieved-from-mailbox: Patches * gnu/build/linux-boot.scm (boot-system): Honour ‘fsck.mode=’ and ‘fsck.repair=’ kernel command line options. * doc/guix.texi (Initial RAM Disk): Document both. --- doc/guix.texi | 19 ++++++++++++++++++ gnu/build/linux-boot.scm | 43 +++++++++++++++++++++++++++++----------- 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 9fb5709f4f..0d17830a66 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32703,6 +32703,25 @@ name like @code{/dev/sda1}, a file system label, or a file system UUID. When unspecified, the device name from the root file system of the operating system declaration is used. +@item fsck.mode=@var{mode} +Whether to check the @var{root} file system for errors before mounting +it. @var{mode} is one of @code{skip} (never check), @code{force} (always +check), or @code{auto} to respect the root file-system object's 'check?' +setting (@pxref{File Systems}) and run a full scan only if the file system +was not cleanly shut down. + +@code{auto} is the default if this option is not present or if @var{mode} +is not one of the above. + +@item fsck.repair=@var{level} +The level of repairs to perform automatically if errors are found in the +@var{root} file system. @var{level} is one of @code{no} (do not write to +@var{root} at all if possible), @code{yes} (repair as much as possible), +or @code{preen} to repair problems considered safe to repair automatically. + +@code{preen} is the default if this option is not present or if @var{level} +is not one of the above. + @item --system=@var{system} Have @file{/run/booted-system} and @file{/run/current-system} point to @var{system}. diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 325e26c29a..c54b3b9b5a 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -561,7 +561,31 @@ upon error." ;; record. (root-device (or (and=> (find-long-option "--root" args) device-string->file-system-device) - root-fs-device))) + root-fs-device)) + (fsck.mode (find-long-option "fsck.mode" args))) + + (define (check? fs) + (match fsck.mode + ("skip" #f) + ("force" #t) + ;; Handle #f because ROOT may be #f. + (_ (if fs (file-system-check? fs) #t)))) ; default mode is "auto" + + (define (skip-check-if-clean? fs) + (match fsck.mode + ("force" #f) + ;; Handle #f FS because ROOT may be #f. + (_ (and=> fs file-system-skip-check-if-clean?)))) + + (define (repair fs) + (let ((arg (find-long-option "fsck.repair" args))) + (if arg + (match arg + ("no" #f) + ("yes" #t) + (_ 'preen)) ; default ARG is "preen" + ;; Handle #f because ROOT may be #f. + (if fs (file-system-repair fs) 'preen)))) (when (member "--repl" args) (start-repl)) @@ -621,24 +645,19 @@ upon error." #:volatile-root? volatile-root? #:flags root-fs-flags #:options root-options - #:check? (if root-fs - (file-system-check? root-fs) - #t) + #:check? (check? root-fs) #:skip-check-if-clean? - (and=> root-fs - file-system-skip-check-if-clean?) - #:repair (if root-fs - (file-system-repair root-fs) - 'preen)) + (skip-check-if-clean? root-fs) + #:repair (repair root-fs)) (mount "none" "/root" "tmpfs")) ;; Mount the specified file systems. (for-each (lambda (fs) (mount-file-system fs - #:check? (file-system-check? fs) + #:check? (check? fs) #:skip-check-if-clean? - (file-system-skip-check-if-clean? fs) - #:repair (file-system-repair fs))) + (skip-check-if-clean? fs) + #:repair (repair fs))) (remove root-mount-point? mounts)) (setenv "EXT2FS_NO_MTAB_OK" #f) From patchwork Wed Jun 30 20:20:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 30847 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1CF6127BC81; Wed, 30 Jun 2021 21:20:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D7D5927BC78 for ; Wed, 30 Jun 2021 21:20:20 +0100 (BST) Received: from localhost ([::1]:45444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lygh1-0002Oc-TY for patchwork@mira.cbaines.net; Wed, 30 Jun 2021 16:20:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyggl-0002O8-QS for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47348) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyggl-0007wq-IB for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lyggl-0004HF-E0 for guix-patches@gnu.org; Wed, 30 Jun 2021 16:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49301] [PATCH 3/3] gnu: Don't abuse check-btrfs-file-system to scan. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Jun 2021 20:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49301 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49301@debbugs.gnu.org Received: via spool by 49301-submit@debbugs.gnu.org id=B49301.162508439616405 (code B ref 49301); Wed, 30 Jun 2021 20:20:03 +0000 Received: (at 49301) by debbugs.gnu.org; 30 Jun 2021 20:19:56 +0000 Received: from localhost ([127.0.0.1]:58892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lygge-0004GX-Ew for submit@debbugs.gnu.org; Wed, 30 Jun 2021 16:19:56 -0400 Received: from tobias.gr ([80.241.217.52]:49468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyggW-0004Fr-DA for 49301@debbugs.gnu.org; Wed, 30 Jun 2021 16:19:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=aVYLh5R2i7r2n h3aaH8KgGUMxUCytSGQR1wtkH6tD4g=; h=references:in-reply-to:date: subject:to:from; d=tobias.gr; b=op6tUSgpGmKuAUubSelJRvAS7Tjkd0R0ch2L9J R22xTnfs2Yh8aesIDZ2rECDzk7MESGElvwEg9Pd8LVpSTSpEve+3J8Z+nZGu0+WbLR08f7 fXKHv/OI1XG89rhzsrLWJFh3FFbUtRbRgoTxhdjWUu9rhllGDWU/NzpgcALJFeGzo+hWL9 weMifsGh7537KR84Tnc0uSb6k/yX854GC9oN1nCujH69wo8rsEIGpJJYLB9KxeldGlYu0v RESq8gYAVH/pIq9S+B2ZsajeOKj2XEi/ZD6mW/9h9wys6L/pJp/XHa0QCXEtJh8BeX8V7U TY1Yp3mTPBXXKjcu/Ov4LZ3g== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 455c21b6 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <49301@debbugs.gnu.org>; Wed, 30 Jun 2021 20:19:43 +0000 (UTC) Date: Wed, 30 Jun 2021 22:20:18 +0200 Message-Id: <20210630202018.19124-3-me@tobias.gr> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210630202018.19124-1-me@tobias.gr> References: <20210630202018.19124-1-me@tobias.gr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches X-Patchwork-Original-From: Tobias Geerinckx-Rice via Guix-patches via From: Tobias Geerinckx-Rice X-getmail-retrieved-from-mailbox: Patches It was never guaranteed to be run for non-root file systems. It was for root file systems only due to a bug now fixed. * gnu/build/file-systems.scm (check-btrfs-file-system): Don't invoke ‘btrfs device scan’ here. * gnu/system/linux-initrd.scm (raw-initrd): Do so here if any btrfs file systems are present. --- gnu/build/file-systems.scm | 2 -- gnu/system/linux-initrd.scm | 13 ++++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index 8f76d8d564..607d9f418f 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -327,8 +327,6 @@ the file system even if it's marked as clean. This is not recommended! See @uref{https://bugzilla.redhat.com/show_bug.cgi?id=625967#c8}. If REPAIR is false, do not write to DEVICE. If it's #t, fix any errors found. Otherwise, fix only those considered safe to repair automatically." - ;; XXX Why make this conditional on (check? #t) at all? - (system* "btrfs" "device" "scan") ; ignore errors (if force? (match (status:exit-val (apply system* `("btrfs" "check" "--progress" diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index c6ba9bb560..46fe24b24e 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -210,6 +210,16 @@ upon error." (open source targets))) mapped-devices)) + (define file-system-scan-commands + ;; File systems like btrfs need help to assemble multi-device file systems + ;; but do not use manually-specified . + (let ((file-system-types (map file-system-type file-systems))) + (if (member "btrfs" file-system-types) + ;; Ignore errors: if the system manages to boot anyway, the better. + #~((system* (string-append #$btrfs-progs/static "/bin/btrfs") + "device" "scan")) + #~()))) + (define kodir (flat-linux-module-directory linux linux-modules)) @@ -245,7 +255,8 @@ upon error." (map spec->file-system '#$(map file-system->spec file-systems)) #:pre-mount (lambda () - (and #$@device-mapping-commands)) + (and #$@device-mapping-commands + #$@file-system-scan-commands)) #:linux-modules '#$linux-modules #:linux-module-directory '#$kodir #:keymap-file #+(and=> keyboard-layout