Browse Source

This should fix the bug reported by Liav Asseraf. The main program was

rearragned and put in BootRoot, but the BEGIN block which sets up the FHS
for perl's INC was now in this file, so ofcourse, gbootroot couldn't find the
modules.
master
freesource 23 years ago
parent
commit
d813ad115d
  1. 23
      BootRoot/BootRoot.pm
  2. 22
      gbootroot

23
BootRoot/BootRoot.pm

@ -231,29 +231,6 @@ my $ars = {}; # anonymous hash
" X X "
);
# For distributions that don't adhere to the most recent FHS.
BEGIN {
my $fhs = grep(/\/usr\/share\/perl5/,@INC);
if ($fhs == 0) {
unshift(@INC,"/usr/share/perl5");
}
my $sbin = grep(/\/sbin/,$ENV{'PATH'});
if ($sbin == 0) {
$ENV{'PATH'} = "/sbin:" . $ENV{'PATH'};
}
$sbin = grep(/\/usr\/sbin/,$ENV{'PATH'});
if ($sbin == 0) {
$ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'};
}
}
sub start {

22
gbootroot

@ -205,6 +205,28 @@ use BootRoot::BootRoot;
init Gtk;
set_locale Gtk;
# For distributions that don't adhere to the most recent FHS.
BEGIN {
my $fhs = grep(/\/usr\/share\/perl5/,@INC);
if ($fhs == 0) {
unshift(@INC,"/usr/share/perl5");
}
my $sbin = grep(/\/sbin/,$ENV{'PATH'});
if ($sbin == 0) {
$ENV{'PATH'} = "/sbin:" . $ENV{'PATH'};
}
$sbin = grep(/\/usr\/sbin/,$ENV{'PATH'});
if ($sbin == 0) {
$ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'};
}
}
$main::editor = "emacs --font 6x13";
$main::makefs = "mke2fs -F -m0 -i8192"; # Root Disk
$main::sudo = "sudo";

Loading…
Cancel
Save