diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-30 14:16:41 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-30 14:16:41 +0000 |
commit | 55c2ca26b579d976e5c43e3e519b9ce9c3b78480 (patch) | |
tree | 8085ca2ae04cde1f67c95007ad3e332010b05733 | |
parent | f14d723658bc09a9355c5c6b9c9273870a759785 (diff) | |
download | fhs-dirs-55c2ca26b579d976e5c43e3e519b9ce9c3b78480.tar.gz |
Remove init.d and rcS, add shadow and permissions
init.d and rcS are not needed by systemd, so remove them.
Permissions should have been set correctly in the first place.
shadow is needed for busybox's sulogin to work correctly, which in
turn is needed for systemd's emergency console, which is needed when
an fstab entry is bad.
-rw-r--r-- | fhs-dirs.morph | 10 | ||||
-rw-r--r-- | inittab | 9 | ||||
-rw-r--r-- | rcS | 15 | ||||
-rw-r--r-- | shadow | 1 |
4 files changed, 5 insertions, 30 deletions
diff --git a/fhs-dirs.morph b/fhs-dirs.morph index a954979..c19281c 100644 --- a/fhs-dirs.morph +++ b/fhs-dirs.morph @@ -5,12 +5,10 @@ "install-commands": [ "sh ./create-fhs-dirs \"$DESTDIR\"", "sh ./create-dev-nodes \"$DESTDIR\"", - "install passwd \"$DESTDIR/etc/passwd\"", - "install inittab \"$DESTDIR/etc/inittab\"", - "install interfaces \"$DESTDIR/etc/network/interfaces\"", - "install group \"$DESTDIR/etc/group\"", - "install -d \"$DESTDIR/etc/init.d\"", - "install -m 744 rcS \"$DESTDIR/etc/rcS\"", + "install -m 644 passwd \"$DESTDIR/etc/passwd\"", + "install -m 600 shadow \"$DESTDIR/etc/shadow\"", + "install -m 644 interfaces \"$DESTDIR/etc/network/interfaces\"", + "install -m 644 group \"$DESTDIR/etc/group\"", "install -m 644 ld.so.conf \"$DESTDIR/etc/ld.so.conf\"", "echo baserock > \"$DESTDIR\"/etc/hostname" ] diff --git a/inittab b/inittab deleted file mode 100644 index ea26cf5..0000000 --- a/inittab +++ /dev/null @@ -1,9 +0,0 @@ -::sysinit:/etc/rcS - -::askfirst:/bin/cttyhack /bin/sh -::respawn:/sbin/getty -L ttyS0 9600 vt100 - -::ctrlaltdel:/sbin/reboot -::shutdown:/sbin/swapoff -a -::shutdown:/bin/umount -a -r -::restart:/sbin/init @@ -1,15 +0,0 @@ -#!/bin/sh -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mkdir -p /dev/pts -mount -t devpts devpts /dev/pts - -echo /sbin/mdev >/proc/sys/kernel/hotplug -mdev -s - -hostname -F /etc/hostname - -ifdown eth0 -ifup eth0 - -run-parts -a start /etc/init.d @@ -0,0 +1 @@ +root:::::::: |