summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-07-30 14:53:46 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-07-30 17:07:50 +0100
commite5f17a197beb10d0bfca3f7a9573d392af37a3eb (patch)
tree4262d133b5573ff942146cc9ae3b89968c2d793f
parente256a2fd78042b9ed79b06ef0757ffb25221d311 (diff)
downloadsystemd-e5f17a197beb10d0bfca3f7a9573d392af37a3eb.tar.gz
systemd: fix debug-shell to use /bin/sh
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.
-rw-r--r--systemd.morph1
1 files changed, 1 insertions, 0 deletions
diff --git a/systemd.morph b/systemd.morph
index 6c0ee7f233..11e6d3ce2d 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\""
]
}