From 7df8826e1e583de2daae6fd9131a6f04bf8fbf87 Mon Sep 17 00:00:00 2001
From: freesource <freesource>
Date: Thu, 12 Dec 2002 06:56:00 +0000
Subject: [PATCH] Made linux, linuxbr to avoid overlapping with other packages,
 ofcource this could be made a variable, too, in BootRoot.pm.

---
 BootRoot/BootRoot.pm | 8 ++++----
 Makefile             | 4 ++--
 Makefile.pkg         | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BootRoot/BootRoot.pm b/BootRoot/BootRoot.pm
index 31f390b..3ec2a51 100644
--- a/BootRoot/BootRoot.pm
+++ b/BootRoot/BootRoot.pm
@@ -74,7 +74,7 @@ my $home_uml_kernel;
 $option{gui_mode} ? ($home_uml_kernel = "$home/user-mode-linux/usr/bin/")
     :  ($home_uml_kernel = "$home/uml_kernel/");
 sub uml_kernel {
-    $home_uml_kernel = $home_uml_kernel . "linux" if !$option{"uml-kernel"};
+    $home_uml_kernel = $home_uml_kernel . "linuxbr" if !$option{"uml-kernel"};
     return $home_uml_kernel;
 }
 
@@ -391,7 +391,7 @@ if ( !%option ) {
 
     # $HOME/.gbootroot/uml_kernel
     home_builder($home_uml_kernel);
-    symlink_builder("/usr/bin/linux","$home_uml_kernel/linux");
+    symlink_builder("/usr/bin/linuxbr","$home_uml_kernel/linuxbr");
     if (!-e "$home_uml_kernel/.options") {
 	open(OPTIONS,">$home_uml_kernel/.options") 
 	    or die "Couldn't write $home_uml_kernel/.options at $?\n";
@@ -839,7 +839,7 @@ else {
 	print "  --filesystem-command=c    \"$::makefs\"\n";
 	print "  --uml-exclusively=on|off  off\n";
 	print "  --uml-kernel=path         $ENV{HOME}/.gbootroot/" . 
-					   "uml_kernel/linux\n";
+					   "uml_kernel/linuxbr\n";
 	print "  --preserve-ownership=y|n  n\n";
 	print "  --genext2fs-dir=dir       /usr/lib/bootroot/\n";
 	print "  --expect-program=path     /usr/lib/bootroot/expect_uml\n";
@@ -1399,7 +1399,7 @@ sub advanced_root_section {
        label_advanced("UML Kernel:",0,1,5,6,$table_advanced_root);
        # $_[4] shares with advanced_boot_sections @entry_advanced
        $ear3 = entry_advanced(1,2,5,6,5,$table_advanced_root);
-       !$entry_advanced[5] ? $ear3->set_text("$home_uml_kernel" . "linux") :
+       !$entry_advanced[5] ? $ear3->set_text("$home_uml_kernel" . "linuxbr") :
 	   $ear3->set_text($entry_advanced[5]);
        $tooltips->set_tip( $ear3, 
                           "If you have a User Mode Linux Kernel, type in" .
diff --git a/Makefile b/Makefile
index 445468a..28d6b83 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ install:
 	chown 0:0 /usr/bin/uml_*
 	chmod 4755 /usr/bin/uml_net
 	cp -fa user-mode-linux/usr/bin/tunctl /usr/bin/tunctl
-	cp -fa user-mode-linux/usr/bin/linux /usr/bin/linux
+	cp -fa user-mode-linux/usr/bin/linuxbr /usr/bin/linuxbr
 	install -d /etc/gbootroot
 	cp -fa gbootrootrc /etc/gbootroot/gbootrootrc
 	install -d /usr/X11R6/include/X11/pixmaps
@@ -55,7 +55,7 @@ remove:
 	rm -rf /usr/share/gbootroot
 	rm /usr/bin/uml_*
 	rm /usr/bin/tunctl
-	rm /usr/bin/linux
+	rm /usr/bin/linuxbr
 	rm /etc/gbootroot/gbootrootrc
 	rmdir /etc/gbootroot
 	rm /usr/X11R6/include/X11/pixmaps/gbootroot.xpm
diff --git a/Makefile.pkg b/Makefile.pkg
index b0c841c..af6e2f6 100644
--- a/Makefile.pkg
+++ b/Makefile.pkg
@@ -31,7 +31,7 @@ install:
 	cp -fa genext2fs/dev* $(DESTDIR)/usr/share/gbootroot/genext2fs
 	cp -fa user-mode-linux/usr/bin/uml_*  $(DESTDIR)/usr/bin
 	cp -fa user-mode-linux/usr/bin/tunctl $(DESTDIR)/usr/bin/tunctl
-	cp -fa user-mode-linux/usr/bin/linux $(DESTDIR)/usr/bin/linux
+	cp -fa user-mode-linux/usr/bin/linuxbr $(DESTDIR)/usr/bin/linuxbr
 	install -d $(DESTDIR)/etc/gbootroot
 	cp -fa gbootrootrc $(DESTDIR)/etc/gbootroot/gbootrootrc
 	install -d $(DESTDIR)/usr/X11R6/include/X11/pixmaps
@@ -52,7 +52,7 @@ remove:
 	rm -rf /usr/share/gbootroot
 	rm /usr/bin/uml_*
 	rm /usr/bin/tunctl
-	rm /usr/bin/linux
+	rm /usr/bin/linuxbr
 	rm /etc/gbootroot/gbootrootrc
 	rmdir /etc/gbootroot
 	rm /usr/X11R6/include/X11/pixmaps/gbootroot.xpm