From: Petr Uzel <petr.uzel@suse.cz>
Date: Sun, 13 May 2012 11:44:31 +0000 (+0200)
Subject: mkswap: allow creating swap on /dev/hd[ab]
X-Git-Tag: v2.22-rc1~418
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95e1d8f3bad279c00cc87a388e383de3f3f3a3ca;p=thirdparty%2Futil-linux.git

mkswap: allow creating swap on /dev/hd[ab]

Currently, mkswap does not allow swap to be created on /dev/hda and
/dev/hdb. There is no reason why /dev/hda and /dev/hdb should be treated
differently.

Addresses: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491021
Cc: Russell Coker <russell@coker.com.au>
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index c7dedd7c23..dec34e1ae3 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -596,13 +596,8 @@ main(int argc, char **argv) {
 		exit(EXIT_FAILURE);
 	}
 
-	/* Want a block device. Probably not /dev/hda or /dev/hdb. */
 	if (!S_ISBLK(statbuf.st_mode))
 		check=0;
-	else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
-		errx(EXIT_FAILURE, _("error: "
-			"will not try to make swapdevice on '%s'"),
-			device_name);
 	else if (is_mounted(device_name))
 		errx(EXIT_FAILURE, _("error: "
 			"%s is mounted; will not make swapspace."),