From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 767C923C2E; Thu, 05 Jun 2025 12:08:40 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id CDC4A23C2D; Thu, 05 Jun 2025 12:08:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fout-a2-smtp.messagingengine.com (fout-a2-smtp.messagingengine.com [103.168.172.145]) by atuin.qyliss.net (Postfix) with ESMTPS id 2C67623C2C for ; Thu, 05 Jun 2025 12:08:33 +0000 (UTC) Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id 96EB01380341; Thu, 5 Jun 2025 08:08:31 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-01.internal (MEProxy); Thu, 05 Jun 2025 08:08:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm3; t=1749125311; x=1749211711; bh=VXwGVd8SOeXCJOSRJNaei LZ2XN0cwp6fx1nrkSPR//E=; b=b9Mk4HNDHmjkAnTsu1HZGwmBUcG6py4oLciwx LmCPBn/5iLAahCez6E89Y/sldS8D3Rg1dZJwbtnXB+/DmIyXp9D1/z23gnJm9ZTI uGG9kwuZiB/zcF7yIiuhOC3hLkeK9UUN3rYHtqQ7xDQC+PsMjl6b3qtp7QdpOfLC S8i2a+r2Ku1jh1E2/9GiHy/j1Q+Dl1LR5pNSk1crP5eAxgH/KdlKFEzdO3ZMzyzF B+zcvcpEiR6vQxfm7poQoqSzYbIi9MAASmwlRsWiea/aG962QpYBi19w1HAsll0d UL4C49CD1gKeiqoVYb0x/E02j4yjWH+HmUDJ9Ie3d9PzkEVtw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1749125311; x=1749211711; bh=VXwGVd8SOeXCJOSRJNaeiLZ2XN0cwp6fx1n rkSPR//E=; b=WjmeWG/3nG/R6i98X2XYN5EJSxr+st5pc+el47ykgkmHzyFCwWG uJpSLBoK4KLsmvVRhiBnfiZs7weWEZe3dUdJzX6iB92zl22wO0UT15vdA0n3v9Bw 8xm/EqPDhSXCtESdGNG+ZkaF0AjiwKRmQtMzd7WSMVhrprEXj9HFrOElMrSYCPgJ lz3NvQXZCapaNq4Duzeoi1yh8YmXZm4eYVeOwuQwxY8M2vRNQv/boYgdTHvufRhH Kzk6aTwt5HrA2jxkCUXJo+bAw3gafETBDaiY5XA1iZzppMLJUtPlcAhfEWmB0mr6 esAZrpdp4UBjhz7wawWHDlulIfWKHuHYZtA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdefiedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevuf ffkffoggfgsedtkeertdertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhi segrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeehkefgtdevtedtkeduudegue fgudejheeugfelgeettdfhffduhfehudfhudeuhfenucevlhhushhtvghrufhiiigvpedt necurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihsshgrrdhishdpnhgspghrtg hpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuggvvhgvlhesshhp vggtthhruhhmqdhoshdrohhrghdprhgtphhtthhopeihuhhkrgeshihukhgrrdguvghv X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Jun 2025 08:08:30 -0400 (EDT) Received: by sf.qyliss.net (Postfix, from userid 1000) id 1FFEC2381047F; Thu, 05 Jun 2025 14:08:29 +0200 (CEST) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH] vm: link /sbin to /usr/bin Date: Thu, 5 Jun 2025 14:08:19 +0200 Message-ID: <20250605120819.7145-1-hi@alyssa.is> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 6FDONGTA3HLUGWWITU26F6HTQQEG4OVJ X-Message-ID-Hash: 6FDONGTA3HLUGWWITU26F6HTQQEG4OVJ X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yureka X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is necessary because the kernel tries to load modules by running /sbin/modprobe. This should fix Intel wireless cards in netvm. It's then important to disable Busybox init because /sbin/init takes precedence over our /etc/init. Signed-off-by: Alyssa Ross --- img/app/Makefile | 2 +- img/app/default.nix | 1 + img/app/sbin | 1 + vm/sys/net/Makefile | 2 +- vm/sys/net/default.nix | 1 + vm/sys/net/sbin | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 img/app/sbin create mode 120000 vm/sys/net/sbin diff --git a/img/app/Makefile b/img/app/Makefile index 5ea023e..c827fd3 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -60,7 +60,7 @@ VM_FIFOS = etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo # These are separate because they need to be included, but putting # them as make dependencies would confuse make. -VM_LINKS = bin etc/ssl/certs/ca-certificates.crt +VM_LINKS = bin etc/ssl/certs/ca-certificates.crt sbin VM_BUILD_FILES = build/etc/s6-rc diff --git a/img/app/default.nix b/img/app/default.nix index 6e423f6..a196205 100644 --- a/img/app/default.nix +++ b/img/app/default.nix @@ -24,6 +24,7 @@ let CONFIG_FEATURE_IP_ADDRESS y CONFIG_FEATURE_IP_LINK y CONFIG_FEATURE_IP_ROUTE y + CONFIG_INIT n CONFIG_IP y ''; }) diff --git a/img/app/sbin b/img/app/sbin new file mode 120000 index 0000000..1e881ed --- /dev/null +++ b/img/app/sbin @@ -0,0 +1 @@ +usr/bin \ No newline at end of file diff --git a/vm/sys/net/Makefile b/vm/sys/net/Makefile index 35da669..436ca6e 100644 --- a/vm/sys/net/Makefile +++ b/vm/sys/net/Makefile @@ -43,7 +43,7 @@ VM_DIRS = dev etc/s6-linux-init/env run proc sys var/lib/connman # These are separate because they need to be included, but putting # them as make dependencies would confuse make. -VM_LINKS = bin lib var/run +VM_LINKS = bin lib sbin var/run VM_BUILD_FILES = build/etc/s6-rc diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index 69f9564..b5873eb 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -22,6 +22,7 @@ let (busybox.override { extraConfig = '' CONFIG_DEPMOD n + CONFIG_INIT n CONFIG_INSMOD n CONFIG_LSMOD n CONFIG_MODINFO n diff --git a/vm/sys/net/sbin b/vm/sys/net/sbin new file mode 120000 index 0000000..1e881ed --- /dev/null +++ b/vm/sys/net/sbin @@ -0,0 +1 @@ +usr/bin \ No newline at end of file base-commit: b5dab0eea25e24531ac856985b8f79ef38c06366 -- 2.49.0