bike/gbootroot
1
0
Fork 0
mirror of https://github.com/fspc/gbootroot.git synced 2025-02-23 09:03:23 -05:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
freesource 2002-01-06 06:28:28 +00:00
parent 3cb6c28c0e
commit d813ad115d
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BootRoot/BootRoot.pm
View File

@ -231,29 +231,6 @@ my $ars = {}; # anonymous hash
" X X " " 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 { sub start {

22
gbootroot
View File

@ -205,6 +205,28 @@ use BootRoot::BootRoot;
init Gtk; init Gtk;
set_locale 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::editor = "emacs --font 6x13";
$main::makefs = "mke2fs -F -m0 -i8192"; # Root Disk $main::makefs = "mke2fs -F -m0 -i8192"; # Root Disk
$main::sudo = "sudo"; $main::sudo = "sudo";