rpms/dracut/devel dracut.spec,1.48,1.49
Warren Togami 砥上勇
wtogami at fedoraproject.org
Wed Jan 13 18:55:02 UTC 2010
Author: wtogami
Update of /cvs/pkgs/rpms/dracut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25101
Modified Files:
dracut.spec
Log Message:
nbd is Fedora only
Index: dracut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dracut/devel/dracut.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- dracut.spec 27 Nov 2009 14:53:43 -0000 1.48
+++ dracut.spec 13 Jan 2010 18:55:02 -0000 1.49
@@ -1,11 +1,14 @@
-%define with_switch_root 1
+# Variables must be defined
+%define with_switch_root 1
+%define with_nbd 1
-%if 0%{?fedora} > 11
+# switchroot provided by util-linux-ng in F-12+
+%if 0%{?fedora} > 11 || 0%{?rhel} >= 6
%define with_switch_root 0
%endif
-
-%if 0%{?rhel} > 5
-%define with_switch_root 0
+# nbd in Fedora only
+%if 0%{?rhel} >= 6
+%define with_nbd 0
%endif
%if %{defined gittag}
@@ -17,7 +20,7 @@
Name: dracut
Version: 003
-Release: 1%{?rdist}
+Release: 2%{?rdist}
Summary: Initramfs generator using udev
Group: System Environment/Base
License: GPLv2+
@@ -67,7 +70,9 @@ Summary: Dracut modules to build a dracu
Requires: %{name} = %{version}-%{release}
Requires: rpcbind nfs-utils
Requires: iscsi-initiator-utils
+%if %{with_nbd}
Requires: nbd
+%endif
Requires: net-tools iproute
Requires: bridge-utils
More information about the scm-commits
mailing list