From 82235e5bd09e81a88c33cbf5069ff1e5fc2e9210 Mon Sep 17 00:00:00 2001
From: rick-masters <grick23@gmail.com>
Date: Wed, 10 Jan 2024 18:03:50 +0000
Subject: [PATCH] Account for int and NoneType in string concatenations.

---
 lib/generator.py |  2 +-
 rootfs.py        | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/generator.py b/lib/generator.py
index 0f16e2f..60690fc 100755
--- a/lib/generator.py
+++ b/lib/generator.py
@@ -73,7 +73,7 @@ class Generator():
             self.target_dir = os.path.join(self.target_dir, 'disk')
             target.add_disk("disk",
                             filesystem="ext3",
-                            size=(target_size + "M") if target_size else "16G",
+                            size=(str(target_size) + "M") if target_size else "16G",
                             bootable=True)
             target.mount_disk("disk", "disk")
             self.external_dir = os.path.join(self.target_dir, 'external')
diff --git a/rootfs.py b/rootfs.py
index 9919100..a6e2419 100755
--- a/rootfs.py
+++ b/rootfs.py
@@ -245,17 +245,24 @@ print(shutil.which('chroot'))
         if args.kernel:
             generator.prepare(target, using_kernel=True, target_size=size)
 
-            run(args.qemu_cmd,
+            arg_list = [
                 '-enable-kvm',
                 '-m', str(args.qemu_ram) + 'M',
                 '-smp', str(args.cores),
                 '-no-reboot',
-                '-drive', 'file=' + target.get_disk("disk") + ',format=raw',
-                '-drive', 'file=' + target.get_disk("external") + ',format=raw',
+                '-drive', 'file=' + target.get_disk("disk") + ',format=raw'
+            ]
+            if target.get_disk("external") is not None:
+                arg_list += [
+                    '-drive', 'file=' + target.get_disk("external") + ',format=raw',
+                ]
+            arg_list += [
                 '-nic', 'user,ipv6=off,model=e1000',
                 '-kernel', args.kernel,
                 '-nographic',
-                '-append', 'console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw')
+                '-append', 'console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw'
+            ]
+            run(args.qemu_cmd, *arg_list)
         else:
             generator.prepare(target, kernel_bootstrap=True, target_size=size)
             arg_list = [