[packages/anaconda/anaconda-19] use pld interfaces path

[glen]

commit c17887b822674f3882d0850125102fe4d013b26c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri May 17 22:28:50 2013 +0300

    use pld interfaces path

 anaconda.spec        |  4 +++-
 interfaces-dir.patch | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
---
diff --git a/anaconda.spec b/anaconda.spec
index fcde8d9..a26732b 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -31,11 +31,12 @@ Summary:	Graphical system installer
 Summary(pl.UTF-8):	Graficzny instalator systemu
 Name:		anaconda
 Version:	19.25
-Release:	0.5
+Release:	0.12
 License:	GPL
 Group:		Applications/System
 Source0:	http://pkgs.fedoraproject.org/repo/pkgs/anaconda/%{name}-%{version}.tar.bz2/b3f242b630aa1d4a458756b5816a0603/anaconda-%{version}.tar.bz2
 # Source0-md5:	b3f242b630aa1d4a458756b5816a0603
+Patch0:		interfaces-dir.patch
 URL:		http://fedoraproject.org/wiki/Anaconda
 BuildRequires:	NetworkManager-devel >= %{nmver}
 BuildRequires:	audit-libs-devel
@@ -162,6 +163,7 @@ anaconda runtime on NFS/HTTP/FTP servers or local disks.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # / on %{_prefix} kicks in
 %{__sed} -i -e '1 s,#!/usr/bin/bash,#!/bin/sh,' scripts/run-anaconda
diff --git a/interfaces-dir.patch b/interfaces-dir.patch
new file mode 100644
index 0000000..9e778fd
--- /dev/null
+++ b/interfaces-dir.patch
@@ -0,0 +1,34 @@
+--- anaconda-19.25/./pyanaconda/network.py~	2013-05-09 19:08:04.000000000 +0300
++++ anaconda-19.25/./pyanaconda/network.py	2013-05-17 22:18:14.386050536 +0300
+@@ -47,7 +47,7 @@
+ log = logging.getLogger("anaconda")
+ 
+ sysconfigDir = "/etc/sysconfig"
+-netscriptsDir = "%s/network-scripts" % (sysconfigDir)
++netscriptsDir = "%s/interfaces" % (sysconfigDir)
+ networkConfFile = "%s/network" % (sysconfigDir)
+ hostnameFile = "/etc/hostname"
+ ipv6ConfFile = "/etc/sysctl.d/anaconda.conf"
+@@ -593,9 +593,9 @@
+     shutil.copy(file, destfile)
+     return True
+ 
+-# /etc/sysconfig/network-scripts/ifcfg-*
+-# /etc/sysconfig/network-scripts/keys-*
+-# TODO: routing info from /etc/sysconfig/network-scripts?
++# /etc/sysconfig/interfaces/ifcfg-*
++# /etc/sysconfig/interfaces/keys-*
++# TODO: routing info from /etc/sysconfig/interfaces?
+ def copyIfcfgFiles(destPath):
+     files = os.listdir(netscriptsDir)
+     for cfgFile in files:
+--- anaconda-19.25/./data/post-scripts/80-setfilecons.ks~	2013-04-25 19:10:47.000000000 +0300
++++ anaconda-19.25/./data/post-scripts/80-setfilecons.ks	2013-05-17 22:19:18.165565949 +0300
+@@ -1,6 +1,6 @@
+ %post
+ 
+-restorecon -ir /etc/sysconfig/network-scripts /var/lib /etc/lvm \
++restorecon -ir /etc/sysconfig/interfaces /var/lib /etc/lvm \
+                /dev /etc/iscsi /var/lib/iscsi /root /var/lock /var/log \
+                /etc/modprobe.d /etc/sysconfig /var/cache/yum
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/anaconda.git/commitdiff/292c31438c4906d72678e4f68caa5cb798162564