bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2026-09-08 12:51:40 -04:00
Code Issues Projects Releases Wiki Activity

This gets everything working properly. Now --home works properly both

Browse Source 
for gui-mode and cli, and all executables can be properly specified.

Ex:

./gbootroot --home . --template Example-Mini.yard --uml-exclusively on
--expect-program ./expect_uml
--uml-kerneluser-mode-linux/usr/bin/linux --root-fs-helper
root_filesystem/root_fs_helper

./gbootroot --home . --template Example-Mini.yard --genext2fs-dir
genext2fs/ --filesystem-command "genext2fs -z -r0"
This commit is contained in:
freesource
2002-12-11 18:45:36 +00:00
parent 29e9e73202
commit 953854a5a4
4 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BootRoot/Yard.pm
+16 -6
View File
@@ -1,4 +1,4 @@
###########################################################################
##########################################################################
##
## Yard.pm combining
## MAKE_ROOT_FS, CHECK_ROOT_FS, and YARD_UTILS.PL by Tom Fawcett
@@ -1529,8 +1529,8 @@ sub create_expect_uml {
my $ubd0;
if ( !$option{gui_mode} ) {
$option{"root-fs-helper-location"} ?
($ubd0 = "ubd0=" . $option{"root-fs-helper-location"}) :
$option{"root-fs-helper"} ?
($ubd0 = "ubd0=" . $option{"root-fs-helper"}) :
($ubd0 = "ubd0=/usr/lib/bootroot/root_filesystem/root_fs_helper");
}
else {
@@ -1548,10 +1548,20 @@ sub create_expect_uml {
}
my $x_count = 1;
my $command_line;
if ( $option{"uml-kernel"} ) {
$command_line = "$expect_program $ubd0 $ubd1 $options " .
"$mount_point $preserve_ownership " .
$option{"uml-kernel"} . " $filesystem";
}
else {
$command_line = "$expect_program $ubd0 $ubd1 $options " .
"$mount_point $preserve_ownership " .
BootRoot::BootRoot::uml_kernel() . " $filesystem";
}
my $command_line = "$expect_program $ubd0 $ubd1 $options " .
"$mount_point $preserve_ownership " .
$option{"uml-kernel"} . " $filesystem";
info(0,"\nUsing helper root_fs to $fs_type the filesystem:\n\n");
info(0,"$command_line\n\n");