summaryrefslogtreecommitdiffstats
path: root/sys-apps/mkinitrd/files/mkinitrd-ds-vitalsunion.diff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/mkinitrd/files/mkinitrd-ds-vitalsunion.diff')
-rw-r--r--sys-apps/mkinitrd/files/mkinitrd-ds-vitalsunion.diff65
1 files changed, 65 insertions, 0 deletions
diff --git a/sys-apps/mkinitrd/files/mkinitrd-ds-vitalsunion.diff b/sys-apps/mkinitrd/files/mkinitrd-ds-vitalsunion.diff
new file mode 100644
index 0000000..994e1cc
--- /dev/null
+++ b/sys-apps/mkinitrd/files/mkinitrd-ds-vitalsunion.diff
@@ -0,0 +1,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 */
+ };
+ };
+