rpms/system-config-kickstart/FC-5 system-config-kickstart-profile.patch, NONE, 1.1 system-config-kickstart.spec, 1.35, 1.36
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 27 16:03:54 UTC 2006
Author: clumens
Update of /cvs/dist/rpms/system-config-kickstart/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19933
Modified Files:
system-config-kickstart.spec
Added Files:
system-config-kickstart-profile.patch
Log Message:
Added a patch to fix system profiling mode (#186635).
system-config-kickstart-profile.patch:
src/profileSystem.py | 37 +++++++++++++++++++++++++------------
src/system-config-kickstart.py | 14 ++++++--------
system-config-kickstart.spec | 7 ++++++-
3 files changed, 37 insertions(+), 21 deletions(-)
--- NEW FILE system-config-kickstart-profile.patch ---
diff -ur system-config-kickstart.orig/src/profileSystem.py system-config-kickstart/src/profileSystem.py
--- system-config-kickstart.orig/src/profileSystem.py 2005-09-13 13:26:02.000000000 -0400
+++ system-config-kickstart/src/profileSystem.py 2006-03-27 10:48:02.000000000 -0500
@@ -23,6 +23,8 @@
import language_backend
import rhpl.keyboard as keyboard
+from pykickstart.constants import *
+
class ProfileSystem:
def __init__(self, kickstartData):
self.kickstartData = kickstartData
@@ -32,22 +34,22 @@
self.getKeyboard()
self.getTimezone()
self.getRootPassword()
+ self.getSELinux()
self.getPackages()
- self.kickstartData.setCdrom("cdrom")
- self.kickstartData.setInstall("install")
- self.kickstartData.setZeroMbr("yes")
- self.kickstartData.setClearPart(["--linux"])
+ self.kickstartData.method["method"] = "cdrom"
+ self.kickstartData.upgrade = False
+ self.kickstartData.zerombr = True
+ self.kickstartData.clearpart["type"] = CLEARPART_TYPE_LINUX
def getLang(self):
default, langs = self.languageBackend.getInstalledLangs()
- self.kickstartData.setLang([default])
- self.kickstartData.setDefaultLang(default)
+ self.kickstartData.lang = default
def getKeyboard(self):
kbd = keyboard.Keyboard()
kbd.read()
- self.kickstartData.setKeyboard([kbd.get()])
+ self.kickstartData.keyboard = kbd.get()
def getTimezone(self):
lines = open('/etc/sysconfig/clock', 'r').readlines()
@@ -59,18 +61,29 @@
zone = string.replace(zone, '"', "")
zone = string.replace(zone, "'", "")
zone = string.strip(zone)
-
- self.kickstartData.setTimezone([zone])
+
+ self.kickstartData.timezone["timezone"] = zone
+ self.kickstartData.timezone["isUtc"] = False
def getRootPassword(self):
if os.access('/etc/shadow', os.R_OK) == 1:
line = open('/etc/shadow', 'r').readline()
tokens = string.split(line, ":")
- passwd = "--iscrypted " + tokens[1]
- self.kickstartData.setRootPw([passwd])
+ self.kickstartData.rootpw["isCrypted"] = True
+ self.kickstartData.rootpw["password"] = tokens[1]
else:
print "no access to /etc/shadow"
+ def getSELinux(self):
+ lines = os.popen("/usr/sbin/getenforce").readlines()
+
+ if lines[0].lower().startswith("disabled"):
+ self.kickstartData.selinux = SELINUX_DISABLED
+ elif lines[0].lower().startswith("permissive"):
+ self.kickstartData.selinux = SELINUX_PERMISSIVE
+ elif lines[0].lower().startswith("enforcing"):
+ self.kickstartData.selinux = SELINUX_ENFORCING
+
def getPackages(self):
fd = os.popen("/bin/rpm -qa --queryformat \"%{NAME}\n\"")
packages = fd.readlines()
@@ -80,4 +93,4 @@
for package in packages:
packages[packages.index(package)] = string.strip(package)
- self.kickstartData.setIndividualPackageList(packages)
+ self.kickstartData.packageList = packages
diff -ur system-config-kickstart.orig/src/system-config-kickstart.py system-config-kickstart/src/system-config-kickstart.py
--- system-config-kickstart.orig/src/system-config-kickstart.py 2005-10-07 11:26:05.000000000 -0400
+++ system-config-kickstart/src/system-config-kickstart.py 2006-03-27 10:47:56.000000000 -0500
@@ -35,18 +35,16 @@
domain = 'system-config-kickstart'
translate.textdomain (domain)
-# FIXME
def useCliMode(value):
- import kickstartData
+ from pykickstart.data import KickstartData
+ from pykickstart.writer import KickstartWriter
import profileSystem
- data = kickstartData.KickstartData()
- profileSystem = profileSystem.ProfileSystem(data)
- file = data.getAll()
- fd = open(value, "w")
- for line in file:
- fd.write(line + "\n")
+ data = KickstartData()
+ profileSystem = profileSystem.ProfileSystem(data)
+ fd = open(value, "w")
+ fd.write(KickstartWriter(data).write())
fd.close()
diff -ur system-config-kickstart.orig/system-config-kickstart.spec system-config-kickstart/system-config-kickstart.spec
--- system-config-kickstart.orig/system-config-kickstart.spec 2006-02-24 13:18:31.000000000 -0500
+++ system-config-kickstart/system-config-kickstart.spec 2006-03-27 10:56:58.000000000 -0500
@@ -1,7 +1,7 @@
Summary: A graphical interface for making kickstart files.
Name: system-config-kickstart
Version: 2.6.6
-Release: 2
+Release: 3
URL: http://fedora.redhat.com/projects/config-tools/
License: GPL
ExclusiveOS: Linux
@@ -9,6 +9,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source0: %{name}-%{version}.tar.bz2
+Patch0: %{name}-profile.patch
Obsoletes: ksconfig
Obsoletes: redhat-config-kickstart
BuildRequires: desktop-file-utils
@@ -30,6 +31,7 @@
%prep
%setup -q
+%patch0 -p1
%install
rm -rf $RPM_BUILD_ROOT
@@ -78,6 +80,9 @@
%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
%changelog
+* Mon Mar 27 2006 Chris Lumens <clumens at redhat.com> 2.6.6-3
+- Add patch to fix system profiling mode (#186635).
+
* Fri Feb 24 2006 Chris Lumens <clumens at redhat.com> 2.6.6-2
- Add requirement for scriptlets (#182865, #182866).
Index: system-config-kickstart.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-kickstart/FC-5/system-config-kickstart.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- system-config-kickstart.spec 24 Feb 2006 18:21:11 -0000 1.35
+++ system-config-kickstart.spec 27 Mar 2006 16:03:21 -0000 1.36
@@ -1,7 +1,7 @@
Summary: A graphical interface for making kickstart files.
Name: system-config-kickstart
Version: 2.6.6
-Release: 2
+Release: 3
URL: http://fedora.redhat.com/projects/config-tools/
License: GPL
ExclusiveOS: Linux
@@ -9,6 +9,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildArch: noarch
Source0: %{name}-%{version}.tar.bz2
+Patch0: %{name}-profile.patch
Obsoletes: ksconfig
Obsoletes: redhat-config-kickstart
BuildRequires: desktop-file-utils
@@ -30,6 +31,7 @@
%prep
%setup -q
+%patch0 -p1
%install
rm -rf $RPM_BUILD_ROOT
@@ -78,6 +80,9 @@
%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png
%changelog
+* Mon Mar 27 2006 Chris Lumens <clumens at redhat.com> 2.6.6-3
+- Add patch to fix system profiling mode (#186635).
+
* Fri Feb 24 2006 Chris Lumens <clumens at redhat.com> 2.6.6-2
- Add requirement for scriptlets (#182865, #182866).
More information about the fedora-cvs-commits
mailing list