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

Fixes rpm dist problems with @INC.

Browse Source
This commit is contained in:
freesource 2003-02-05 06:56:50 +00:00
parent c76195a69c
commit 526031d371
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Changes
View File

@ -1,3 +1,16 @@
Updated to 2.4.19-49um and the latest uml tools 20030202.
Fixed a @INC problem with rpm packages. The fhs checks usually insert
the module path (Debian std. path) into @INC via a BEGIN {}, but the
new BootRoot::Options was trying to be loaded before the fact because
it had been placed within the BEGIN{}.
*Fixed a glibc with uml_mconsole and genext2fs for distributions using
libc6 2.2.5 since the version previously included was being compiled
for 2.3.1. Accomplished this by making gbootroot within redhat 7.3.
* make libc6 dep for debian >= 2.3.1. .. good idea?
1.4.0 - 01/06/2003 1.4.0 - 01/06/2003
------------------ ------------------

52
gbootroot
View File

@ -44,6 +44,10 @@
# - Important 1.3.1 bug report and several good questions now incorporated # - Important 1.3.1 bug report and several good questions now incorporated
# in the FAQ. Noted an erroneous explanation for a FAQ question in 1.3.2. # in the FAQ. Noted an erroneous explanation for a FAQ question in 1.3.2.
# #
# Stian Skjelstad <stian@nixia.no>
# - Observed that @INC wasn't working properly with rpm based dists with
# 1.4.0.
#
# [ Supporters and Users ] # [ Supporters and Users ]
# Ben Carrell <ben@xmission.com> # Ben Carrell <ben@xmission.com>
# - Great compliments. # - Great compliments.
@ -244,40 +248,38 @@ BEGIN {
$ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'}; $ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'};
} }
}
use BootRoot::Options; use BootRoot::Options;
option(); option();
$::commandline = \%option if %option; $::commandline = \%option if %option;
$::commandline = $ARGV[0] if $ARGV[0]; $::commandline = $ARGV[0] if $ARGV[0];
if ( $option{home} && !$option{template} ) { if ( $option{home} && !$option{template} ) {
undef $::commandline; undef $::commandline;
$option{gui_mode} = $option{home}; $option{gui_mode} = $option{home};
undef $option{home}; undef $option{home};
} }
if ( $Getopt::Long::error > 0 ) { if ( $Getopt::Long::error > 0 ) {
exit; exit;
}
if ( !%option || $option{gui_mode} ) {
if ( !$::commandline ) {
use Gtk;
init Gtk;
set_locale Gtk;
}
}
} }
if ( !%option || $option{gui_mode} ) {
if ( !$::commandline ) {
use Gtk;
init Gtk;
set_locale Gtk;
}
}
use strict; use strict;
use BootRoot::BootRoot; use BootRoot::BootRoot;