From c54f36d1b285e75027b8acf453cedfb3b492c592 Mon Sep 17 00:00:00 2001 From: freesource Date: Sun, 9 Feb 2003 07:28:30 +0000 Subject: [PATCH] Get in there. --- Changes | 15 +++++++++++++-- add-ons/yard/make-debian-X11/make_debian-X11 | 8 ++++++-- expect_uml | 2 +- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Changes b/Changes index 905c0f0..b683856 100644 --- a/Changes +++ b/Changes @@ -16,9 +16,20 @@ on the system. Added format rules found in Example* to the main documentation. 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. +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. + +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). + +Added /usr/info/dir and info to make_debian which makes things much +nicer. + +* make a new public root_fs_dev from the uml gbootroot was made on? + update make-debian-x11 -Tested on Debian stable, RedHat 7.3 and Mandrake ? 1.4.0 - 01/06/2003 ------------------ diff --git a/add-ons/yard/make-debian-X11/make_debian-X11 b/add-ons/yard/make-debian-X11/make_debian-X11 index a195d72..1a67e20 100755 --- a/add-ons/yard/make-debian-X11/make_debian-X11 +++ b/add-ons/yard/make-debian-X11/make_debian-X11 @@ -52,7 +52,7 @@ binutils bzip2 file libbz2-1.0 libfreetype6 libglib1.2 libgtk-perl libgtk1.2 make xfonts-base xfree86-common xlibmesa3 xlibs xserver-common xterm xutils zlib1g libgdbmg1 libxaw7 gbootroot flwm libfltk1 xnest make-debian-x11 ash libterm-readline-gnu-perl -libexpect-perl libio-stty-perl libio-pty-perl); +libexpect-perl libio-stty-perl libio-pty-perl info); # NEXT EDIT TEMPLATE ################################################################# @@ -228,6 +228,10 @@ $Id /var/lib/locate /var/backups +# Stuff so install-info won't complain bitterly and cause package +# installations to fail. +/usr/info/dir + # Stuff so ldconfig creates all the proper dependencies. /etc/ld.so.conf <= Replacements/etc/ld.so.conf @@ -268,7 +272,7 @@ return $stuff; use strict; use File::Basename; my $rm = "\$"; -$main::Id = "# \$Id: make_debian-X11,v 1.43 2001/12/22 19:44:04 freesource Exp $rm"; +$main::Id = "# \$Id: make_debian-X11,v 1.44 2002/12/28 04:37:58 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 518f4be..d10e2f1 100755 --- a/expect_uml +++ b/expect_uml @@ -67,7 +67,7 @@ for ( 6 .. $#ARGV ) { $filesystem = "$ARGV[6]"; # What to do with the rieserfs command if ( $filesystem eq "mkreiserfs" ) { - $filesystem = $filesystem . " -f -f -q"; + $filesystem = $filesystem . " -f -f"; } } else {