From 526031d37127f886b9990099fef453d3081bd1cb Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Wed, 5 Feb 2003 06:56:50 +0000
Subject: [PATCH] Fixes rpm dist problems with @INC.

---
 Changes   | 13 +++++++++++++
 gbootroot | 48 +++++++++++++++++++++++++-----------------------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/Changes b/Changes
index 84f3b52..9e9b3d1 100644
--- a/Changes
+++ b/Changes
@@ -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
 ------------------
 
diff --git a/gbootroot b/gbootroot
index 9af2b0f..ba62f61 100755
--- a/gbootroot
+++ b/gbootroot
@@ -44,6 +44,10 @@
 #    - 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.
 #
+#    Stian Skjelstad <stian@nixia.no>
+#    - Observed that @INC wasn't working properly with rpm based dists with 
+#      1.4.0.
+#
 #    [ Supporters and Users ]
 #    Ben Carrell <ben@xmission.com>
 #    - Great compliments.
@@ -244,40 +248,38 @@ BEGIN {
 	$ENV{'PATH'} = "$pwd/user-mode-linux/usr/lib\/uml:" . $ENV{'PATH'};
     }
 
+}
 
-    use BootRoot::Options;
-    option();
+use BootRoot::Options;
+option();
 
-    $::commandline = \%option if %option;
-    $::commandline = $ARGV[0] if $ARGV[0];
+$::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 ( $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;
-
-    }
-
-
-    if ( !%option || $option{gui_mode} ) {
-	if ( !$::commandline  ) {
+    exit;
 
-	    use Gtk;
-	    init Gtk;
-	    set_locale Gtk; 
+}
 
-	}	
 
-    }
+if ( !%option || $option{gui_mode} ) {
+    if ( !$::commandline  ) {
+	
+	use Gtk;
+	init Gtk;
+	set_locale Gtk; 
+	
+    }	
 
 }
 
-
 use strict;
 use BootRoot::BootRoot;