fixed crash with livenet installed
This commit is contained in:
parent
05a0f89924
commit
992688db14
24
0003-fix-live-crash-with-livenet-installed.patch
Normal file
24
0003-fix-live-crash-with-livenet-installed.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
From fb216d1a7cc981a50e4cae9179a88406663dda4e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Will Woods <wwoods@redhat.com>
|
||||||
|
Date: Mon, 15 Aug 2011 11:10:59 -0400
|
||||||
|
Subject: [PATCH] fix live crash with livenet installed
|
||||||
|
|
||||||
|
parse-livenet.sh shouldn't mess with $root unless it finds a valid URL.
|
||||||
|
---
|
||||||
|
modules.d/90livenet/parse-livenet.sh | 2 +-
|
||||||
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/modules.d/90livenet/parse-livenet.sh b/modules.d/90livenet/parse-livenet.sh
|
||||||
|
index 78fc906..323fd4a 100755
|
||||||
|
--- a/modules.d/90livenet/parse-livenet.sh
|
||||||
|
+++ b/modules.d/90livenet/parse-livenet.sh
|
||||||
|
@@ -12,8 +12,8 @@ liveurl="${liveurl#live:}"
|
||||||
|
case "$liveurl" in
|
||||||
|
http://*|https://*|ftp://*)
|
||||||
|
netroot="livenet:$liveurl"
|
||||||
|
+ root="livenet" # quiet complaints from init
|
||||||
|
rootok=1 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
-root="livenet" # quiet complaints from init
|
||||||
|
echo '[ -e /dev/root ]' > $hookdir/initqueue/finished/livenet.sh
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Name: dracut
|
Name: dracut
|
||||||
Version: 013
|
Version: 013
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
|
|
||||||
Summary: Initramfs generator using udev
|
Summary: Initramfs generator using udev
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
@ -23,6 +23,7 @@ URL: https://dracut.wiki.kernel.org/
|
|||||||
# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
|
# http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%{version};sf=tgz
|
||||||
Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
|
Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.bz2
|
||||||
Patch1: 0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
|
Patch1: 0002-90dmsquash-live-dmsquash-live-root-include-fs_lib.sh.patch
|
||||||
|
Patch2: 0003-fix-live-crash-with-livenet-installed.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: dash bash
|
BuildRequires: dash bash
|
||||||
@ -157,6 +158,7 @@ This package contains tools to assemble the local initrd and host configuration.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make
|
make
|
||||||
@ -295,6 +297,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir /var/lib/dracut/overlay
|
%dir /var/lib/dracut/overlay
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 17 2011 Harald Hoyer <harald@redhat.com> 013-4
|
||||||
|
- fixed crash with livenet installed
|
||||||
|
|
||||||
* Wed Aug 17 2011 Harald Hoyer <harald@redhat.com> 013-3
|
* Wed Aug 17 2011 Harald Hoyer <harald@redhat.com> 013-3
|
||||||
- fixed live iso mounting
|
- fixed live iso mounting
|
||||||
Resolves: rhbz#730579
|
Resolves: rhbz#730579
|
||||||
|
Loading…
Reference in New Issue
Block a user