Browse Source

cvs from emacs

master
freesource 22 years ago
parent
commit
50bbbb674c
  1. 6
      BootRoot/Options.pm
  2. 4
      BootRoot/Yard.pm

6
BootRoot/Options.pm

@ -46,6 +46,7 @@ sub option {
"preserve-ownership=s", "preserve-ownership=s",
"kernel=s", "kernel=s",
"kernel-version=s", "kernel-version=s",
"genext2fs-dir=s", # /usr/lib/bootroot/
"no-stdout", "no-stdout",
# hidden options for package making or for people who # hidden options for package making or for people who
@ -64,12 +65,11 @@ sub option {
# "home" with "template" needs the additional options to # "home" with "template" needs the additional options to
# choose immediate dir., for instance, genext2fs. # choose immediate dir., for instance, genext2fs.
"home=s", # path relative to `pwd` usually "." "home=s", # by itself = GUI
# path relative to `pwd` usually "."
"root-fs-helper-location=s", # full path or rel path "root-fs-helper-location=s", # full path or rel path
# in Yard $ubd0 # in Yard $ubd0
"expect-program=s", # i.e. ./expect_uml "expect-program=s", # i.e. ./expect_uml
"genext2fs=s" # for immediate dir creation
# commandline .. ussually "."
); );

4
BootRoot/Yard.pm

@ -1602,9 +1602,9 @@ sub create_expect_uml {
} }
else { else {
# This could have been done with one if statement --freesource # This could have been done with one if statement --freesource
if ( $option{genext2fs} ) { if ( $option{"genext2fs-dir"} ) {
my $command = $option{genext2fs} . "/genext2fs/$main::makefs"; my $command = $option{"genext2fs-dir"} . "$main::makefs";
if ( sys("$command -b $fs_size -d $mount_point -D $device_table $device") !~ if ( sys("$command -b $fs_size -d $mount_point -D $device_table $device") !~
/^0$/ ) { /^0$/ ) {

Loading…
Cancel
Save