Browse Source

This is the start of giving gbootroot some commandline functionality similar to

bootroot, but more specific with the primary goal of allowing root_fs
prototyping without the use of the GUI.
master
freesource 22 years ago
parent
commit
9de07f7f5e
  1. 19
      BootRoot/BootRoot.pm
  2. 20
      gbootroot

19
BootRoot/BootRoot.pm

@ -248,7 +248,6 @@ my $ars = {}; # anonymous hash
sub start {
if ( $> != 0 && -e "/usr/lib/bootroot/genext2fs" ) {
$main::makefs = "genext2fs -z -r0"; # -i8192 not a good idea
}
@ -352,9 +351,11 @@ $verbosefn = "$tmp/verbose"; # All verbosity
# Need this before everything.
Gtk::Rc->parse("/etc/gbootroot/gbootrootrc");
if ( !$::commandline ) {
verbosity_box();
start_logging_output($verbosefn,$verbosity); # Yard "tmp dir name"
# "verbosity level"
}
#-------------------------------
# USER DIRECTORIES
@ -434,6 +435,8 @@ if ( -d $global_yard_replacements_arch_dep ) {
#-------------------------------
if ( !$::commandline ) {
# Gtk::check_version expects different arguments than .7004 so will have
# to check for the version instead.
# Right now >= 0.7002 is o.k.
@ -448,9 +451,13 @@ elsif (Gtk->micro_version < 7) {
elsif (Gtk->minor_version < 2) {
et();
}
}
my $window;
if ( !$::commandline ) {
my $window = Gtk::Window->new("toplevel");
$window = Gtk::Window->new("toplevel");
# special policy
$window->set_policy( $false, $true, $true );
$window->set_title("gBootRoot");
@ -713,6 +720,13 @@ $box2->show();
$window->show();
}
# Here we put the logic if the program is going to be run from the commandline.
# The logic is linear.
else {
} # end start
@ -2784,6 +2798,7 @@ sub verbosity_box {
} # end sub verbosity_box
sub fileselect {
my ($widget,$ent,$name,$order,$device) = @_;

20
gbootroot

@ -231,25 +231,37 @@ BEGIN {
$ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'};
}
}
if ( !$ARGV[0] ) {
use Gtk;
use strict;
use BootRoot::BootRoot;
init Gtk;
set_locale Gtk;
}
else {
$::commandline = $ARGV[0];
}
}
use strict;
use BootRoot::BootRoot;
$main::editor = "emacs --font 6x13";
$main::makefs = "mke2fs -F -m0 -i8192"; # Root Disk
$main::sudo = "sudo";
start();
if ( !$ARGV[0] ) {
main Gtk;
exit( 0 );
}

Loading…
Cancel
Save