From 674f064f2dc5e064ac2ca520085baf0c44a8f39c Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cloudius-systems.com>
Date: Thu, 28 Nov 2013 10:29:39 +0200
Subject: [PATCH] vfs: Make '/dev' directory at image creation time
Move runtime creation of '/dev' to image creation to avoid bogus "unable
to create /dev directory" error messages during boot.
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
fs/vfs/main.cc | 3 ---
static/dev/.keep | 0
usr.manifest.skel | 1 +
3 files changed, 1 insertion(+), 3 deletions(-)
create mode 100644 static/dev/.keep
diff --git a/fs/vfs/main.cc b/fs/vfs/main.cc
index 785369f3b..2359e9e9a 100644
--- a/fs/vfs/main.cc
+++ b/fs/vfs/main.cc
@@ -1558,9 +1558,6 @@ extern "C" void mount_zfs_rootfs(void)
if (ret)
kprintf("failed to pivot root, error = %s\n", strerror(ret));
- if (mkdir("/dev", 0755) < 0)
- kprintf("failed to create /dev, error = %s\n", strerror(errno));
-
ret = sys_mount("", "/dev", "devfs", 0, NULL);
if (ret)
kprintf("failed to mount devfs, error = %s\n", strerror(ret));
diff --git a/static/dev/.keep b/static/dev/.keep
new file mode 100644
index 000000000..e69de29bb
diff --git a/usr.manifest.skel b/usr.manifest.skel
index 89ca57059..a62f9b39b 100644
--- a/usr.manifest.skel
+++ b/usr.manifest.skel
@@ -154,3 +154,4 @@
/tools/lsroute.so: ./tools/route/lsroute.so
/&/etc/hosts: ../../static/&
/&/etc/inputrc: ../../static/&
+/&/dev/.keep: ../../static/&
--
GitLab