Merge pull request #90 from bauen1/misc

Created qemu.sh from qemu32.sh and qemu64.sh

src/Makefile

@@ -27,7 +27,7 @@ clean:
 qemu:
 	@if [ ! -f ./minimal_linux_live.iso ]; then echo "ISO image \"minimal_linux_live.iso\" not found."; exit 1; fi
 	@echo "Launching QEMU..."
-	@if [ "$(shell uname -m)" = "x86_64" ]; then sh qemu64.sh; else sh qemu32.sh; fi
+	@./qemu.sh
 
 src:
 	@echo "Generating source archive..."

src/README

@@ -72,11 +72,9 @@ Currently available overlay bundles:
 * Lua        - The Lua Scripting Language 5.3. Requires ~ 800kb additional
                space. Use the "lua" command to run an interactive lua interpreter
 
-* nweb       - nweb is a very small and easy to use webserver
-               run it using 'nweb 80 /srv/www'
-               to portforward port 8080 on the host to port 80 on the guest (minimal)
-               add '-net nic,model=e1000 -net user,hostfwd=tcp::8080-:80' to the cmd in
-               qemu64.sh and qemu32.sh
+* nweb       - nweb is a very small and easy to use webserver, it is run automatically on port 80
+               to portforward port 80 from the guest (minimal) to port 8080 on the host add
+               '-net nic,model=e1000 -net user,hostfwd=tcp::8080-:80' to 'cmd' in qemu.sh
 
 * dhcp       - DHCP and DNS functionality
 

src/minimal_overlay/bundles/dropbear/01_get.sh

@@ -22,7 +22,7 @@ cd $MAIN_SRC_DIR/source/overlay
 
 if [ ! "$USE_LOCAL_SOURCE" = "true" ] ; then
   # Downloading Dropbear source bundle file. The '-c' option allows the download to resume.
-  echo "Downloading Links source bundle from $DOWNLOAD_URL"
+  echo "Downloading Dropbear source bundle from $DOWNLOAD_URL"
   wget -c $DOWNLOAD_URL
 else
   echo "Using local Dropbear source bundle $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE"

src/minimal_overlay/bundles/lua/01_get.sh

@@ -22,7 +22,7 @@ cd $MAIN_SRC_DIR/source/overlay
 
 if [ ! "$USE_LOCAL_SOURCE" = "true" ] ; then
   # Downloading the Lua bundle file. The '-c' option allows the download to resume.
-  echo "Downloading the Lua source bundle from $DOWNLOAD_URL"
+  echo "Downloading Lua source bundle from $DOWNLOAD_URL"
   wget -c $DOWNLOAD_URL
 else
   echo "Using local Lua source bundle $MAIN_SRC_DIR/source/overlay/$ARCHIVE_FILE"

src/qemu.sh

@@ -10,7 +10,7 @@
 # If you get kernel panic with message "No working init found", then try to
 # increase the RAM from 128M to 256M.
 
-cmd="qemu-system-i386 -m 128M -cdrom minimal_linux_live.iso -boot d -vga std"
+cmd="qemu-system-$(uname -m) -m 128M -cdrom minimal_linux_live.iso -boot d -vga std"
 
 if [ "$1" = "-hdd" -o "$1" = "-h" ] ; then
   echo "Starting QEMU with attached ISO image and hard disk."

src/qemu64.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Use this script without arguments to run the generated ISO image with QEMU.
-# If you pass '-hdd' or '-h' the virtual hard disk 'hdd.img' will be attached.
-# Note that this virtual hard disk has to be created in advance. You can use
-# the script 'generate_hdd.sh' to generate the hard disk image file. Once you
-# have hard disk image, you can use it as overlay device and persist all your
-# changes. See the '.config' file for more information on the overlay support.
-#
-# If you get kernel panic with message "No working init found", then try to
-# increase the RAM from 128M to 256M.
-
-cmd="qemu-system-x86_64 -m 128M -cdrom minimal_linux_live.iso -boot d -vga std"
-
-if [ "$1" = "-hdd" -o "$1" = "-h" ] ; then
-  echo "Starting QEMU with attached ISO image and hard disk."
-  $cmd -hda hdd.img
-else
-  echo "Starting QEMU with attached ISO image."
-  $cmd
-fi