Mercurial > hg > aboriginal
changeset 330:f9ff71c71f9e
Tweak run-with-home.sh to have a chance of actually working.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Tue, 20 May 2008 03:11:39 -0500 |
| parents | 7a6033813fe5 |
| children | d2820523ee06 |
| files | package-mini-native.sh sources/native/bin/qemu-setup.sh sources/toys/run-with-home.sh |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/package-mini-native.sh Tue May 20 03:09:32 2008 -0500 +++ b/package-mini-native.sh Tue May 20 03:11:39 2008 -0500 @@ -51,9 +51,13 @@ chmod +x ${WORK}/uml-package.sh && linux rootfstype=hostfs rw quiet ARCH=${ARCH} PATH=/bin:/usr/bin:/sbin:/usr/sbin init="${HOSTTOOLS}/oneit -p ${WORK}/uml-package.sh" || dienow +# Provide qemu's common command line options between architectures. The lack +# of ending quotes on -append is intentional, callers append more kernel +# command line arguments and provide their own ending quote. function qemu_defaults() { - echo "-nographic -no-reboot -hda \"$1\" -kernel \"$2\" -append \"$3" + echo "-nographic -no-reboot \$WITH_HDB" \ + "-hda \"$1\" -kernel \"$2\" -append \"$3" } # Call the appropriate emulator. We split out the filesystem, kernel, and
--- a/sources/native/bin/qemu-setup.sh Tue May 20 03:09:32 2008 -0500 +++ b/sources/native/bin/qemu-setup.sh Tue May 20 03:11:39 2008 -0500 @@ -24,7 +24,7 @@ # If there's a /dev/hdb or /dev/sdb, mount it on home [ -b /dev/hdb ] && HOMEDEV=/dev/hdb -[ -b /dev/sdb ] && HOMEDEV=/dev/hdb +[ -b /dev/sdb ] && HOMEDEV=/dev/sdb if [ ! -z "$HOMEDEV" ] then mkdir -p /home
--- a/sources/toys/run-with-home.sh Tue May 20 03:09:32 2008 -0500 +++ b/sources/toys/run-with-home.sh Tue May 20 03:11:39 2008 -0500 @@ -24,9 +24,7 @@ tune2fs -j -c 0 -i 0 "$HDB" fi -export WITH_HOME="-hdb $HDB" +export WITH_HDB="-hdb $HDB" -# Find the directory this script's running out of -"$(readlink -f "$(which $0)" | sed -e 's@\(.*/\).*@\1@')"run-qemu.sh - -#qemu -cpu pentium2 -nographic -hda image-i686.ext2 $ADD_HDB -kernel zImage-i686 -append "rw init=/tools/bin/qemu-setup.sh panic=1 PATH=$DISTCC_PATH_PREFIX/tools/bin $DISTCC_VARS root=/dev/hda console=ttyS0" +# Find the directory this script's running out of and call next script +"$(readlink -f "$(which $0)" | sed -e 's@\(.*/\).*@\1@')"run-emulator.sh