]> code.ossystems Code Review - openembedded-core.git/commitdiff
initscripts: Fix regression for requiring /bin/bash
authorJason Wessel <jason.wessel@windriver.com>
Thu, 6 Aug 2015 19:35:53 +0000 (14:35 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 9 Aug 2015 22:14:30 +0000 (15:14 -0700)
It is not possible to create a rootfs with only busybox + initscipts.
This is a result of a regression from commit
a4b53872a8a9a2743299acbff015f7f2750a69d6 (initscripts: add
/sbin/sushell for systemd service debug-shell).

The /sbin/sushell should just use /bin/sh else you end up with a
problem when creating the end image with a failed smart transaction
shown below:

ERROR: Unable to install packages. Command '/proj/bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/smart --quiet --data-dir=/proj/bitbake_build/tmp/work/qemuarma9-wrs-linux-gnueabi/wrlinux-image-glibc-small/1.0-r1/rootfs/var/lib/smart install -y dropbear@armv7at2_vfp hac@armv7at2_vfp run-postinsts@all kernel-modules@qemuarma9 packagegroup-core-boot@qemuarma9' returned 1:
error: Can't install initscripts-1.0-r155.0@armv7at2_vfp: no package provides /bin/bash

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/initscripts/initscripts-1.0/sushell

index 7d96941687f21ef13d64fe219824ae0b6698ecd3..c319d95bf7427dbffca8f59ddd84bed05ce89f03 100644 (file)
@@ -1,5 +1,5 @@
-#!/bin/bash
+#!/bin/sh
 
-[ -z "$SUSHELL" ] && SUSHELL=/bin/bash
+[ -z "$SUSHELL" ] && SUSHELL=/bin/sh
 
 exec $SUSHELL