diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-09-22 19:47:26 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-22 19:47:26 +0000 |
| commit | 5e19196797ce53fe8fe7a845bccea825e401e51c (patch) | |
| tree | 18383ab61a026fae7e37c7f1a8d02b26753219e5 /packages/openslug-init | |
| parent | 4ab3322bcc988a6a0c0c1d2236d73e20b01dcf2e (diff) | |
ucslugc, openslug-init: changes to ensure compatibility with new thumb compilation
Some package builds removed from ucslugc because they are not compatible
with the thumb build. openslug-init changed to use the target chroot, not the
initrd one, because this actually works when the initrd and target are
different operating systems.
Diffstat (limited to 'packages/openslug-init')
| -rwxr-xr-x | packages/openslug-init/openslug-init-0.10/functions | 6 | ||||
| -rw-r--r-- | packages/openslug-init/openslug-init_0.10.bb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions index 55f3397462..e90f03aead 100755 --- a/packages/openslug-init/openslug-init-0.10/functions +++ b/packages/openslug-init/openslug-init-0.10/functions @@ -165,7 +165,11 @@ swivel() { # (it's on fd 10). # init closes all file descriptors, there's no point # supplying it with fds. - exec "$2/usr/sbin/chroot" . bin/sh -c "\ + # NOTE: this used to use $2/usr/sbin/chroot, however on + # linux / is already . when the command is executed + # therefore it is essential to use the local (new root) + # chroot to ensure it gets the correct shared libraries. + exec usr/sbin/chroot . bin/sh -c "\ test -x sbin/init && exec sbin/init test -x etc/init && exec etc/init test -x bin/init && exec bin/init diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb index e26b118a6a..1248cc22da 100644 --- a/packages/openslug-init/openslug-init_0.10.bb +++ b/packages/openslug-init/openslug-init_0.10.bb @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r41" +PR = "r42" SRC_URI = "file://linuxrc \ file://boot/flash \ |