From patchwork Wed Mar 27 05:15:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 7681 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4V4FHq510Hz3wkd for ; Wed, 27 Mar 2024 05:15:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4V4FHl69Z9z5XX; Wed, 27 Mar 2024 05:15:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4V4FHl2gPWz30VV; Wed, 27 Mar 2024 05:15:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4V4FHh412Qz2xTK for ; Wed, 27 Mar 2024 05:15:44 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4V4FHh1BsPz5V2; Wed, 27 Mar 2024 05:15:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1711516544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PebdlhCWpJY73rGPC9uWejCpcnNH8Yscbk0zd4B/fEQ=; b=7Nye9ztIyd8V5afdJmIbhZJAmQdDce3CxjWg9dEYA7Qy19lmWDHWyNAdnE7dpAgCfiwwOS d8Bjv+HNjlxwKzBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1711516544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PebdlhCWpJY73rGPC9uWejCpcnNH8Yscbk0zd4B/fEQ=; b=IhNL/7M6rNQJKEDn5m99HARFfY+Uelk6AtKMtU7yph3KygJTw5bdyo/C/tmM+VyRGmq9qq tVzcoPakgAibQ5uIu/VJeLs6zsmJ81hyu9U8soj41F4kY8HhARV6NUpRbh+K7MegSldBWP n4QhrNFp9CLOeePa/Wfp/CPR+MQC+c2TyUHWlaOjDdOedGyOseeUSaxXhvOoJT0iPNFUE5 m+EpjPrksDZDo78VPNmq78iYqXnpLck8ozW6myQ5Xk1emICBQnhCOrzZQhuExpivxQQ+8l SufgdfGKRVfJ1uV12Qt6GxiqoaPvDz+63L3wPxO0nO1ctoKOmt+EFihFd+D7ww== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/4] grub-btrfsd: Use generic volume_fs_type function for FS detection Date: Wed, 27 Mar 2024 06:15:18 +0100 Message-Id: <20240327051520.8231-2-stefan.schantl@ipfire.org> In-Reply-To: <20240327051520.8231-1-stefan.schantl@ipfire.org> References: <20240327051520.8231-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: 66EC4RQIW26VMUYDEBVGIOYDCAX7F357 X-Message-ID-Hash: 66EC4RQIW26VMUYDEBVGIOYDCAX7F357 X-MailFrom: stefan.schantl@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Stefan Schantl --- src/initscripts/system/grub-btrfsd | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/initscripts/system/grub-btrfsd b/src/initscripts/system/grub-btrfsd index dc5e32ad4..90582b1b1 100644 --- a/src/initscripts/system/grub-btrfsd +++ b/src/initscripts/system/grub-btrfsd @@ -25,21 +25,18 @@ SNAPSHOTDIR="/.snapshots" PIDFILE="/run/grub-btrfsd.pid" -root_is_btrfs() { - [ "$(stat -f --format="%T" /)" == "btrfs" ] || return 1 - - return 0 -} - case "$1" in start) - root_is_btrfs || exit 0 + root_fs_type=$(volume_fs_type "/") - boot_mesg "Starting Grub/Btrfs snapshot manager..." - loadproc -b -p "$PIDFILE" /usr/bin/grub-btrfsd --syslog "$SNAPSHOTDIR" + case "$root_fs_type" in + btrfs) - # Store the gained PID to the defined pidfile - echo "$!" > "$PIDFILE" + boot_mesg "Starting Grub/Btrfs snapshot manager..." + loadproc -b -p "$PIDFILE" /usr/bin/grub-btrfsd --syslog "$SNAPSHOTDIR" + echo "$!" > "$PIDFILE" + ;; + esac ;; stop)