mirror of
https://github.com/fspc/gbootroot.git
synced 2026-09-11 14:21:38 -04:00
Fixed a bug which causes lock-ups during seconf fs creation with
EXPECT, and a bug where .options wasn't being written to disk or the path was being altered when a variable was being altered. This also gets things trim and ready with the coolest discovery being that a nested kernel can run on the host and in it's nest. I'll be testing other nested levels to discover how far this can go and be incorporated in one package which is nice.
This commit is contained in:
@@ -74,8 +74,9 @@ my $home_uml_kernel;
|
||||
$option{gui_mode} ? ($home_uml_kernel = "$home/user-mode-linux/usr/bin/")
|
||||
: ($home_uml_kernel = "$home/uml_kernel/");
|
||||
sub uml_kernel {
|
||||
$home_uml_kernel = $home_uml_kernel . "linuxbr" if !$option{"uml-kernel"};
|
||||
return $home_uml_kernel;
|
||||
my $home_umlk = $home_uml_kernel;
|
||||
$home_umlk = $home_umlk . "linuxbr" if !$option{"uml-kernel"};
|
||||
return $home_umlk;
|
||||
}
|
||||
|
||||
my $modules_directory = "/lib/modules";
|
||||
@@ -363,7 +364,7 @@ if ( !%option || $option{gui_mode} ) {
|
||||
# /tmp
|
||||
home_builder($tmp1);
|
||||
|
||||
if ( !( $option{home} || $option{help} || $option{h} ) ) {
|
||||
if ( !( $option{help} || $option{h} ) ) {
|
||||
|
||||
# $HOME/.gbootroot/root_filesystem
|
||||
home_builder($home_rootfs);
|
||||
@@ -1545,7 +1546,10 @@ sub uml_box {
|
||||
$eab2 = Gtk::Combo->new();
|
||||
$table_uml->attach($eab2,1,5,1,2,
|
||||
['expand','fill'],['fill','shrink'],0,0); # 1,3
|
||||
open(OPTIONS,"$home_uml_kernel/.options");
|
||||
my $error;
|
||||
open(OPTIONS,"$home_uml_kernel/.options") or
|
||||
($error = error("$home_uml_kernel/.options: $!\n"));
|
||||
return "ERROR"if $error && $error eq "ERROR";
|
||||
my @initial_options = <OPTIONS>;
|
||||
close(OPTIONS); chomp @initial_options;
|
||||
$eab2->entry->set_text($initial_options[0]);
|
||||
|
||||
@@ -1591,6 +1591,9 @@ sub create_expect_uml {
|
||||
while (Gtk->events_pending) { Gtk->main_iteration; }
|
||||
}
|
||||
|
||||
# Pretty important, probably should check for errors, too.
|
||||
close(EXPECT);
|
||||
|
||||
# This will just keep appending, but that's o.k.
|
||||
|
||||
if ( $fs_type eq "mkcramfs" || $fs_type eq "genromfs" ||
|
||||
|
||||
Reference in New Issue
Block a user