diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-20 20:42:07 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-06-20 20:42:12 +0200 |
| commit | de48a593779faa0ba8a8867c7972e179a0bf7cfd (patch) | |
| tree | f02d3ac4f05aa81ebcbca0b97e6cf38548485f94 /configs | |
| parent | 53afa0a5f8b7a714defc9df01a4aa2669a2f0166 (diff) | |
| download | DistroKit-de48a593779faa0ba8a8867c7972e179a0bf7cfd.tar.gz DistroKit-de48a593779faa0ba8a8867c7972e179a0bf7cfd.tar.xz | |
synchronize arm/i586 run scripts
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'configs')
| -rwxr-xr-x | configs/arm-qemu-2011.01.0/run | 2 | ||||
| -rwxr-xr-x | configs/i586-qemu-2011.01.0/run | 24 |
2 files changed, 23 insertions, 3 deletions
diff --git a/configs/arm-qemu-2011.01.0/run b/configs/arm-qemu-2011.01.0/run index d83fd51..739c9cb 100755 --- a/configs/arm-qemu-2011.01.0/run +++ b/configs/arm-qemu-2011.01.0/run @@ -81,4 +81,4 @@ ${QEMU_EXEC} ${QEMU_NOGRAPHIC} \ -redir tcp:${TELNET_EXTERNAL_PORT}:${PLATFORM_IP}:${TELNET_INTERNAL_PORT} \ -kernel ${PTXDIST_PLATFORMDIR}/images/linuximage \ -hda ${PTXDIST_PLATFORMDIR}/images/hd.img \ - -append "root=/dev/sda1 rw console=ttyAMA0,115200 ro init=/bin/systemd" + -append "root=/dev/sda1 console=ttyAMA0,115200 ro" diff --git a/configs/i586-qemu-2011.01.0/run b/configs/i586-qemu-2011.01.0/run index bfa5d19..a971803 100755 --- a/configs/i586-qemu-2011.01.0/run +++ b/configs/i586-qemu-2011.01.0/run @@ -1,4 +1,8 @@ #!/bin/bash +# +# For some information about how to work with qemu for ARM, please +# refer: http://fedoraproject.org/wiki/Architectures/ARM/HowToQemu + platformconfig=selected_platformconfig # fallback to platformconfig in the same dir as this script @@ -52,13 +56,29 @@ TELNET_INTERNAL_PORT=23 # port QEMU opens at the host side to give access to the ${TELNET_INTERNAL_PORT} TELNET_EXTERNAL_PORT=4444 +if [ -z "${VDE_SOCKET}" ]; then + for dir in $(ls -d /var/run/vde2/*.ctl 2>/dev/null); do + if [ -r "${dir}" ]; then + VDE_SOCKET="${dir}" + fi + done +fi +if [ -n "${VDE_SOCKET}" ]; then + if ${QEMU_EXEC} --help | grep -q -- '-net vde'; then + QEMU_NET="-net vde,vlan=1,sock=${VDE_SOCKET}" + fi +fi +if [ -z "${QEMU_NET}" ]; then + QEMU_NET="-net user,vlan=1" +fi + # do the job ${QEMU_EXEC} ${QEMU_NOGRAPHIC} \ -M ${QEMU_MACHINE} \ -no-reboot \ -net nic,vlan=1 \ - -net user,vlan=1 \ + ${QEMU_NET} \ -redir tcp:${TELNET_EXTERNAL_PORT}:${PLATFORM_IP}:${TELNET_INTERNAL_PORT} \ -kernel ${PTXDIST_PLATFORMDIR}/images/linuximage \ -hda ${PTXDIST_PLATFORMDIR}/images/hd.img \ - -append "root=/dev/sda1 rw console=ttyS0,115200 ro" + -append "root=/dev/sda1 console=ttyS0,115200 ro" |