If selinux is installed systemd will use /sbin/sushell, otherwise it will use /bin/bash. This is inappropriate for us, since it would require bash in every image, so make the morphology do the @sushell@ substitution. --- systemd.morph | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/systemd.morph b/systemd.morph index 6c0ee7f..11e6d3c 100644 --- a/systemd.morph +++ b/systemd.morph @@ -11,6 +11,7 @@ "mkdir -p \"$DESTDIR\"/sbin", "ln -s /lib/systemd/systemd \"$DESTDIR\"/sbin/init", "for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl \"$DESTDIR/sbin/$f\"; done", + "sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >\"$DESTDIR/etc/systemd/system/debug-shell.service\"", "sed -r -e '/Options=/s/,?strictatime//' \"$DESTDIR/lib/systemd/system/tmp.mount\" >\"$DESTDIR/etc/systemd/system/tmp.mount\"" ] } -- 1.7.5.4

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. --- fhs-dirs.morph | 10 ++++------ inittab | 9 --------- rcS | 15 --------------- shadow | 1 + 4 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 inittab delete mode 100644 rcS create mode 100644 shadow 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 diff --git a/rcS b/rcS deleted file mode 100644 index 95f1754..0000000 --- a/rcS +++ /dev/null @@ -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 diff --git a/shadow b/shadow new file mode 100644 index 0000000..6a17be6 --- /dev/null +++ b/shadow @@ -0,0 +1 @@ +root:::::::: -- 1.7.5.4

This is needed for the pkg-config file to be installed, which is needed by systemd. --- pciutils.morph | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pciutils.morph b/pciutils.morph index 5997e93..520a27d 100644 --- a/pciutils.morph +++ b/pciutils.morph @@ -11,6 +11,7 @@ "make" ], "install-commands": [ - "make DESTDIR=\"$DESTDIR\" install" + "make DESTDIR=\"$DESTDIR\" install", + "make DESTDIR=\"$DESTDIR\" install-lib" ] } -- 1.7.5.4