summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-22 13:04:58 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2013-02-22 13:04:58 +0000
commita221efa4832b03a3133734def344a1cda53ed324 (patch)
tree158b47a9a7c53faa4b826d7c7dd7c55906dcb45b
parentd8dfd88661da6d99970cb66c5799ab346380a7a3 (diff)
parent6ad1347bd213dcb6d4e9096370d7177aaa243699 (diff)
downloadfhs-dirs-a221efa4832b03a3133734def344a1cda53ed324.tar.gz
Merge remote-tracking branch 'origin/baserock/genivi-baseline-rebase'
-rw-r--r--fhs-dirs.morph1
-rw-r--r--group4
-rw-r--r--passwd1
-rw-r--r--services16
4 files changed, 21 insertions, 1 deletions
diff --git a/fhs-dirs.morph b/fhs-dirs.morph
index 169cca1..fcf3bf9 100644
--- a/fhs-dirs.morph
+++ b/fhs-dirs.morph
@@ -11,6 +11,7 @@
"install -m 644 group \"$DESTDIR/etc/group\"",
"install -m 644 ld.so.conf \"$DESTDIR/etc/ld.so.conf\"",
"install -m 644 issue \"$DESTDIR/etc/issue\"",
+ "install -m 644 services \"$DESTDIR/etc/services\"",
"echo baserock > \"$DESTDIR\"/etc/hostname"
]
}
diff --git a/group b/group
index f0e803d..ec2fee1 100644
--- a/group
+++ b/group
@@ -8,10 +8,12 @@ dialout:x:20:
cdrom:x:24:
floppy:x:25:
tape:x:26:
-audio:x:29:
+audio:x:29:pulse
utmp:x:43:
video:x:44:
sshd:x:50:sshd
lock:x:54:
messagebus:x:107:
+pulse::109:
+pulse-access::110:root
nogroup:x:65534:nobody
diff --git a/passwd b/passwd
index edc07d5..9bff55b 100644
--- a/passwd
+++ b/passwd
@@ -2,4 +2,5 @@ root::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
+pulse::108:109:Pulse Audio:/var/run/pulse:/bin/false
nobody:x:65534:65534:nobody:/nonexistent:/bin/false
diff --git a/services b/services
new file mode 100644
index 0000000..f56df76
--- /dev/null
+++ b/services
@@ -0,0 +1,16 @@
+# Minimal services file
+#
+# The traditional full list of services, available from this package:
+# http://sethwklein.net/iana-etc
+# is 188KB completely stripped, and doesn't belong in /etc anyway.
+#
+# This file is not in Baserock right now, but could happily live in
+# its own chunk, installed to /usr/share (this might require some
+# libc patching to work correctly).
+
+sunrpc 111/tcp portmapper rpcbind
+sunrpc 111/udp portmapper rpcbind
+nfs 2049/tcp nfsd shilp
+nfs 2049/udp nfsd shilp
+nfs 2049/sctp nfsd shilp
+