summaryrefslogtreecommitdiff
path: root/usr.sbin/config/pack.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-12-12 00:24:45 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-12-12 00:24:45 +0000
commitdf148f708e82825f16f565836cd13efc4541d6db (patch)
tree2bea3773dd7d67d80fe7a0d43c660c12cb04c94a /usr.sbin/config/pack.c
parent56e63ce11a06e0c5e1217a6e31b7af28156d2dcf (diff)
Revert sane attach ordering for the time being
Diffstat (limited to 'usr.sbin/config/pack.c')
-rw-r--r--usr.sbin/config/pack.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c
index 41dde9b4f54..98b05691962 100644
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pack.c,v 1.7 1996/12/11 22:36:14 niklas Exp $ */
+/* $OpenBSD: pack.c,v 1.8 1996/12/12 00:24:41 niklas Exp $ */
/* $NetBSD: pack.c,v 1.5 1996/08/31 21:15:11 mycroft Exp $ */
/*
@@ -166,22 +166,19 @@ void
packdevi()
{
register struct devi *i, *l, *p;
- register struct deva *d;
+ register struct devbase *d;
register int j, m, n;
packed = emalloc((ndevi + 1) * sizeof *packed);
n = 0;
- for (d = alldevas; d != NULL; d = d->d_next) {
+ for (d = allbases; d != NULL; d = d->d_next) {
/*
- * For each instance of each attachment, add or collapse
+ * For each instance of each device, add or collapse
* all its aliases.
*/
- for (i = d->d_ihead; i != NULL; i = i->i_asame) {
+ for (i = d->d_ihead; i != NULL; i = i->i_bsame) {
m = n;
for (l = i; l != NULL; l = l->i_alias) {
- /* Skip if we already handled this one. */
- if (l->i_cfindex >= 0)
- continue;
l->i_pvlen = 0;
l->i_pvoff = -1;
l->i_locoff = -1;