mirror of
https://github.com/fspc/gbootroot.git
synced 2025-02-23 00:53:23 -05:00
Fixes another nasty.
This commit is contained in:
parent
c54f36d1b2
commit
e6e74f851a
@ -39,12 +39,25 @@ use File::Find;
|
|||||||
use File::Path;
|
use File::Path;
|
||||||
use BootRoot::Options;
|
use BootRoot::Options;
|
||||||
|
|
||||||
option();
|
|
||||||
|
|
||||||
$SIG{__WARN__} =
|
$SIG{__WARN__} =
|
||||||
sub { warn @_ unless $_[0] =~ /Subroutine [\w:]+ redefined/io
|
sub { warn @_ unless $_[0] =~ /Subroutine [\w:]+ redefined/io
|
||||||
|| $_[0] =~ /Use of uninitialized value in concatenation/};
|
|| $_[0] =~ /Use of uninitialized value in concatenation/};
|
||||||
|
|
||||||
|
|
||||||
|
# Important option setting up
|
||||||
|
option();
|
||||||
|
$::commandline = \%option if %option;
|
||||||
|
$::commandline = $ARGV[0] if $ARGV[0];
|
||||||
|
|
||||||
|
if ( $option{home} && !$option{template} ) {
|
||||||
|
undef $::commandline;
|
||||||
|
$option{gui_mode} = $option{home};
|
||||||
|
undef $option{home};
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# If you want gBootRoot to do it's stuff somewhere else, change the
|
# If you want gBootRoot to do it's stuff somewhere else, change the
|
||||||
# value for $tmp1.
|
# value for $tmp1.
|
||||||
my $tmp1 = "/tmp"; # tmp should be default - Cristian
|
my $tmp1 = "/tmp"; # tmp should be default - Cristian
|
||||||
|
13
Changes
13
Changes
@ -3,7 +3,8 @@ Updated to 2.4.19-50um and the latest uml tools 20030202.
|
|||||||
Fixed a @INC problem with rpm packages. The fhs checks usually insert
|
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
|
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
|
new BootRoot::Options was trying to be loaded before the fact because
|
||||||
it had been placed within the BEGIN{}.
|
it had been placed within the BEGIN{} and there was even a reminder in
|
||||||
|
the code documentation from prior releases explaining not to do this.
|
||||||
|
|
||||||
Added a new if/elsif control structure. \ if ( condition ) \n
|
Added a new if/elsif control structure. \ if ( condition ) \n
|
||||||
statement(s) \n elsif ( condition ) \n statements elsif .. \ Nice
|
statement(s) \n elsif ( condition ) \n statements elsif .. \ Nice
|
||||||
@ -19,7 +20,10 @@ Compiled for >= glibc 2.2.5. Previous version was compiled >= 2.3.1
|
|||||||
which caused some things not to work on old distributions using 2.2*
|
which caused some things not to work on old distributions using 2.2*
|
||||||
|
|
||||||
Removed the -q from expect_uml because this caused the newer version
|
Removed the -q from expect_uml because this caused the newer version
|
||||||
of mkreiserfs to fail.
|
of mkreiserfs to fail because Namesys decided that unsolicited
|
||||||
|
advertising was in order so everybody knows that there are actually
|
||||||
|
some organizations and companies paying for its development. Wouldn't
|
||||||
|
this be nice in a perfect world for all Free Software projects?
|
||||||
|
|
||||||
Tested on Debian stable (2.2.5), RedHat 7.3 (2.2.5 ? and Mandrake ?,
|
Tested on Debian stable (2.2.5), RedHat 7.3 (2.2.5 ? and Mandrake ?,
|
||||||
and known to work on Redhat 7.2 (2.2.4) and Mandrake 8.1 (2.2.4).
|
and known to work on Redhat 7.2 (2.2.4) and Mandrake 8.1 (2.2.4).
|
||||||
@ -27,6 +31,11 @@ and known to work on Redhat 7.2 (2.2.4) and Mandrake 8.1 (2.2.4).
|
|||||||
Added /usr/info/dir and info to make_debian which makes things much
|
Added /usr/info/dir and info to make_debian which makes things much
|
||||||
nicer.
|
nicer.
|
||||||
|
|
||||||
|
Added libexpect-perl to Build-Depends for debs; in general, there were
|
||||||
|
may fixes for both debs and rpms and their respective source packages.
|
||||||
|
|
||||||
|
Improved documentation.
|
||||||
|
|
||||||
* make a new public root_fs_dev from the uml gbootroot was made on?
|
* make a new public root_fs_dev from the uml gbootroot was made on?
|
||||||
update make-debian-x11
|
update make-debian-x11
|
||||||
|
|
||||||
|
14
gbootroot
14
gbootroot
@ -250,18 +250,12 @@ BEGIN {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use BootRoot::BootRoot;
|
||||||
use BootRoot::Options;
|
use BootRoot::Options;
|
||||||
option();
|
option();
|
||||||
|
|
||||||
$::commandline = \%option if %option;
|
|
||||||
$::commandline = $ARGV[0] if $ARGV[0];
|
|
||||||
|
|
||||||
if ( $option{home} && !$option{template} ) {
|
|
||||||
undef $::commandline;
|
|
||||||
$option{gui_mode} = $option{home};
|
|
||||||
undef $option{home};
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $Getopt::Long::error > 0 ) {
|
if ( $Getopt::Long::error > 0 ) {
|
||||||
|
|
||||||
exit;
|
exit;
|
||||||
@ -280,8 +274,6 @@ if ( !%option || $option{gui_mode} ) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
use strict;
|
|
||||||
use BootRoot::BootRoot;
|
|
||||||
|
|
||||||
$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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user