mirror of
https://github.com/fspc/gbootroot.git
synced 2026-09-08 12:51:40 -04:00
Tested gbootroot-nest1 within a uml, nice, will have to tweak the
logic for cmdline only to set-up .gbootroot* properly, and the logic
pertaining to mode={tt,skas}, but other than that things are working
nicely. Will have to come out with a new make-debian-x11 package, but
then again will need to come out with a new root_fs representing the
nesting changes, too.
This commit is contained in:
+3
-3
@@ -1538,7 +1538,7 @@ sub create_expect_uml {
|
||||
}
|
||||
|
||||
my $ubd1 = "ubd1=$device";
|
||||
my $options = "root=/dev/ubd0"; # need to keep this 1
|
||||
my $options = "root=/dev/ubd0 " . $option{"uml-options"};
|
||||
my $filesystem;
|
||||
if ( $fs_type eq "genext2fs" ) {
|
||||
$filesystem = "mke2fs -m0";
|
||||
@@ -1552,12 +1552,12 @@ sub create_expect_uml {
|
||||
my $command_line;
|
||||
|
||||
if ( $option{"uml-kernel"} ) {
|
||||
$command_line = "$expect_program $ubd0 $ubd1 $options " .
|
||||
$command_line = "$expect_program $ubd0 $ubd1 \"$options\" " .
|
||||
"$mount_point $preserve_ownership " .
|
||||
$option{"uml-kernel"} . " $filesystem";
|
||||
}
|
||||
else {
|
||||
$command_line = "$expect_program $ubd0 $ubd1 $options " .
|
||||
$command_line = "$expect_program $ubd0 $ubd1 \"$options\" " .
|
||||
"$mount_point $preserve_ownership " .
|
||||
BootRoot::BootRoot::uml_kernel() . " $filesystem";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user