[gnome-boxes] unattended-installer: Extract boot files before injection
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] unattended-installer: Extract boot files before injection
- Date: Fri, 1 Aug 2014 10:45:03 +0000 (UTC)
commit d7bbc26c0ebf6b44f47402d583c4a64a5705f4e2
Author: Lasse Schuirmann <lasse schuirmann net>
Date: Tue May 20 18:03:15 2014 +0200
unattended-installer: Extract boot files before injection
This moves the extraction of the boot files to be before the injection
of the automated installation scripts. This is necessary since in some
cases (e.g. Debian-based OSes) these scripts will be placed within
these boot files.
https://bugzilla.gnome.org/show_bug.cgi?id=730640
src/unattended-installer.vala | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index 0e894ce..a8f279c 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -141,6 +141,13 @@ private class Boxes.UnattendedInstaller: InstallerMedia {
try {
yield create_disk_image (cancellable);
+ //FIXME: Linux-specific. Any generic way to achieve this?
+ if (os_media.kernel_path != null && os_media.initrd_path != null) {
+ var extractor = new ISOExtractor (device_file);
+
+ yield extract_boot_files (extractor, cancellable);
+ }
+
foreach (var unattended_file in unattended_files)
yield unattended_file.copy (cancellable);
@@ -159,13 +166,6 @@ private class Boxes.UnattendedInstaller: InstallerMedia {
yield exec (argv, cancellable);
debug ("Created secondary disk image '%s'...", secondary_disk_path);
}
-
- //FIXME: Linux-specific. Any generic way to achieve this?
- if (os_media.kernel_path != null && os_media.initrd_path != null) {
- var extractor = new ISOExtractor (device_file);
-
- yield extract_boot_files (extractor, cancellable);
- }
} catch (GLib.Error error) {
clean_up ();
// An error occurred when trying to setup unattended installation, but it's likely that a
non-unattended
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]