Skip to content

Commit

Permalink
This should complete the --use-efi feature branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Every Packet Matters Bear committed Jan 28, 2024
1 parent 4acbd10 commit 7daa066
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 3 additions & 3 deletions gentooimgr/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ def step9_sync(args, cfg):
def step10_emerge_pkgs(args, cfg):
LOG.info(f":: Step 10: emerge pkgs")
packages = cfg.get("packages", {})
for oneshot_up in packages.get("oneshots", []):
proc = Popen(["emerge", "--oneshot", "--update", oneshot_up])
for one in packages.get("oneshots", []):
proc = Popen(["emerge", "--oneshot", one])
proc.communicate()

for single in packages.get("singles", []):
Expand Down Expand Up @@ -218,7 +218,7 @@ def step10_emerge_pkgs(args, cfg):
cmd += packages.get("additional", [])
cmd += packages.get("bootloader", [])
cmd += args.packages or []
LOG.info(f"\t:: Emerging package list command {cmd}")
LOG.info(f"\t:: Emerging package list command {str(cmd)}")
proc = Popen(cmd)
proc.communicate()
try:
Expand Down
5 changes: 4 additions & 1 deletion gentooimgr/qemu.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,16 @@ def run_image(
qmounts.append("-drive")
qmounts.append(f"file={i},media=cdrom")

name, ext = os.path.splitext(image)
ext = ext.strip(".")

threads = args.threads
cmd = [
"qemu-system-x86_64",
"-enable-kvm",
"-m", str(config.get("memory", 2048)),
"-smp", str(threads),
"-drive", f"file={image},if=virtio,index=0,format=raw",
"-drive", f"file={image},if=virtio,index=0,format={ext}",
"-net", "nic,model=virtio",
"-net", "user",
"-vga", "virtio",
Expand Down

0 comments on commit 7daa066

Please sign in to comment.