summaryrefslogtreecommitdiff
path: root/libdiskfs/boot-start.c
diff options
context:
space:
mode:
authorMichael I. Bushnell <mib@gnu.org>1994-08-30 21:30:15 +0000
committerMichael I. Bushnell <mib@gnu.org>1994-08-30 21:30:15 +0000
commit41a5ee6a78e6a4bf707f6c36ca458f84a02673fa (patch)
treee389753ae62e3a5d8ec100295fd096ba90415bc1 /libdiskfs/boot-start.c
parentfbbd4823584be666c1ad360d9a76a24f1595417e (diff)
Formerly boot-start.c.~29~
Diffstat (limited to 'libdiskfs/boot-start.c')
-rw-r--r--libdiskfs/boot-start.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c
index 4a5a01c1..12b10f7a 100644
--- a/libdiskfs/boot-start.c
+++ b/libdiskfs/boot-start.c
@@ -89,7 +89,8 @@ diskfs_start_bootstrap (void)
idlist, 3, idlist, 3, 0,
&retry, retry_name, &diskfs_exec);
assert (!err);
- assert (retry == FS_RETRY_NONE);
+ assert (retry == FS_RETRY_NORMAL);
+ assert (retry_name[0] == '\0');
assert (diskfs_exec);
@@ -109,11 +110,12 @@ diskfs_start_bootstrap (void)
else
initnamebuf = initname = default_init;
- err = dir_pathtrans (root_pt, initname, O_READ, 0,
- &retry, pathbuf, &startup_pt);
+ err = dir_lookup (root_pt, initname, O_READ, 0,
+ &retry, pathbuf, &startup_pt);
assert (!err);
- assert (retry == FS_RETRY_NONE);
+ assert (retry == FS_RETRY_NORMAL);
+ assert (pathbuf[0] == '\0');
bootpt = ports_get_right (ports_allocate_port (sizeof (struct port_info),
PT_INITBOOT));