diff options
| author | Garrett Wollman <wollman@FreeBSD.org> | 1995-05-12 19:12:44 +0000 |
|---|---|---|
| committer | Garrett Wollman <wollman@FreeBSD.org> | 1995-05-12 19:12:44 +0000 |
| commit | 5e7d9e89bac48acf5013c5c346c1b75c4abbca2d (patch) | |
| tree | eaa7433696a4f0560b30ad46dc3fcfe4407b5b94 | |
| parent | 55678a2eb9735980578f16b19f23a8a374bab208 (diff) | |
Notes
| -rw-r--r-- | usr.sbin/config/config.y | 7 | ||||
| -rw-r--r-- | usr.sbin/config/mkswapconf.c | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 76e9a50bc16d..fb3ede0b8f24 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -1033,12 +1033,9 @@ checksystemspec(fl) return; } /* - * Default dump device and warn if place is not a - * swap area. + * Warn if dump device is not a swap area. */ - if (fl->f_dumpdev == NODEV) - fl->f_dumpdev = swap->f_swapdev; - if (fl->f_dumpdev != swap->f_swapdev) { + if (fl->f_dumpdev != NODEV && fl->f_dumpdev != swap->f_swapdev) { struct file_list *p = swap->f_next; for (; p && p->f_type == SWAPSPEC; p = p->f_next) diff --git a/usr.sbin/config/mkswapconf.c b/usr.sbin/config/mkswapconf.c index cbb97c75e529..002d85ef1854 100644 --- a/usr.sbin/config/mkswapconf.c +++ b/usr.sbin/config/mkswapconf.c @@ -97,9 +97,13 @@ do_swap(fl) fprintf(fp, "dev_t\trootdev = makedev(%d, 0x%08x);\t\t/* %s */\n", major(fl->f_rootdev), minor(fl->f_rootdev), devtoname(fl->f_rootdev)); - fprintf(fp, "dev_t\tdumpdev = makedev(%d, 0x%08x);\t\t/* %s */\n", - major(fl->f_dumpdev), minor(fl->f_dumpdev), - devtoname(fl->f_dumpdev)); + if (fl->f_dumpdev != NODEV) { + fprintf(fp, "dev_t\tdumpdev = makedev(%d, 0x%08x);\t\t/* %s */\n", + major(fl->f_dumpdev), minor(fl->f_dumpdev), + devtoname(fl->f_dumpdev)); + } else { + fprintf(fp, "dev_t\tdumpdev = NODEV;\t\t\t/* unconfigured */\n"); + } fprintf(fp, "\n"); fprintf(fp, "struct\tswdevt swdevt[] = {\n"); do { |