Compare commits

..

No commits in common. "01f595657d7988fcdb5e8dad1a80590e04a7b45f" and "46b1ab1dd840c80a40d8531c61b999a15d331aaf" have entirely different histories.

2 changed files with 4 additions and 6 deletions

View File

@ -30,10 +30,9 @@ fn init_rootfs() {
let no_se = MS_NOSUID | MS_NOEXEC; let no_se = MS_NOSUID | MS_NOEXEC;
let args = [ let args = [
("devtmpfs", "/dev", "devtmpfs", no_se, "mode=0755"), ("devtmpfs", "/dev", "devtmpfs", no_se, "mode=0755"),
/* ("devtmpfs", "/dev", "devtmpfs", no_se, "mode=0755"),
("devpts", "/dev/pts", "devpts", no_se, ""), ("devpts", "/dev/pts", "devpts", no_se, ""),
("shm", "/dev/shm", "tmpfs", no_dse, "mode=0755"), ("shm", "/dev/shm", "tmpfs", no_dse, "mode=0755"),
*/
("proc", "/proc", "proc", no_dse, "hidepid=2"), ("proc", "/proc", "proc", no_dse, "hidepid=2"),
("tmpfs", "/run", "tmpfs", no_dse, "mode=0755"), ("tmpfs", "/run", "tmpfs", no_dse, "mode=0755"),
("tmpfs", "/tmp", "tmpfs", no_dse, ""), ("tmpfs", "/tmp", "tmpfs", no_dse, ""),
@ -60,10 +59,9 @@ fn init() -> Result<()> {
init_rootfs(); init_rootfs();
platform::aws::Aws.init().unwrap();
init_console()?; init_console()?;
platform::aws::Aws.init().unwrap();
std::thread::sleep(std::time::Duration::from_secs(500)); std::thread::sleep(std::time::Duration::from_secs(500));
/* /*

View File

@ -112,8 +112,8 @@ mod enclaveos_shim {
// TODO: error handling // TODO: error handling
nitro_heartbeat(); nitro_heartbeat();
// eprintln!("Loading nsm.ko"); eprintln!("Loading nsm.ko");
// insmod("/nsm.ko"); insmod("/nsm.ko");
} }
fn nitro_heartbeat() { fn nitro_heartbeat() {