From 1578dff32e2fe7b68b4069a96cf9951876bb6cc6 Mon Sep 17 00:00:00 2001 From: freesource Date: Sat, 28 Dec 2002 04:37:59 +0000 Subject: [PATCH] Thought it was time to update the copy to 2003. Fixed a few minor bugs founds while running underneath uml. One percular bug pertaining to OPTIONS was found after running a uml from the uml box then closing it again making a new root_fs and opening it again the options were missing. Haven't noticed this on the host system before. Will also need to add a c program to determine whether the host kernel is tt or skas to auto-magically determing what kernel mode to run in. --- BootRoot/BootRoot.pm | 11 ++++++----- BootRoot/Error.pm | 2 +- BootRoot/Options.pm | 2 +- BootRoot/Yard.pm | 2 +- BootRoot/YardBox.pm | 2 +- add-ons/yard/make-debian-X11/make_debian-X11 | 4 ++-- expect_uml | 2 +- gbootroot | 2 +- gbootroot-nest1_pkg | 5 +++-- gbootroot_pkg | 5 +++-- yard/replacements/etc/linuxrc | 4 ++-- yard/scripts/make_debian | 4 ++-- 12 files changed, 24 insertions(+), 21 deletions(-) diff --git a/BootRoot/BootRoot.pm b/BootRoot/BootRoot.pm index 0032475..0688c78 100644 --- a/BootRoot/BootRoot.pm +++ b/BootRoot/BootRoot.pm @@ -3,7 +3,7 @@ ############################################################################## ## ## BootRoot.pm -## Copyright (C) 2000, 2001, 2002 by Jonathan Rosenbaum +## Copyright (C) 2000, 2001, 2002, 2003 by Jonathan Rosenbaum ## ## @@ -363,9 +363,7 @@ if ( !%option || $option{gui_mode} ) { # /tmp home_builder($tmp1); -# gbootroot will need to be run at least once without options to make these -# directories -if ( !%option ) { +if ( !( $option{home} || $option{help} || $option{h} ) ) { # $HOME/.gbootroot/root_filesystem home_builder($home_rootfs); @@ -1573,7 +1571,10 @@ sub uml_box { "Alter value for each Linux virtual " . "machine invocation, and use the " . "mconsole's switch options to gain " . - "control of the new machine.", + "control of the new machine.\n" . + "mtd_init is a special option that " . + "allows a MTD root_fs to start with an " . + "alternative init like /bin/bash.", "" ); $eab2->show(); diff --git a/BootRoot/Error.pm b/BootRoot/Error.pm index c057b04..5b971d3 100644 --- a/BootRoot/Error.pm +++ b/BootRoot/Error.pm @@ -1,7 +1,7 @@ ############################################################################ ## ## Error.pm -## Copyright (C) 2000, 2001, 2002 by Jonathan Rosenbaum +## Copyright (C) 2000, 2001, 2002, 2003 by Jonathan Rosenbaum ## ## ## This program is free software; you may redistribute it and/or modify diff --git a/BootRoot/Options.pm b/BootRoot/Options.pm index ae53129..fccc5e6 100644 --- a/BootRoot/Options.pm +++ b/BootRoot/Options.pm @@ -1,7 +1,7 @@ ############################################################################ ## ## Options.pm -## Copyright (C) 2000, 2001, 2002 by Jonathan Rosenbaum +## Copyright (C) 2000, 2001, 2002, 2003 by Jonathan Rosenbaum ## ## ## This program is free software; you may redistribute it and/or modify diff --git a/BootRoot/Yard.pm b/BootRoot/Yard.pm index 1e14f40..ce759fb 100644 --- a/BootRoot/Yard.pm +++ b/BootRoot/Yard.pm @@ -3,7 +3,7 @@ ## Yard.pm combining ## MAKE_ROOT_FS, CHECK_ROOT_FS, and YARD_UTILS.PL by Tom Fawcett ## Copyright (C) 1996,1997,1998 Tom Fawcett (fawcett@croftj.net) -## Copyright (C) 2000,2001,2002 Modifications by Jonathan Rosenbaum +## Copyright (C) 2000,2001,2002,2003 Modifications by Jonathan Rosenbaum ## ## diff --git a/BootRoot/YardBox.pm b/BootRoot/YardBox.pm index e3ff0c9..b4936ec 100644 --- a/BootRoot/YardBox.pm +++ b/BootRoot/YardBox.pm @@ -1,7 +1,7 @@ ########################################################################### ## ## YardBox.pm -## Copyright (C) 2000, 2001, 2002 by Jonathan Rosenbaum +## Copyright (C) 2000, 2001, 2002, 2003 by Jonathan Rosenbaum ## ## diff --git a/add-ons/yard/make-debian-X11/make_debian-X11 b/add-ons/yard/make-debian-X11/make_debian-X11 index 13b3e52..a195d72 100755 --- a/add-ons/yard/make-debian-X11/make_debian-X11 +++ b/add-ons/yard/make-debian-X11/make_debian-X11 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# make_debian-X11 Copyright (C) 2001 from gBootRoot +# make_debian-X11 Copyright (C) 2001, 2002, 2003 from gBootRoot # Lead Developer and Project Coordinator # Jonathan Rosenbaum # @@ -268,7 +268,7 @@ return $stuff; use strict; use File::Basename; my $rm = "\$"; -$main::Id = "# \$Id: make_debian-X11,v 1.42 2001/12/22 19:01:20 freesource Exp $rm"; +$main::Id = "# \$Id: make_debian-X11,v 1.43 2001/12/22 19:44:04 freesource Exp $rm"; my $sbin = grep(/\/usr\/sbin/,$ENV{'PATH'}); if ($sbin == 0) { $ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'}; diff --git a/expect_uml b/expect_uml index 27b07f3..518f4be 100755 --- a/expect_uml +++ b/expect_uml @@ -3,7 +3,7 @@ ########################################################################### ## ## expect_uml -## Copyright (C) 2000, 2001, 2002 by Jonathan Rosenbaum +## Copyright (C) 2000, 2001, 2002, 2003 by Jonathan Rosenbaum ## ## diff --git a/gbootroot b/gbootroot index 9376966..9af2b0f 100755 --- a/gbootroot +++ b/gbootroot @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# gBootRoot Copyright (C) 2000, 2001, 2002 +# gBootRoot Copyright (C) 2000, 2001, 2002, 2003 # # # AUTHOR diff --git a/gbootroot-nest1_pkg b/gbootroot-nest1_pkg index 4e42823..f439eb8 100755 --- a/gbootroot-nest1_pkg +++ b/gbootroot-nest1_pkg @@ -214,9 +214,10 @@ system "cp -fa $makefile $packaging_place/Makefile"; # Basically this is stuff we want in the source package, but not the normal # package system "cp -fa README $packaging_place/README"; -system "cp -fa COPYING $packaging_Place/COPYING"; +system "cp -fa COPYING $packaging_place/COPYING"; system "cp -fa user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch $packaging_place/user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch"; -system "ln -sf $packaging_place/yard/replacements $packaging_place/yard/Replacements"; +chdir("$packagine_place/yard"); +system "ln -sf replacements $packaging_place/yard/Replacements"; mkdir("$packaging_place/sources"); # Now we get to clean out any CVS directories and make sure that the diff --git a/gbootroot_pkg b/gbootroot_pkg index c616642..91ca7ab 100755 --- a/gbootroot_pkg +++ b/gbootroot_pkg @@ -209,9 +209,10 @@ system "cp -fa $makefile $packaging_place/Makefile"; # Basically this is stuff we want in the source package, but not the normal # package system "cp -fa README $packaging_place/README"; -system "cp -fa COPYING $packaging_Place/COPYING"; +system "cp -fa COPYING $packaging_place/COPYING"; system "cp -fa user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch $packaging_place/user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch"; -system "ln -sf $packaging_place/yard/replacements $packaging_place/yard/Replacements"; +chdir("$packagine_place/yard"); +system "ln -sf replacements $packaging_place/yard/Replacements"; mkdir("$packaging_place/sources"); # Now we get to clean out any CVS directories and make sure that the diff --git a/yard/replacements/etc/linuxrc b/yard/replacements/etc/linuxrc index 45f6f19..21a9a51 100755 --- a/yard/replacements/etc/linuxrc +++ b/yard/replacements/etc/linuxrc @@ -1,10 +1,10 @@ #!/bin/bash -x -# $Id$ +# $Id: linuxrc,v 1.2 2002/12/16 04:13:25 freesource Exp $ ############################################################################## ## ## -## Copyright (C) 2002 by Jonathan Rosenbaum +## Copyright (C) 2002, 2003 by Jonathan Rosenbaum ## ## ## GNU General Public License diff --git a/yard/scripts/make_debian b/yard/scripts/make_debian index 700062c..edf8667 100755 --- a/yard/scripts/make_debian +++ b/yard/scripts/make_debian @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# make_debian Copyright (C) 2001, 2002 from gBootRoot +# make_debian Copyright (C) 2001, 2002, 2003 from gBootRoot # Lead Developer and Project Coordinator # Jonathan Rosenbaum # @@ -246,7 +246,7 @@ return $stuff; use strict; use File::Basename; my $rm = "\$"; -$main::Id = "# \$Id: make_debian,v 1.61 2001/12/14 04:37:29 freesource Exp $rm"; +$main::Id = "# \$Id: make_debian,v 1.62 2002/01/04 00:51:28 freesource Exp $rm"; my $sbin = grep(/\/usr\/sbin/,$ENV{'PATH'}); if ($sbin == 0) { $ENV{'PATH'} = "/usr/sbin:" . $ENV{'PATH'};