mirror of
https://github.com/fspc/gbootroot.git
synced 2026-09-11 14:21:38 -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:
@@ -379,7 +379,7 @@ if ( !%option ) {
|
||||
# I removed mem=16M to make sure the optimal mem size was being
|
||||
# chosen for the MTD Emulator
|
||||
# in case the user didn't know any better.
|
||||
print OPTIONS "umid=bootroot root=/dev/ubd0\n";
|
||||
print OPTIONS "umid=bootroot root=/dev/ubd0 mode=tt\n";
|
||||
close(OPTIONS);
|
||||
}
|
||||
|
||||
@@ -821,6 +821,7 @@ else {
|
||||
print " --uml-exclusively=on|off off\n";
|
||||
print " --uml-kernel=path $ENV{HOME}/.gbootroot/" .
|
||||
"uml_kernel/linuxbr\n";
|
||||
print " --uml-options=\"list\" \"\"\n";
|
||||
print " --preserve-ownership=y|n n\n";
|
||||
print " --genext2fs-dir=dir /usr/lib/bootroot/\n";
|
||||
print " --expect-program=path /usr/lib/bootroot/expect_uml\n";
|
||||
|
||||
+3
-2
@@ -48,9 +48,10 @@ sub option {
|
||||
"kernel-version=s",
|
||||
"genext2fs-dir=s", # /usr/lib/bootroot/
|
||||
"no-stdout",
|
||||
"uml-options=s",
|
||||
|
||||
# hidden options for package making or for people who
|
||||
# read the source Luke. Path's relative to `pwd`.
|
||||
# hidden options - well, sort of - for package making or for
|
||||
# people who read the source Luke. Path's relative to `pwd`.
|
||||
|
||||
# home by itself allows the GUI to be tested in it's
|
||||
# immediate directory, this overcomes the need to always
|
||||
|
||||
+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