Skip to content

Commit b054056

Browse files
committed
qemu: Fix Fedora >= 36 qemu support
Fedora 36 and later use BTRFS, which requires different command line args. Also mask the hcn-init service, which fails to start and causes errors. And set the hostname explicitly, otherwise it defaults to localhost. The guest kernel requires BTRFS_FS=y and VFAT_FS=y.
1 parent 3e2de41 commit b054056

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

lib/qemu.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,11 @@ def prepare_cloud_image(self):
237237

238238
if 'ubuntu' in self.cloud_image:
239239
self.cmdline.insert(0, f'root=/dev/vd{cloud_drive}1')
240-
elif 'fedora' in self.cloud_image or 'debian' in self.cloud_image:
240+
elif 'fedora34' in self.cloud_image or 'debian' in self.cloud_image:
241241
self.cmdline.insert(0, f'root=/dev/vd{cloud_drive}2')
242+
elif 'fedora' in self.cloud_image:
243+
self.cmdline.insert(0, 'systemd.mask=hcn-init.service systemd.hostname=fedora')
244+
self.cmdline.insert(0, f'root=/dev/vd{cloud_drive}5 rootfstype=btrfs rootflags=subvol=root')
242245

243246
def cmd(self):
244247
logging.info('Using qemu version %s.%s "%s"' % get_qemu_version(self.qemu_path))

0 commit comments

Comments
 (0)