From patchwork Fri Mar 15 19:14:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 7634 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 4TxDTm6H32z3wnw for ; Fri, 15 Mar 2024 19:15:08 +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 4TxDTl3cSJzFLl; Fri, 15 Mar 2024 19:15:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TxDTl36Bqz32pg; Fri, 15 Mar 2024 19:15:07 +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 4TxDTb29Qqz32nQ for ; Fri, 15 Mar 2024 19:14:59 +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 4TxDTY0gQCz4Rt; Fri, 15 Mar 2024 19:14:57 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1710530097; 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=or/cr9aqisGtGO6jzjy4U5N+96//1/pujtfWR9WwnDI=; b=t6cIaXFA9xT9NlDIO8H+gwe9NuYG93GZK4gTTcWAGY3X7lZw0BhScvPCTUwZEKIqSnj+zC APLLHR/k5h0sukCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1710530097; 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=or/cr9aqisGtGO6jzjy4U5N+96//1/pujtfWR9WwnDI=; b=O4gC4D5YbWqVOUYD9FWyD9KisSN9kY6iqWE3SRPCyW8Vz37gwuOux7umcvKDm9KO/jGoYq xVrHlkxM3HBzLi3hJzfoispzd4UOKmGYO5nxsGOk38iCbZyoMi2HyAEvM7teyEsJu/Afra 95ws/5K/LfY4R6BTHE76Op93kB0dRvr07mpYNAMOraFeoHJoxOmDrJ2X0BTPB0KFPGI6ua QpF1UxRuEKWan5aD95/QGyxK7vk+8qvjKzCIRmMOYqUKU/e+aQR9OIuDOyWJWKRIdbnv9p yByx36Q8OeHSCGGqRFdJoUQ3dS7Dgyra/BmiGDS5XWaZ4Xa2akcuOnqzfDZfrQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 10/17] installer: Fix using BTRFS mount options when mounting the layout Date: Fri, 15 Mar 2024 20:14:35 +0100 Message-Id: <20240315191442.3951-11-stefan.schantl@ipfire.org> In-Reply-To: <20240315191442.3951-1-stefan.schantl@ipfire.org> References: <20240315191442.3951-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: ZHJ6VFQC2GYJXZGBCVCTD2YVRGGD3X54 X-Message-ID-Hash: ZHJ6VFQC2GYJXZGBCVCTD2YVRGGD3X54 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/installer/hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 7868cbb23..1c4adc24b 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -1044,7 +1044,7 @@ int hw_mount_btrfs_subvolumes(const char* source) { // Loop through the remain array of known subvolumes. for ( int i = 1; i < LEN(btrfs_subvolumes); i++ ) { snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, btrfs_subvolumes[i][1]); - snprintf(options, sizeof(options), "subvol=%s,", btrfs_subvolumes[i][0], BTRFS_MOUNT_OPTIONS); + snprintf(options, sizeof(options), "subvol=%s,%s", btrfs_subvolumes[i][0], BTRFS_MOUNT_OPTIONS); // Create the directory. r = hw_mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO);