diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-11-04 17:04:58 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-11-04 17:04:58 +0000 |
| commit | 301986e992e31b693c5c7c91667fa07c57dcf172 (patch) | |
| tree | 0d35645ae6fd544b75e4583d18236de0c491fba0 /qemu-support | |
| parent | fc3a35fcf788c34aed3a0289411cf6e53967b103 (diff) | |
2011-11-04 Joel Sherrill <joel.sherrilL@OARcorp.com>
* qemu-nic: Better error message when not root and want networking.
Increase memory.
Diffstat (limited to 'qemu-support')
| -rw-r--r-- | qemu-support/ChangeLog | 5 | ||||
| -rwxr-xr-x | qemu-support/qemu-nic | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/qemu-support/ChangeLog b/qemu-support/ChangeLog index 67800be..5c8fc23 100644 --- a/qemu-support/ChangeLog +++ b/qemu-support/ChangeLog @@ -1,3 +1,8 @@ +2011-11-04 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * qemu-nic: Better error message when not root and want networking. + Increase memory. + 2011-03-03 Joel Sherrill <joel.sherrill@oarcorp.com> * qemu-ifup: VirtualBox uses 10.0.x.x for its eth0 so we need to switch diff --git a/qemu-support/qemu-nic b/qemu-support/qemu-nic index 828d16b..748149f 100755 --- a/qemu-support/qemu-nic +++ b/qemu-support/qemu-nic @@ -57,14 +57,18 @@ case ${nic} in ;; esac -ARGS="${MODEL} -m 64 \ +ARGS="${MODEL} -m 128 \ -boot a -fda ${QEMUDIR}/qemu/pc386_fda \ -hda fat:${QEMUDIR}/qemu/hd --no-reboot" -if [ ${nic} != "none" -a $EUID -eq 0 ] ; then - NICARGS="\ - -net nic,model=${NIC} \ - -net nic,macaddr=00:80:7F:22:61:77 \ - -net tap,script=/etc/qemu-ifup" +if [ ${nic} != "none" ] ; then + if [ $EUID -eq 0 ] ; then + NICARGS="\ + -net nic,model=${NIC} \ + -net nic,macaddr=00:80:7F:22:61:77 \ + -net tap,script=/etc/qemu-ifup" + else + echo "*** You are not root -- ignoring request for NIC ***" + fi if [ ! -r /etc/qemu-ifup ] ; then echo /etc/qemu-ifup not found |