Mercurial > hg > aboriginal
changeset 415:acb61c298000
Make setup script reentrant, don't require preset PATH. Based on changes by Vladimir Dronnikov.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 20 Oct 2008 18:02:21 -0500 |
parents | 42faea138734 |
children | 4a140cf3cfb2 |
files | sources/native/bin/qemu-setup.sh |
diffstat | 1 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/sources/native/bin/qemu-setup.sh Sun Oct 19 02:47:44 2008 -0500 +++ b/sources/native/bin/qemu-setup.sh Mon Oct 20 18:02:21 2008 -0500 @@ -7,18 +7,27 @@ # running the results wants /lib/ld-uClibc.so.0, so set up some directories # and symlinks to let you easily compile source packages. +# Add /tools to $PATH if it's not there + +if [ -d tools/bin ] && [ -z "$(echo :$PATH | tools/bin/grep :/tools/bin)" ] +then + [ -z "$PATH" ] && PATH=/tools/bin || PATH="$PATH":/tools/bin + export PATH +fi + # Create some temporary directories at the root level -mkdir -p /{proc,sys,dev,etc,tmp} -[ ! -e /bin ] && ln -s /tools/bin /bin -[ ! -e /lib ] && ln -s /tools/lib /lib +mkdir -p {proc,sys,dev,etc,tmp} +[ ! -e bin ] && ln -s tools/bin bin +[ ! -e lib ] && ln -s tools/lib lib +[ ! -e usr ] && ln -s tools usr # Populate /dev -mount -t sysfs /sys /sys -mount -t tmpfs /dev /dev +mountpoint -q sys || mount -t sysfs sys sys +mountpoint -q dev || mount -t tmpfs dev dev mdev -s # Mount /proc is there -mount -t proc /proc /proc +mountpoint -q proc || mount -t proc proc proc # If we're running under qemu, do some more setup if [ `echo $0 | sed 's@.*/@@'` == "qemu-setup.sh" ]