Browse Source

Made linux, linuxbr to avoid overlapping with other packages, ofcource

this could be made a variable, too, in BootRoot.pm.
master
freesource 22 years ago
parent
commit
7df8826e1e
  1. 8
      BootRoot/BootRoot.pm
  2. 4
      Makefile
  3. 4
      Makefile.pkg

8
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" .

4
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

4
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

Loading…
Cancel
Save