From 8ecbc48211acaa1127ba01cd83234487a2f9bc24 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Mon, 5 Jun 2023 11:29:01 +0200
Subject: [PATCH] sculpt: replace ipxe_nic_drv by pc_nic_drv

Issue #4921
---
 repos/gems/recipes/pkg/sculpt_distribution-pc/archives | 2 +-
 repos/gems/run/sculpt.run                              | 2 +-
 repos/gems/sculpt/default-pc.sculpt                    | 2 +-
 repos/gems/sculpt/drivers/pc                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/repos/gems/recipes/pkg/sculpt_distribution-pc/archives b/repos/gems/recipes/pkg/sculpt_distribution-pc/archives
index b3c002ddcf..3ce0fb84e3 100644
--- a/repos/gems/recipes/pkg/sculpt_distribution-pc/archives
+++ b/repos/gems/recipes/pkg/sculpt_distribution-pc/archives
@@ -1,7 +1,7 @@
 _/pkg/sculpt
 _/pkg/drivers_managed-pc
 _/pkg/pc_wifi
-_/pkg/ipxe_nic_drv
+_/pkg/pc_nic_drv
 _/pkg/vbox6
 _/pkg/acpica
 _/pkg/system_clock-pc
diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run
index aba2022804..3075d2c4d7 100644
--- a/repos/gems/run/sculpt.run
+++ b/repos/gems/run/sculpt.run
@@ -156,7 +156,7 @@ proc log_route { } {
 proc nic_driver_routes { } {
 
 	set result(pc) {
-		<service name="ROM" label="nic_drv">           <parent label="ipxe_nic_drv"/> </service>
+		<service name="ROM" label="nic_drv">           <parent label="pc_nic_drv"/> </service>
 		<service name="ROM" label="wifi.lib.so">       <parent label="pc_wifi.lib.so"/> </service>
 		<service name="ROM" label="wifi_firmware.tar"> <parent label="pc_wifi_firmware.tar"/> </service>
 	}
diff --git a/repos/gems/sculpt/default-pc.sculpt b/repos/gems/sculpt/default-pc.sculpt
index 005f528b27..2931c096d0 100644
--- a/repos/gems/sculpt/default-pc.sculpt
+++ b/repos/gems/sculpt/default-pc.sculpt
@@ -4,7 +4,7 @@ system:  pc
 gpu_drv: intel
 
 # supplemental depot content added to the system image
-import: pkg/drivers_managed-pc pkg/pc_wifi src/ipxe_nic_drv
+import: pkg/drivers_managed-pc pkg/pc_wifi src/pc_nic_drv
 
 # selection of launcher-menu entries
 launcher: vm_fs shared_fs usb_devices_rom
diff --git a/repos/gems/sculpt/drivers/pc b/repos/gems/sculpt/drivers/pc
index 4938145c9b..9e5ff83b5a 100644
--- a/repos/gems/sculpt/drivers/pc
+++ b/repos/gems/sculpt/drivers/pc
@@ -145,7 +145,7 @@
 				<pci class="ISABRIDGE"/>
 			</policy>
 			<policy label_suffix="-> wifi" msix="false" info="yes"> <pci class="WIFI"/> </policy>
-			<policy label_suffix="-> nic">   <pci class="ETHERNET"/> </policy>
+			<policy label_suffix="-> nic" info="yes">   <pci class="ETHERNET"/> </policy>
 			<policy label_suffix="-> audio"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>
 			<policy label="acpica"> <device name="acpi"/> </policy>
 		</config>