Skip to content

Commit 32b0581

Browse files
authored
Prepared version 0.2.3
1 parent f5ecfa6 commit 32b0581

23 files changed

+24
-44
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
# EmuGUI (insert version here)
1+
# EmuGUI v0.2.3
22

33
- Updated TESTED.md
4+
- (Hopefully) fixed the Linux-specific argument issue by...
5+
- ...adding an option to let QEMU decide where to boot from
6+
- ...correcting "initrid" to "initrd" in the start VM code
7+
- Corrected a grammar issue in README.md
8+
- Corrected a spelling mistake of "initrd" in the VM creation/editing dialog
9+
- Corrected an issue which caused the VHD exists dialog to appear when you selected the Linux kernel and initrd files
410

511
# EmuGUI v0.2.2
612

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ HDD: 2 GB¹
4040
## Building on Windows
4141

4242
1. Install Python. You can get it from https://www.python.org/
43-
2. Get QEMU at https://qemu.weilnetz.de/w64/ and install it
43+
2. Get QEMU from https://qemu.weilnetz.de/w64/ and install it
4444
3. Install Git. You can get it from https://git-scm.com/downloads
4545
4. Install Visual Studio Code. You can get it from https://code.visualstudio.com/download
4646
5. Open a terminal and type: `git clone https://github.com/Tech-FZ/EmuGUI.git`
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
13 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

dialogExecution/editVirtualMachine.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -314,30 +314,12 @@ def linuxKernelBrowseLocation(self):
314314

315315
if filename:
316316
self.lineEdit_4.setText(filename)
317-
318-
try:
319-
file = open(filename, "r")
320-
file.close()
321-
dialog = VhdAlreadyExists(self)
322-
dialog.exec()
323-
324-
except:
325-
pass
326317

327318
def linuxInitridBrowseLocation(self):
328319
filename, filter = QFileDialog.getOpenFileName(parent=self, caption='Select Linux initrid image', dir='.', filter='IMG files (*.img);;All files (*.*)')
329320

330321
if filename:
331322
self.lineEdit_5.setText(filename)
332-
333-
try:
334-
file = open(filename, "r")
335-
file.close()
336-
dialog = VhdAlreadyExists(self)
337-
dialog.exec()
338-
339-
except:
340-
pass
341323

342324
def win2kHacker(self):
343325
self.stackedWidget.setCurrentIndex(9)

dialogExecution/newVirtualMachine.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -157,30 +157,12 @@ def linuxKernelBrowseLocation(self):
157157

158158
if filename:
159159
self.lineEdit_4.setText(filename)
160-
161-
try:
162-
file = open(filename, "r")
163-
file.close()
164-
dialog = VhdAlreadyExists(self)
165-
dialog.exec()
166-
167-
except:
168-
pass
169160

170161
def linuxInitridBrowseLocation(self):
171162
filename, filter = QFileDialog.getOpenFileName(parent=self, caption='Select Linux initrid image', dir='.', filter='IMG files (*.img);;All files (*.*)')
172163

173164
if filename:
174165
self.lineEdit_5.setText(filename)
175-
176-
try:
177-
file = open(filename, "r")
178-
file.close()
179-
dialog = VhdAlreadyExists(self)
180-
dialog.exec()
181-
182-
except:
183-
pass
184166

185167
def win2kHacker(self):
186168
self.stackedWidget.setCurrentIndex(9)

dialogExecution/startVirtualMachine.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ def start_virtual_machine(self):
168168
elif bootfrom == "d" and cdrom_file != "":
169169
qemu_cmd = qemu_cmd + " -boot d"
170170

171+
elif bootfrom == "Let QEMU decide":
172+
pass
173+
171174
if self.vmSpecs[10] != "":
172175
qemu_cmd = qemu_cmd + f" -L {self.vmSpecs[10]}"
173176

@@ -181,7 +184,7 @@ def start_virtual_machine(self):
181184
qemu_cmd = qemu_cmd + f" -kernel \"{self.vmSpecs[13]}\""
182185

183186
if self.vmSpecs[14] != "":
184-
qemu_cmd = qemu_cmd + f" -initrid \"{self.vmSpecs[14]}\""
187+
qemu_cmd = qemu_cmd + f" -initrd \"{self.vmSpecs[14]}\""
185188

186189
if self.vmSpecs[15] != "":
187190
qemu_cmd = qemu_cmd + f" -append \"{self.vmSpecs[15]}\""

0 commit comments

Comments
 (0)