From: John Hodge <tpg@mutabah.net>
Date: Sun, 9 Mar 2014 07:55:23 +0000 (+0800)
Subject: InitRD - Libc++, libm, bochs, dbserver
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=e3aca1210498cec4f1cb4d9337aeb774990194a0;p=tpg%2Facess2.git

InitRD - Libc++, libm, bochs, dbserver
---

diff --git a/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php b/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
index 3229ef23..5034b4ba 100644
--- a/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
+++ b/KernelLand/Modules/Filesystems/InitRD/GenerateInitRD.php
@@ -146,7 +146,7 @@ EOF;
 			echo $path,"\n";
 			$size = filesize($path);
 	
-			$_sym = "_binary_".str_replace(array("/","-","."), "_", $path)."_start";
+			$_sym = "_binary_".str_replace(array("/","-",".","+"), "_", $path)."_start";
 			$gOutput .= "extern Uint8 {$_sym}[];";
 			$gSymFiles[] = $path;
 			$gOutput .= <<<EOF
diff --git a/KernelLand/Modules/Filesystems/InitRD/files.lst b/KernelLand/Modules/Filesystems/InitRD/files.lst
index 6d2d19c6..a79fd61b 100644
--- a/KernelLand/Modules/Filesystems/InitRD/files.lst
+++ b/KernelLand/Modules/Filesystems/InitRD/files.lst
@@ -5,6 +5,8 @@ Dir "SBin" {
 	File "__BIN__/SBin/dhcpc"
 	File "__BIN__/SBin/insmod"
 	File "__BIN__/SBin/automount"
+	
+	OptFile	"__EXT__/sbin/dropbear"
 }
 Dir "Bin" {
 	File "__BIN__/Bin/CLIShell"
@@ -20,11 +22,14 @@ Dir "Bin" {
 	
 	OptFile	"__EXT__/bin/dbclient"
 	OptFile	"__EXT__/bin/vttest"
+	OptFile	"__EXT__/bin/bochs"
 }
 Dir "Libs" {
 	File "__BIN__/Libs/ld-acess.so"
 	File "__BIN__/Libs/libld-acess.so"
 	File "__BIN__/Libs/libc.so"
+	File "__BIN__/Libs/libm.so"
+	File "__BIN__/Libs/libc++.so"
 	File "__BIN__/Libs/libreadline.so"
 	File "__BIN__/Libs/libnet.so"
 	File "__BIN__/Libs/liburi.so"