Allow Bochs users to reboot by clicking the "user" button.

[pintos-anon] / src / utils / pintos

diff --git a/src/utils/pintos b/src/utils/pintos
index 0b48be11ed64af5d79e15f55617b9385eaa96fef..c71ebc20ab4ec0b31bc29bf72e298c2ca48e1678 100755 (executable)
--- a/src/utils/pintos
+++ b/src/utils/pintos
@@ -259,7 +259,8 @@ sub prepare_scratch_disk {
          foreach @puts;
 
        # Write end-of-archive marker.
-       print { $disks{SCRATCH}{HANDLE} } "\0" x 1024;
+       write_fully ($disks{SCRATCH}{HANDLE}, $disks{SCRATCH}{FILE_NAME},
+                    "\0" x 1024);
     }
 
     # Make sure the scratch disk is big enough to get big files.
@@ -472,13 +473,14 @@ sub run_bochs {
     # Write bochsrc.txt configuration file.
     open (BOCHSRC, ">", "bochsrc.txt") or die "bochsrc.txt: create: $!\n";
     print BOCHSRC <<EOF;
-romimage: file=\$BXSHARE/BIOS-bochs-latest, address=0xf0000
+romimage: file=\$BXSHARE/BIOS-bochs-latest
 vgaromimage: file=\$BXSHARE/VGABIOS-lgpl-latest
 boot: disk
 cpu: ips=1000000
 megs: $mem
 log: bochsout.txt
 panic: action=fatal
+user_shortcut: keys=ctrlaltdel
 EOF
     print BOCHSRC "gdbstub: enabled=1\n" if $debug eq 'gdb';
     if ($realtime) {