fix a bug in find_func, and fix an inconsistency between NEWS and INSTALL.

diff --git a/ChangeLog b/ChangeLog
index 7af6f5bdd24c67d4ec0dbe721c6d2a1aa42e17a1..c5a048485dde4ddfb5af67c5d770390b48b8a60c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-08  OKUJI Yoshinori  <okuji@gnu.org>
+
+       * stage2/builtins.c (find_func): Clear ERRNUM after the last
+       call of next_partition, because it always sets ERRNUM. Reported
+       by Thierry Laronde <thierry.laronde@polynum.com>.
+       
 2000-10-07  OKUJI Yoshinori  <okuji@gnu.org>
 
        * lib/device.c [__linux__] (write_to_partition): Open DEV with

diff --git a/NEWS b/NEWS
index 108c4f6b2732122f66fd0762fa2d21cb34c921a9..4de46a8cb4dc4680e94327cbbf9dabd7039c44f7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,8 +21,8 @@ New in 0.5.96 - 2000-10-04:
   fixed. So now the image `nbgrub' can work fine even with a card such
   as rtl8139.
 * Serial terminal support is added. The configure script accepts
-  a new option `--enable-serial'. If it is specified, you can use two
-  new commands, "serial" and "terminal" in the command-line and the
+  a new option `--disable-serial'. Unless it is specified, you can use
+  two new commands, "serial" and "terminal" in the command-line and the
   menu. See the manual, for more details.
 * Preserve the possible magic number used by Windows NT in a MBR.
 * The command-line interface is switched to single-line editing mode.

diff --git a/stage2/builtins.c b/stage2/builtins.c
index fb58bb0d692b33692f89174e10d2afbc6605aa28..60289b467a0ec0073d1289da7d48181452a81ea5 100644 (file)
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -1092,8 +1092,13 @@ find_func (char *arg, int flags)
                }
            }
 
+         /* We want to ignore any error here.  */
          errnum = ERR_NONE;
        }
+
+      /* next_partition always sets ERRNUM in the last call, so clear
+        it.  */
+      errnum = ERR_NONE;
     }
 
   saved_drive = tmp_drive;