summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-07-17 11:24:43 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-07-17 11:24:43 +0100
commit41bbb474cd4647ee715bc94c21c161d12a20deb4 (patch)
tree193e7e99d988818493b60ea7c321854622cb9d2a
parent003dd162003b6460f0afe4b7c88c758ccb657965 (diff)
parentfd2cf33812e45fce721d47e6ed501bf465159877 (diff)
downloadfhs-dirs-41bbb474cd4647ee715bc94c21c161d12a20deb4.tar.gz
Merge branch 'baserock/pedroalvarez/fix-fhs'
Reviewed-by: Lars Wirzenius
-rw-r--r--issue3
-rw-r--r--passwd2
2 files changed, 1 insertions, 4 deletions
diff --git a/issue b/issue
index 53cf0e3..cc44f25 100644
--- a/issue
+++ b/issue
@@ -7,7 +7,4 @@ For more information on working with Baserock, see:
* http://wiki.baserock.org/quick-start/
* http://wiki.baserock.org/devel-with/
-You can also find commercial support and services related to Baserock
-via http://www.baserock.com/
-
Thank you for trying Baserock.
diff --git a/passwd b/passwd
index 9bff55b..ed43dbd 100644
--- a/passwd
+++ b/passwd
@@ -1,4 +1,4 @@
-root::0:0:Super user:/root:/bin/sh
+root:x:0:0:Super user:/root:/bin/sh
daemon:x:1:1:daemon:/usr/sbin:/bin/sh
sshd:x:50:50::/var/lib/sshd:/bin/false
messagebus:x:105:107::/var/run/dbus:/bin/false