chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add "Persistent Device Naming" rules file for disks
[elogind.git]
/
extras
/
dasd_id
/
dasd_id.c
diff --git
a/extras/dasd_id/dasd_id.c
b/extras/dasd_id/dasd_id.c
index 5c2143f45d5c3a98c44822051e48aca6137e01a3..a6f2de0db799a004a7fe01383d71b43bbf36e354 100644
(file)
--- a/
extras/dasd_id/dasd_id.c
+++ b/
extras/dasd_id/dasd_id.c
@@
-33,7
+33,6
@@
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <asm/types.h>
#include "../../logging.h"
#include "../../udev_utils.h"
#include "../../logging.h"
#include "../../udev_utils.h"
@@
-140,7
+139,7
@@
static unsigned char EBCtoASC[256] =
0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07
};
0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07
};
-static void vtoc_ebcdic_dec (const unsigned char *source, char *target, int l)
+static void vtoc_ebcdic_dec (const unsigned char *source,
unsigned
char *target, int l)
{
int i;
{
int i;
@@
-183,8
+182,8
@@
static int dasd_id(int fd)
{
int blocksize;
dasd_information_t info;
{
int blocksize;
dasd_information_t info;
-
__u8
*data;
-
__u8
*label_raw;
+
unsigned char
*data;
+
unsigned char
*label_raw;
if (ioctl(fd, BIODASDINFO, &info) != 0) {
dbg("not a dasd");
if (ioctl(fd, BIODASDINFO, &info) != 0) {
dbg("not a dasd");
@@
-262,6
+261,7
@@
int main(int argc, char *argv[])
if (export) {
printf("ID_TYPE=disk\n");
printf("ID_SERIAL=%s\n",serial);
if (export) {
printf("ID_TYPE=disk\n");
printf("ID_SERIAL=%s\n",serial);
+ printf("ID_BUS=ccw\n");
} else
printf("%s\n", serial);
} else
printf("%s\n", serial);