1 Allow raw(8) to bind raw devices whose device nodes do not yet exist
3 --- util-linux-2.12a/disk-utils/raw.c.=K0000=.orig
4 +++ util-linux-2.12a/disk-utils/raw.c
7 #define DEVFS_RAWCTLDEV "/dev/raw/rawctl"
9 +#define RAW_NR_MINORS 8192
13 @@ -94,7 +95,7 @@ int main(int argc, char *argv[])
17 - for (i=1; i<255; i++)
18 + for (i = 1; i < RAW_NR_MINORS; i++)
22 @@ -109,9 +110,16 @@ int main(int argc, char *argv[])
24 err = stat(raw_name, &statbuf);
26 - fprintf (stderr, "Cannot locate raw device '%s' (%s)\n",
27 - raw_name, strerror(errno));
31 + rc = sscanf(raw_name, RAWDEVDIR "raw%d", &raw_minor);
34 + "Cannot locate raw device '%s' (%s)\n",
35 + raw_name, strerror(errno));
38 + goto skip_test_rawdev;
41 if (!S_ISCHR(statbuf.st_mode)) {
42 @@ -127,6 +135,7 @@ int main(int argc, char *argv[])
44 raw_minor = minor(statbuf.st_rdev);
48 return query(raw_minor, 0);
50 @@ -193,6 +202,7 @@ void open_raw_ctl(void)
51 int query(int minor, int quiet)
53 struct raw_config_request rq;
54 + static int has_worked = 0;
58 @@ -200,11 +210,17 @@ int query(int minor, int quiet)
60 if (quiet && errno == ENODEV)
62 + if (has_worked && errno == EINVAL)
65 "Error querying raw device (%s)\n",
69 + /* If one query has worked, mark that fact so that we don't
70 + * report spurious fatal errors if raw(8) has been built to
71 + * support more raw minor numbers than the kernel has. */
73 if (quiet && !rq.block_major && !rq.block_minor)
75 printf (RAWDEVDIR "raw%d: bound to major %d, minor %d\n",