- suggest for blkid in image generation (grub2 defaults to UUID mode)

[packages/geninitrd.git] / geninitrd.spec

diff --git a/geninitrd.spec b/geninitrd.spec
index 8ee4a9dcde0a1fecbf87123fe8111e29fcc8963e..190e8458d6d14cc380f7fd122aa8757e4a330c54 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,9 +1,14 @@
+### TODO:
+# - BUG: you can't set in /etc/mdadm.conf:
+#  DEVICE partitions containers
+#  (which is default BTW if none set). Generation of initrd will fail
+#
 Summary:       Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
 Version:       10000.20
 # leave rel 1 for ac
-Release:       3
+Release:       5
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
@@ -11,6 +16,8 @@ Source0:      %{name}-%{version}.tar.gz
 Patch0:                %{name}-romfs.patch
 Patch1:                %{name}-gzip-compressor.patch
 Patch2:                %{name}-scsi_sync_scan.patch
+Patch3:                %{name}-tuxonice_on_dm.patch
+Patch4:                %{name}-mdadm.patch
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:      /usr/bin/ldd
 Requires:      awk
@@ -30,11 +37,14 @@ Requires:   tar
 Requires:      lvm2-initrd
 Requires:      mdadm-initrd >= 1.12.0-1
 %else
-# otherwise LVM subsystem is automatically disabled in geninitrd
+# otherwise LVM subsystem is not enabled in geninitrd
 Suggests:      lvm2-initrd
 # without this softraid installations of PLD fail
 Suggests:      mdadm-initrd >= 1.12.0-1
-Suggests:      mdadm >= 1.12.0-1
+%endif
+# suggest for blkid
+%if "%{pld_release}" != "ac"
+Suggests:      util-linux-ng-initrd
 %endif
 Obsoletes:     mkinitrd
 %if "%{pld_release}" == "ac"
@@ -85,6 +95,8 @@ bieżących informacji zawartych w /etc/modules.conf.
 %patch1 -p1
 %endif
 %patch2 -p0
+%patch3 -p1
+%patch4 -p0
 
 %build
 %{__make}