[gnome-boxes/gnome-3-8] Revert "installer: Use command line info from libosinfo"
- From: Christophe Fergeau <teuf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/gnome-3-8] Revert "installer: Use command line info from libosinfo"
- Date: Thu, 18 Apr 2013 14:40:49 +0000 (UTC)
commit 9c0a9ddc69305d4c3e8a24b13516cfc3ac69f3ef
Author: Christophe Fergeau <cfergeau redhat com>
Date: Thu Apr 18 16:23:16 2013 +0200
Revert "installer: Use command line info from libosinfo"
This reverts commit 755b24fe93a6c5bde78bc92ffaceb4858a513781.
I've pushed this by mistake to the gnome-3-8 branc
src/unattended-installer.vala | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index f9de200..0b49cd8 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -292,15 +292,17 @@ private class Boxes.UnattendedInstaller: InstallerMedia {
return properties;
}
- public override void set_direct_boot_params (GVirConfig.DomainOs domain_os) {
+ public override void set_direct_boot_params (GVirConfig.DomainOs os) {
if (kernel_file == null || initrd_file == null)
return;
+ // FIXME: This commandline should come from libosinfo somehow
var script = scripts.get_nth (0) as InstallScript;
+ var cmdline = "ks=hd:sda:/" + script.get_expected_filename ();
- domain_os.set_kernel (kernel_file.get_path ());
- domain_os.set_ramdisk (initrd_file.get_path ());
- domain_os.set_cmdline (script.generate_command_line (os, config));
+ os.set_kernel (kernel_file.get_path ());
+ os.set_ramdisk (initrd_file.get_path ());
+ os.set_cmdline (cmdline);
}
public override void clean_up () {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]