From 4c90daea573227150c3111d255d2cb88bbaa55f7 Mon Sep 17 00:00:00 2001 From: freesource Date: Wed, 20 Nov 2002 06:18:00 +0000 Subject: [PATCH] Changed linuxbr to linux, may ultimately change it to linux so it doesn't conflict with user-mode-linux, need to check on the set-up. Probably gbootroot should be made to conflict with these deb packages. Options has more explanation and another hidden option added. --- BootRoot/BootRoot.pm | 3 +-- BootRoot/Options.pm | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/BootRoot/BootRoot.pm b/BootRoot/BootRoot.pm index 5350972..d88f6ff 100644 --- a/BootRoot/BootRoot.pm +++ b/BootRoot/BootRoot.pm @@ -374,7 +374,6 @@ home_builder($tmp1); # directories if ( !%option ) { - # $HOME/.gbootroot/root_filesystem home_builder($home_rootfs); @@ -826,7 +825,7 @@ else { print " --filesystem-command=c \"$::makefs\"\n"; print " --uml-exclusively=on|off off\n"; print " --uml-kernel=path $ENV{HOME}/.gbootroot/" . - "uml_kernel/linuxbr\n"; + "uml_kernel/linux\n"; print " --preserve-ownership=y|n n\n\n"; print " (system kernel options)\n"; print " --kernel=path specify different system kernel\n"; diff --git a/BootRoot/Options.pm b/BootRoot/Options.pm index 1b4f625..f7baa94 100644 --- a/BootRoot/Options.pm +++ b/BootRoot/Options.pm @@ -50,10 +50,26 @@ sub option { # hidden options for package making or for people who # read the source Luke. Path's relative to `pwd`. - "home=s", # path relative to `pwd` usually "." + + # home by itself allows the GUI to be tested in it's + # immediate directory, this overcomes the need to always + # install stuff locally to test it. + # It translates to gui_mode and lets the program know that + # Initrd.gz, genext2fs, linuxbr, and root_fs_helper + # be used in the directory specified. + # So "perl -I . ./gbootroot --home ." will test in the + # immediate directory. Good for CVS development, and + # testing for those who don't want to install. + # Also output will go to stdout which is cool. + # "home" with "template" needs the additional options to + # choose immediate dir., for instance, genext2fs. + + "home=s", # 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 + "expect-program=s", # i.e. ./expect_uml + "genext2fs=s" # for immediate dir creation + # commandline .. ussually "." );