Backport a patch to catch a missed replacement for /dev/loop/* .

This commit is contained in:
Bruno Wolff III 2010-09-14 07:33:52 -05:00
parent d7edf70b65
commit 614903026a
2 changed files with 19 additions and 1 deletions

13
devloop.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 00f201a..329ce4f 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -99,7 +99,7 @@ resetMBR() {
}
checkMBR() {
- if [[ "$DEV" =~ "/dev/loop*" ]]; then
+ if isdevloop "$DEV"; then
return 0
fi
getdisk $1

View File

@ -5,7 +5,7 @@
Summary: Tools for building live CDs
Name: livecd-tools
Version: 034
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://git.fedorahosted.org/git/livecd
@ -18,6 +18,7 @@ Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
Patch0: vesa.patch
Patch1: regex.patch
Patch2: menulabel.patch
Patch3: devloop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-imgcreate = %{version}-%{release}
Requires: mkisofs
@ -64,6 +65,7 @@ like live image or appliances.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
make
@ -96,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/imgcreate/*.pyc
%changelog
* Mon Sep 14 2010 Bruno Wolff III <bruno@wolff.to> - 034-6
- One /dev/loop* change had been missed. Backport patch.
* Mon Sep 13 2010 Bruno Wolff III <bruno@wolff.to> - 034-5
- Backport basic video menu label fix