diff --git a/BootRoot/Options.pm b/BootRoot/Options.pm index f7baa94..e6aba11 100644 --- a/BootRoot/Options.pm +++ b/BootRoot/Options.pm @@ -46,6 +46,7 @@ sub option { "preserve-ownership=s", "kernel=s", "kernel-version=s", + "genext2fs-dir=s", # /usr/lib/bootroot/ "no-stdout", # hidden options for package making or for people who @@ -64,12 +65,11 @@ sub option { # "home" with "template" needs the additional options to # 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 # in Yard $ubd0 "expect-program=s", # i.e. ./expect_uml - "genext2fs=s" # for immediate dir creation - # commandline .. ussually "." ); diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm index 47031dc..3950209 100644 --- a/BootRoot/Yard.pm +++ b/BootRoot/Yard.pm @@ -1602,9 +1602,9 @@ sub create_expect_uml { } else { # 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") !~ /^0$/ ) {