From e6e74f851a81f25a6c8a8abd75ce2c95a2105ca3 Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Mon, 10 Feb 2003 05:11:23 +0000
Subject: [PATCH] Fixes another nasty.

---
 BootRoot/BootRoot.pm | 15 ++++++++++++++-
 Changes              | 13 +++++++++++--
 gbootroot            | 14 +++-----------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/BootRoot/BootRoot.pm b/BootRoot/BootRoot.pm
index c04bdc6..f443d92 100644
--- a/BootRoot/BootRoot.pm
+++ b/BootRoot/BootRoot.pm
@@ -39,12 +39,25 @@ use File::Find;
 use File::Path;
 use BootRoot::Options;
 
-option();
+
 
 $SIG{__WARN__} = 
     sub { warn @_ unless $_[0] =~ /Subroutine [\w:]+ redefined/io 
 	      || $_[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
 # value for $tmp1.
 my $tmp1 = "/tmp";              # tmp should be default - Cristian
diff --git a/Changes b/Changes
index b683856..473809e 100644
--- a/Changes
+++ b/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
 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{}.
+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
 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*
 
 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 ?,
 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
 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?
 	update make-debian-x11
 
diff --git a/gbootroot b/gbootroot
index ba62f61..ec5f0d9 100755
--- a/gbootroot
+++ b/gbootroot
@@ -250,18 +250,12 @@ BEGIN {
 
 }
 
+
+use strict;
+use BootRoot::BootRoot;
 use BootRoot::Options;
 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 ) {
 	
     exit;
@@ -280,8 +274,6 @@ if ( !%option || $option{gui_mode} ) {
 
 }
 
-use strict;
-use BootRoot::BootRoot;
 
 $main::editor = "emacs --font 6x13";
 $main::makefs = "mke2fs -F -m0 -i8192"; # Root Disk