Allow dump devices with dkpart != SWAP_PART on devfs/slice

systems. This test should probably be removed altogether.

See CVS log entries for revisions 1.97 and 1.98.
This commit is contained in:
Dag-Erling Smørgrav 1998-07-18 21:42:55 +00:00
parent e3d2337be7
commit 51c4f6fbb5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=37743
2 changed files with 8 additions and 2 deletions

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.99 1998/06/30 03:01:33 jmg Exp $
* $Id: autoconf.c,v 1.100 1998/07/04 22:30:15 julian Exp $
*/
/*
@ -400,6 +400,7 @@ setdumpdev(dev)
long newdumplo;
if (dev == NODEV) {
B
dumpdev = dev;
return (0);
}
@ -418,8 +419,10 @@ setdumpdev(dev)
* and nuke dodump sysctl (too many knobs), and move this to
* kern_shutdown.c...
*/
#ifndef SLICE
if (dkpart(dev) != SWAP_PART)
return (ENODEV);
#endif /* !SLICE */
newdumplo = psize - Maxmem * PAGE_SIZE / DEV_BSIZE;
if (newdumplo < 0)
return (ENOSPC);

View file

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.99 1998/06/30 03:01:33 jmg Exp $
* $Id: autoconf.c,v 1.100 1998/07/04 22:30:15 julian Exp $
*/
/*
@ -400,6 +400,7 @@ setdumpdev(dev)
long newdumplo;
if (dev == NODEV) {
B
dumpdev = dev;
return (0);
}
@ -418,8 +419,10 @@ setdumpdev(dev)
* and nuke dodump sysctl (too many knobs), and move this to
* kern_shutdown.c...
*/
#ifndef SLICE
if (dkpart(dev) != SWAP_PART)
return (ENODEV);
#endif /* !SLICE */
newdumplo = psize - Maxmem * PAGE_SIZE / DEV_BSIZE;
if (newdumplo < 0)
return (ENOSPC);