blob: 994e1cc0fc86567330280c88a9d8b1411ab50e22 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff -dPNur mkinitrd-6.0.93/nash/vitals.h mkinitrd-6.0.93-new/nash/vitals.h
--- mkinitrd-6.0.93/nash/vitals.h 2009-09-02 10:41:45.000000000 +0200
+++ mkinitrd-6.0.93-new/nash/vitals.h 2012-11-19 20:07:47.000000000 +0100
@@ -39,41 +39,33 @@
union {
/* DEV_TYPE_DISK */
- struct {
- char *unique_id;
- char *disk_device_node;
- char *disk_model;
- char *disk_vendor;
- char *disk_probe_module;
- char *disk_probe_name;
- };
/* DEV_TYPE_DM_MPATH, DEV_TYPE_DM_RAID */
struct {
char *dmname;
};
- /* DEV_TYPE_LVM2_PV */
- struct {
- char *unique_id;
- };
- /* nothing for DEV_TYPE_PARTITION */
- /* DEV_TYPE_LVM2_VG */
- struct {
- char *unique_id;
- char *vg_name;
- };
- /* DEV_TYPE_LVM2_LV */
- struct {
- char *unique_id;
- char *lv_name;
- };
- /* DEV_TYPE_FS */
struct {
char *unique_id;
- char *fs_type;
- char *fs_label;
- char *fs_options;
+ union {
+ struct {
+ char *disk_device_node;
+ char *disk_model;
+ char *disk_vendor;
+ char *disk_probe_module;
+ char *disk_probe_name;
+ };
+ struct {
+ char *vg_name;
+ };
+ struct {
+ char *fs_type;
+ char *fs_label;
+ char *fs_options;
+ };
+ struct {
+ char *lv_name;
+ };
+ };
};
- /* XXX FIXME: DEV_TYPE_MD_RAID */
};
};
|
