ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

raw: default to /dev/raw/rawctl 

The raw devices are in the raw/ subdirectory. It makes sense to use
the same subdirectory also for the control file. The old /dev/rawctl
is also supported as a fallback.

The #ifdef OLD_RAW_DEVS (/dev/raw<N>) is unsupported from now.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2008-12-26 01:09:34 +01:00
parent b80d3b31df
commit 6db4681802
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
disk-utils/raw.c
View File

@ -23,14 +23,12 @@
#include <linux/major.h>
#include "nls.h"
#ifdef OLD_RAW_DEVS
#define RAWCTLDEV "/dev/raw"
#define RAWDEVDIR "/dev/"
#else
#define RAWCTLDEV "/dev/rawctl"
#define RAWDEVDIR "/dev/raw/"
#endif
#define DEVFS_RAWCTLDEV "/dev/raw/rawctl"
#define RAWDEVCTL RAWDEVDIR "rawctl"
/* deprecated */
#define RAWDEVCTL_OLD "/dev/rawctl"
#define RAW_NR_MINORS 8192
@ -196,14 +194,14 @@ void open_raw_ctl(void)
{
int errsv;
master_fd = open(RAWCTLDEV, O_RDWR, 0);
master_fd = open(RAWDEVCTL, O_RDWR, 0);
if (master_fd < 0) {
errsv = errno;
master_fd = open(DEVFS_RAWCTLDEV, O_RDWR, 0);
master_fd = open(RAWDEVCTL_OLD, O_RDWR, 0);
if (master_fd < 0) {
fprintf (stderr,
fprintf (stderr,
_("Cannot open master raw device '"
RAWCTLDEV
RAWDEVCTL
"' (%s)\n"), strerror(errsv));
exit(2);
}