[mkbootdisk] Fixed volume ID to be max 32 chars

[Jaroslav Škarvada]

commit a18257c90d09e5c39887d035b937674ac1b5528e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Dec 12 16:08:08 2011 +0100

    Fixed volume ID to be max 32 chars

 mkbootdisk-1.5.5-fix-long-volid.patch |   15 +++++++++++++++
 mkbootdisk.spec                       |    7 ++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/mkbootdisk-1.5.5-fix-long-volid.patch b/mkbootdisk-1.5.5-fix-long-volid.patch
new file mode 100644
index 0000000..53f8064
--- /dev/null
+++ b/mkbootdisk-1.5.5-fix-long-volid.patch
@@ -0,0 +1,15 @@
+diff -up mkbootdisk-1.5.5/mkbootdisk.orig mkbootdisk-1.5.5/mkbootdisk
+--- mkbootdisk-1.5.5/mkbootdisk.orig	2010-01-15 15:23:28.000000000 +0100
++++ mkbootdisk-1.5.5/mkbootdisk	2011-12-12 15:19:04.875610803 +0100
+@@ -264,9 +264,9 @@ EOF
+ 
+ chmod 644 $cfgfile
+ 
+-if [ -f /etc/redhat-release ]; then
+-    title="$(sed 's/ release.*$//' < /etc/redhat-release)"
+-else
++title=""
++[ -f /etc/redhat-release ] && title="$(sed 's/ release.*$//' /etc/redhat-release)"
++if [ -z "$title" -o $(echo -n "$title Boot CD" | wc -c) -ge 33 ]; then
+     title="Red Hat Linux"
+ fi
diff --git a/mkbootdisk.spec b/mkbootdisk.spec
index b527942..1323dff 100644
--- a/mkbootdisk.spec
+++ b/mkbootdisk.spec
@@ -1,10 +1,11 @@
 Summary: Creates a boot floppy disk for booting8) a system
 Name: mkbootdisk
 Version:  1.5.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: mkbootdisk-%{version}.tar.xz
+Patch0: mkbootdisk-1.5.5-fix-long-volid.patch
 ExclusiveOs: Linux
 ExclusiveArch: %{ix86} sparc sparc64 x86_64
 %ifnarch sparc sparc64
@@ -23,6 +24,7 @@ the system.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-long-volid
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %{_mandir}/man8/mkbootdisk.8*
 
 %changelog
+* Mon Dec 12 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.5.5-4
+- Fixed volume ID to be max 32 chars
+
 * Wed Aug 03 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.5.5-3
 - Added license file into package
 - Fixed rpmlint warning