From 6407b6a65df52774dc5eeeb3b8141eefc0b8afab82976f8fe9fa29bedb7a5b5c Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Mon, 13 Apr 2015 09:23:24 +0000 Subject: [PATCH] Accepting request 295304 from home:Zaitor:branches:Base:System Fix boo#920054 Note that I've not tested the package, so maintainer should advice caution before ack'ing this change. OBS-URL: https://build.opensuse.org/request/show/295304 OBS-URL: https://build.opensuse.org/package/show/Base:System/biosdevname?expand=0&rev=50 --- biosdevname.changes | 5 +++++ ignore-broken-BIOSes | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/biosdevname.changes b/biosdevname.changes index a9687cf..89867e3 100644 --- a/biosdevname.changes +++ b/biosdevname.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 10 12:38:21 UTC 2015 - zaitor@opensuse.org + +- Fix fault in ignore-broken-BIOSes patch (boo#920054). + ------------------------------------------------------------------- Fri Apr 3 08:56:16 UTC 2015 - mpluskal@suse.com diff --git a/ignore-broken-BIOSes b/ignore-broken-BIOSes index c9de2d1..add3312 100644 --- a/ignore-broken-BIOSes +++ b/ignore-broken-BIOSes @@ -1,13 +1,10 @@ -Index: biosdevname-0.6.1/biosdevname.rules.in -=================================================================== ---- biosdevname-0.6.1.orig/biosdevname.rules.in 2015-01-21 16:00:20.790396992 +0100 -+++ biosdevname-0.6.1/biosdevname.rules.in 2015-01-21 16:01:54.926398489 +0100 -@@ -19,6 +19,7 @@ +--- biosdevname-0.6.1-orig/biosdevname.rules.in 2014-11-03 19:07:11.000000000 +0100 ++++ biosdevname-0.6.1/biosdevname.rules.in 2015-04-10 14:44:37.937236074 +0200 +@@ -19,6 +19,6 @@ # using NAME= instead of setting INTERFACE_NAME, so that persistent # names aren't generated for these devices, they are "named" on each boot. -SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical -i %k", NAME="%c", OPTIONS+="string_escape=replace" -+SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical --smbios 2.6 -+ --nopirq -i %k", NAME="%c", OPTIONS+="string_escape=replace" ++SUBSYSTEMS=="pci", PROGRAM="/sbin/biosdevname --policy physical --smbios 2.6 --nopirq -i %k", NAME="%c", OPTIONS+="string_escape=replace" LABEL="netdevicename_end"