Merge pull request containers#71 from slp/init-dev

Various fixes for init.c

Author: slp

Cargo.lock

@@ -2,7 +2,7 @@ LIBRARY_HEADER = include/libkrun.h
 INIT_BINARY = init/init
 
 ABI_VERSION=1
-FULL_VERSION=1.4.1
+FULL_VERSION=1.4.2
 
 ifeq ($(SEV),1)
     VARIANT = -sev

Makefile

@@ -173,35 +173,25 @@ static int chroot_luks()
 }
 #endif
 
-static int create_dirs()
+static int mount_filesystems()
 {
-	char *const DIRS[] = {"/proc", "/sys", "/sys/fs", "/sys/fs/cgroup", "/dev/pts", "/dev/shm"};
+	char *const DIRS_LEVEL1[] = {"/dev", "/proc", "/sys"};
+	char *const DIRS_LEVEL2[] = {"/dev/pts", "/dev/shm"};
 	int i;
 
-	if (access("/dev", F_OK) != 0) {
-		if (mkdir("/dev", 0755) < 0 && errno != EEXIST) {
-			printf("Error creating directory /dev\n");
-			return -1;
-		}
-		if (mount("devtmpfs", "/dev", "devtmpfs",
-			  MS_RELATIME, NULL) < 0) {
-			perror("mount(/dev)");
+	for (i = 0; i < 3; ++i) {
+		if (mkdir(DIRS_LEVEL1[i], 0755) < 0 && errno != EEXIST) {
+			printf("Error creating directory (%s)\n", DIRS_LEVEL1[i]);
 			return -1;
 		}
 	}
 
-	for (i = 0; i < 6; ++i) {
-		if (mkdir(DIRS[i], 0755) < 0 && errno != EEXIST) {
-			printf("Error creating directory (%s)\n", DIRS[i]);
-			return -1;
-		}
+	if (mount("devtmpfs", "/dev", "devtmpfs",
+		  MS_RELATIME, NULL) < 0 && errno != EBUSY ) {
+		perror("mount(/dev)");
+		return -1;
 	}
 
-	return 0;
-}
-
-static int mount_filesystems()
-{
 	if (mount("proc", "/proc", "proc",
 		  MS_NODEV | MS_NOEXEC | MS_NOSUID | MS_RELATIME, NULL) < 0) {
 		perror("mount(/proc)");
@@ -220,6 +210,13 @@ static int mount_filesystems()
 		return -1;
 	}
 
+	for (i = 0; i < 2; ++i) {
+		if (mkdir(DIRS_LEVEL2[i], 0755) < 0 && errno != EEXIST) {
+			printf("Error creating directory (%s)\n", DIRS_LEVEL2[i]);
+			return -1;
+		}
+	}
+
 	if (mount("devpts", "/dev/pts", "devpts",
 		  MS_NOEXEC | MS_NOSUID | MS_RELATIME, NULL) < 0) {
 		perror("mount(/dev/pts)");
@@ -260,7 +257,12 @@ static void config_parse_env(char *data, jsmntok_t *token)
 		*env_val = '\0';
 		env_val++;
 
-		setenv(env, env_val, 0);
+		if ((strcmp(env, "HOME") == 0) ||
+		    (strcmp(env, "TERM") == 0)) {
+			setenv(env, env_val, 1);
+		} else {
+			setenv(env, env_val, 0);
+		}
 	}
 }
 
@@ -454,6 +456,8 @@ int main(int argc, char **argv)
 	int sockfd;
 	char localhost[] = "localhost\0";
 	char *hostname;
+	char *krun_home;
+	char *krun_term;
 	char *krun_init;
 	char *config_workdir, *env_workdir;
 	char *rlimits;
@@ -465,15 +469,9 @@ int main(int argc, char **argv)
 		exit(-1);
 	}
 #endif
-
-	if (create_dirs() < 0) {
-		printf("Couldn't create support directories, bailing out\n");
-		exit(-2);
-	}
-
 	if (mount_filesystems() < 0) {
 		printf("Couldn't mount filesystems, bailing out\n");
-		exit(-3);
+		exit(-2);
 	}
 
 	setsid();
@@ -493,6 +491,16 @@ int main(int argc, char **argv)
 
 	config_parse_file(&config_argv, &config_workdir);
 
+	krun_home = getenv("KRUN_HOME");
+	if (krun_home) {
+		setenv("HOME", krun_home, 1);
+	}
+
+	krun_term = getenv("KRUN_TERM");
+	if (krun_term) {
+		setenv("TERM", krun_term, 1);
+	}
+
 	hostname = getenv("HOSTNAME");
 	if (hostname) {
 		sethostname(hostname, strlen(hostname));

init/init.c

@@ -1,6 +1,6 @@
 [package]
 name = "libkrun"
-version = "1.4.1"
+version = "1.4.2"
 authors = ["Sergio Lopez <[email protected]>"]
 edition = "2021"
 build = "build.rs"