diff --git a/6548420.patch b/6548420.patch new file mode 100644 index 0000000..499a858 --- /dev/null +++ b/6548420.patch @@ -0,0 +1,24 @@ +commit 6548420e7155949e703d09519e54e364878f67bd (HEAD, origin/F18-branch, F18-branch) +Author: Bill Nottingham +Date: Mon Nov 12 16:35:23 2012 -0500 + + Revert "Use sysfs rather than iwconfig for wireless check" + + This reverts commit af401fb40f6dd5139e8468dfe1bd3dafe40e8e93. + upstream removed sysfs wireless. How nice. + +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 5b2f30a..0b5b11d 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -418,7 +418,9 @@ add_default_route () + + is_wireless_device () + { +- [ -d "/sys/class/net/$1/wireless" ] ++ [ -x /sbin/iwconfig ] || return 1 ++ LC_ALL=C iwconfig $1 2>&1 | grep -q "no wireless extensions" || return 0 ++ return 1 + } + + install_bonding_driver () diff --git a/initscripts.spec b/initscripts.spec index 0c495b7..3939c69 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Version: 9.42 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -32,6 +32,7 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Patch0: 8b18565.patch Patch1: fb580ac.patch +Patch2: 6548420.patch %description The initscripts package contains the basic system scripts used to boot @@ -54,6 +55,7 @@ Currently, this consists of various memory checking code. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make @@ -218,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Mon Nov 12 2012 Bill Nottingham - 9.42-1.2 +- fix wireless device detection for kernel 3.6 (#875328) + * Tue Nov 6 2012 Bill Nottingham - 9.42-1.1 - fedora-storage-init: change lvm command line. (#873565) - remove fedora-wait-storage (#870544)