1.1 --- a/uml-do Thu May 26 23:55:42 2011 +0200
1.2 +++ b/uml-do Mon Jul 11 02:16:57 2011 +0200
1.3 @@ -1,25 +1,23 @@
1.4 -#!/bin/bash
1.5 -# Usage: uml-enter <memory> [ <command and options> ]
1.6 +#!/bin/sh
1.7
1.8 # Configuration:
1.9 if [ -e userinstall-defaults-uml ]; then
1.10 - source userinstall-defaults-uml
1.11 + . "$PWD/userinstall-defaults-uml"
1.12 elif [ -e /etc/default/userinstall-uml ]; then
1.13 - source /etc/default/userinstall-uml
1.14 + . /etc/default/userinstall-uml
1.15 else
1.16 - echo "No defaults found for userinstall (UML)."
1.17 + echo "No defaults found for userinstall (UML)." 1>&2
1.18 exit 1
1.19 fi
1.20
1.21 +PROGNAME=`basename "$0"`
1.22 +
1.23 if [ ! "$1" ]; then
1.24 - echo "$0 <memory>"
1.25 + echo "Usage: $PROGNAME <memory-with-unit>" 1>&2
1.26 exit 1
1.27 fi
1.28
1.29 -export IMAGE="$UMLROOT/rootfs"
1.30 -export SWAPIMAGE="$UMLROOT/swap"
1.31 -export UML_MEMORY="$1"
1.32 -export THIS_DIR="`dirname $0`"
1.33 +UML_MEMORY="$1"
1.34
1.35 # Discard the memory argument.
1.36
1.37 @@ -27,12 +25,12 @@
1.38
1.39 # Test for networking.
1.40
1.41 -if [ "$1" == '--net' ]; then
1.42 - export UML_NETWORKING="$NETDEVICE=tuntap,$TUNDEVICE,fe:fd:0:0:0:1,$HOSTADDRESS"
1.43 +if [ "$1" = '--net' ]; then
1.44 + UML_NETWORKING="$NETDEVICE=tuntap,$TUNDEVICE,fe:fd:0:0:0:1,$HOSTADDRESS"
1.45 xhost +"$GUESTADDRESS"
1.46 shift 1
1.47 fi
1.48
1.49 # Now we start the virtual machine...
1.50
1.51 -"$THIS_DIR/linux" ubd0="$IMAGE" ubd1="$SWAPIMAGE" mem="$UML_MEMORY" "$UML_NETWORKING" $*
1.52 +./linux ubd0="$IMAGE" ubd1="$SWAPIMAGE" mem="$UML_MEMORY" "$UML_NETWORKING" $*