feat(base): Updates (#127)

Reviewed-by: Cezar Craciunoiu <[email protected]> Approved-by: Cezar Craciunoiu <[email protected]> Reviewed-by: Razvan Deaconescu <[email protected]> Reviewed-by: Razvan Deaconescu <[email protected]>
unikraft · Jul 22, 2024 · b31bff9 · b31bff9
2 parents 1a9f80b + d1648d2
commit b31bff9
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/library/base/Kraftfile b/library/base/Kraftfile
@@ -17,13 +17,17 @@ unikraft:
     CONFIG_APPELFLOADER_BRK: 'y'
     CONFIG_APPELFLOADER_CUSTOMAPPNAME: 'y'
     CONFIG_APPELFLOADER_STACK_NBPAGES: 128
-    CONFIG_APPELFLOADER_VFSEXEC_EXECBIT: 'n'
     CONFIG_APPELFLOADER_VFSEXEC: 'y'
-    CONFIG_APPELFLOADER_HFS: 'y'
-    CONFIG_APPELFLOADER_HFS_ETCRESOLVCONF: 'y'
-    CONFIG_APPELFLOADER_HFS_ETCHOSTS: 'y'
-    CONFIG_APPELFLOADER_HFS_ETCHOSTNAME: 'y'
-    CONFIG_APPELFLOADER_HFS_REPLACEEXIST: 'y'
+    CONFIG_APPELFLOADER_VFSEXEC_EXECBIT: 'y'
+    CONFIG_APPELFLOADER_VFSEXEC_ENVPWD: 'y'
+    CONFIG_APPELFLOADER_VFSEXEC_ENVPATH: 'y'
+    CONFIG_APPELFLOADER_AUTOGEN: 'y'
+    CONFIG_APPELFLOADER_AUTOGEN_ETCRESOLVCONF: 'y'
+    CONFIG_APPELFLOADER_AUTOGEN_ETCHOSTS: 'y'
+    CONFIG_APPELFLOADER_AUTOGEN_ETCHOSTS_LOCALHOST4: 'y'
+    CONFIG_APPELFLOADER_AUTOGEN_ETCHOSTNAME: 'y'
+    CONFIG_APPELFLOADER_AUTOGEN_REPLACEEXIST: 'y'
+
     # Unikraft options
     CONFIG_HAVE_PAGING_DIRECTMAP: 'y'
     CONFIG_HAVE_PAGING: 'y'
@@ -33,10 +37,12 @@ unikraft:
     CONFIG_LIBDEVFS_DEV_STDOUT: 'y'
     CONFIG_LIBDEVFS_DEV_ZERO: 'y'
     CONFIG_LIBDEVFS: 'y'
+    CONFIG_LIBPOSIX_ENVIRON: 'y'
     CONFIG_LIBPOSIX_ENVIRON_ENVP0: "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
     CONFIG_LIBPOSIX_ENVIRON_ENVP1: "LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib"
     CONFIG_LIBPOSIX_ENVIRON_ENVP2: "HOME=/"
-    CONFIG_LIBPOSIX_ENVIRON: 'y'
+    CONFIG_LIBPOSIX_ENVIRON_ENVP3: "PWD=/"
+    CONFIG_LIBPOSIX_ENVIRON_LIBPARAM: 'y'
     CONFIG_LIBPOSIX_EVENTFD: 'y'
     CONFIG_LIBPOSIX_FDIO: 'y'
     CONFIG_LIBPOSIX_FDTAB: 'y'
@@ -68,6 +74,7 @@ unikraft:
     CONFIG_LIBUKBOOT_HEAP_BASE: '0x400000000'
     CONFIG_LIBUKBOOT_MAINTHREAD: 'y'
     CONFIG_LIBUKBOOT_SHUTDOWNREQ_HANDLER: 'y'
+    CONFIG_LIBUKLIBPARAM: 'y'
     CONFIG_LIBUKCPIO: 'y'
     CONFIG_LIBUKDEBUG_CRASH_SCREEN: 'y'
     CONFIG_LIBUKDEBUG_ENABLE_ASSERT: 'y'
@@ -102,6 +109,7 @@ unikraft:
     CONFIG_STACK_SIZE_PAGE_ORDER: 4 # 128 * 4K = 512K
     CONFIG_UKPLAT_KSP_SIZE: 32768
     CONFIG_UKPLAT_MEMREGION_MAX_COUNT: 64
+    CONFIG_LIBUKNETDEV: 'y'
     CONFIG_LIBUKNETDEV_EINFO_LIBPARAM: 'y'
 
     # Debug options
@@ -118,6 +126,8 @@ libraries:
       CONFIG_LWIP_LOOPIF: 'y'
       CONFIG_LWIP_UKNETDEV: 'y'
       CONFIG_LWIP_LOOPBACK: 'y'
+      # Fail booting without network interface
+      CONFIG_LWIP_FAILNOIFACE: 'y'
       CONFIG_LWIP_TCP: 'y'
       CONFIG_LWIP_UDP: 'y'
       CONFIG_LWIP_RAW: 'y'
@@ -129,7 +139,10 @@ libraries:
       CONFIG_LWIP_AUTOIFACE: 'y'
       CONFIG_LWIP_IPV4: 'y'
       CONFIG_LWIP_DHCP: 'y'
-      CONFIG_LWIP_DNS: 'y'
+      CONFIG_LWIP_WAITIFACE: 'y'
+      # Lwip's DNS support is not used for bin compat programs (elfloader)
+      # HINT: Native builds with musl should set CONFIG_LIBMUSL_NETWORK_LWIP_DNS together with CONFIG_LWIP_DNS
+      CONFIG_LWIP_DNS: 'n'
       CONFIG_LWIP_NUM_TCPCON: 64
       CONFIG_LWIP_NUM_TCPLISTENERS: 64
       CONFIG_LWIP_ICMP: 'y'