diff options
| author | jkh <jkh@FreeBSD.org> | 1995-05-30 05:50:53 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-05-30 05:50:53 +0000 |
| commit | 6de57e42c294763c78d77b0a9a7c5a08008a378a (patch) | |
| tree | 7860be1c24cf8f7490e77c86852ed001d6b5b8ff | |
| parent | 6b2fde43f2324602763b97a369fff8dfa80233f6 (diff) | |
| download | FreeBSD-src-6de57e42c294763c78d77b0a9a7c5a08008a378a.zip FreeBSD-src-6de57e42c294763c78d77b0a9a7c5a08008a378a.tar.gz | |
Whoops! Fix things so that the root.flp also comes over NFS, not just
the distfiles.
| -rw-r--r-- | release/sysinstall/install.c | 19 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 19 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 19 |
3 files changed, 21 insertions, 36 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 24f8a3a..478c7cd 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.67 1995/05/29 11:01:23 jkh Exp $ + * $Id: install.c,v 1.68 1995/05/29 13:37:43 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -401,11 +401,12 @@ root_extract(void) if (mediaDevice) { switch(mediaDevice->type) { - case DEVICE_TYPE_DOS: - case DEVICE_TYPE_FTP: - case DEVICE_TYPE_DISK: - case DEVICE_TYPE_NETWORK: - case DEVICE_TYPE_CDROM: + case DEVICE_TYPE_TAPE: + case DEVICE_TYPE_FLOPPY: + loop_on_root_floppy(); + break; + + default: if (mediaDevice->init) if (!(*mediaDevice->init)(mediaDevice)) break; @@ -425,12 +426,6 @@ root_extract(void) loop_on_root_floppy(); } break; - - case DEVICE_TYPE_TAPE: - case DEVICE_TYPE_FLOPPY: - default: - loop_on_root_floppy(); - break; } } else diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 24f8a3a..478c7cd 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.67 1995/05/29 11:01:23 jkh Exp $ + * $Id: install.c,v 1.68 1995/05/29 13:37:43 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -401,11 +401,12 @@ root_extract(void) if (mediaDevice) { switch(mediaDevice->type) { - case DEVICE_TYPE_DOS: - case DEVICE_TYPE_FTP: - case DEVICE_TYPE_DISK: - case DEVICE_TYPE_NETWORK: - case DEVICE_TYPE_CDROM: + case DEVICE_TYPE_TAPE: + case DEVICE_TYPE_FLOPPY: + loop_on_root_floppy(); + break; + + default: if (mediaDevice->init) if (!(*mediaDevice->init)(mediaDevice)) break; @@ -425,12 +426,6 @@ root_extract(void) loop_on_root_floppy(); } break; - - case DEVICE_TYPE_TAPE: - case DEVICE_TYPE_FLOPPY: - default: - loop_on_root_floppy(); - break; } } else diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 24f8a3a..478c7cd 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.67 1995/05/29 11:01:23 jkh Exp $ + * $Id: install.c,v 1.68 1995/05/29 13:37:43 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -401,11 +401,12 @@ root_extract(void) if (mediaDevice) { switch(mediaDevice->type) { - case DEVICE_TYPE_DOS: - case DEVICE_TYPE_FTP: - case DEVICE_TYPE_DISK: - case DEVICE_TYPE_NETWORK: - case DEVICE_TYPE_CDROM: + case DEVICE_TYPE_TAPE: + case DEVICE_TYPE_FLOPPY: + loop_on_root_floppy(); + break; + + default: if (mediaDevice->init) if (!(*mediaDevice->init)(mediaDevice)) break; @@ -425,12 +426,6 @@ root_extract(void) loop_on_root_floppy(); } break; - - case DEVICE_TYPE_TAPE: - case DEVICE_TYPE_FLOPPY: - default: - loop_on_root_floppy(); - break; } } else |
