Am 18.01.2014 14:38, schrieb Marcus Schäfer:
>> Other than that, I have a local experimental KIWI patch adding the
>> bootargs quotes and changing the partition type that I would've liked to
>> test.
>
> if you like I can give it a try too ?
My local patch is two-fold:
diff --git a/modules/KIWIBoot.pm b/modules/KIWIBoot.pm
index 254efc4..05ba95a 100644
--- a/modules/KIWIBoot.pm
+++ b/modules/KIWIBoot.pm
@@ -5211,9 +5211,9 @@ sub setupBootLoaderConfiguration {
$kiwi -> failed ();
return;
} elsif (($topic=~ /^KIWI USB/)||($imgtype=~
/vmx|oem|split/)) {
- print $FD "setenv bootargs $cmdline \${append}\n";
+ print $FD "setenv bootargs '$cmdline \${append}'\n";
} else {
- print $FD "setenv bootargs $cmdline \${append}\n"
+ print $FD "setenv bootargs '$cmdline \${append}'\n"
}
$FD -> close();
$kiwi -> done();
This is placing quotes around the bootargs value - to make this a proper
patch you would need to escape any quotes within $cmdline, which I was
unsure how to do in Perl. ;)
@@ -6049,10 +6049,11 @@ sub getGeometry {
return;
}
if (($firmware eq "efi") ||
- ($firmware eq "uefi") ||
- ($firmware eq "vboot")
- ) {
+ ($firmware eq "uefi")) {
$label = 'gpt';
+ } elsif ($firmware eq "vboot") {
+# $label = 'gpt_sync_mbr';
+ $label = 'msdos';
}
$status = KIWIQX::qxx ("$parted_exec -s $disk mklabel $label 2>&1");
$result = $? >> 8;
As suggested by you, this is code to try either gpt_sync_mbr or msdos
partitioning. The ioctl issue applied to all of uefi, gpt_sync_mbr and
msdos though.
If needed, I believe $loader would be there to be checked, too.
Cheers,
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
--
To unsubscribe, e-mail: [email protected]
To contact the owner, e-mail: [email protected]
