anaconda记录

5 篇文章 0 订阅

10.3

[root@rpmbuilder-10-3 trunk]# svn up
U    rpms/anaconda/anaconda-13.21.195-cc.patch
U    rpms/anaconda/anaconda.spec.patch
更新到版本 19185。
[root@rpmbuilder-10-3 trunk]# cd rpms/anaconda/
[root@rpmbuilder-10-3 anaconda]# ll
总用量 12
-rw-r--r-- 1 root root 3400  8月 28 10:30 anaconda-13.21.195-cc.patch
-rw-r--r-- 1 root root  736  8月 28 10:30 anaconda.spec.patch
-rwxr-xr-x 1 root root  302  8月 27 17:23 buildrpm
[root@rpmbuilder-10-3 anaconda]# ./buildrpm 
warning: /var/tmp/rpm-tmp.twojYO: Header V3 RSA/SHA256 Signature, key ID fd431d51: NOKEY
patching file anaconda.spec
Wrote: /root/rpmbuild/SRPMS/anaconda-13.21.195-1.el6.cc.3.src.rpm
Executing(--clean): /bin/sh -e /var/tmp/rpm-tmp.tDJew3
+ umask 022
+ cd /root/rpmbuild/BUILD
+ rm -rf anaconda-13.21.195
+ exit 0
[root@rpmbuilder-10-3 anaconda]# su - mockbuild -c "mock /root/rpmbuild/SRPMS/anaconda-13.21.195-1.el6.cc.3.src.rpm"
INFO: mock.py version 1.1.12 starting...
State Changed: init plugins
INFO: selinux disabled
State Changed: start
INFO: Start(/root/rpmbuild/SRPMS/anaconda-13.21.195-1.el6.cc.3.src.rpm)  Config(ccserver-5.2)
State Changed: lock buildroot
State Changed: clean
INFO: chroot (/var/lib/mock/ccserver-5.2) unlocked and deleted
State Changed: unlock buildroot
State Changed: init
State Changed: lock buildroot
Mock Version: 1.1.12
INFO: Mock Version: 1.1.12
INFO: enabled root cache
State Changed: unpacking root cache
INFO: enabled yum cache
State Changed: cleaning yum metadata
INFO: enabled ccache
State Changed: running yum
State Changed: unlock buildroot
State Changed: setup
State Changed: build
INFO: Done(/root/rpmbuild/SRPMS/anaconda-13.21.195-1.el6.cc.3.src.rpm) Config(default) 3 minutes 36 seconds
INFO: Results and/or logs in: /var/lib/mock/ccserver-5.2/result
State Changed: end
[root@rpmbuilder-10-3 anaconda]# ll /var/lib/mock/ccserver-5.2/result
总用量 9576
-rw-rw-r-- 1 mockbuild mock 5536719  8月 28 10:32 anaconda-13.21.195-1.el6.cc.3.src.rpm
-rw-rw-r-- 1 mockbuild mock 3335452  8月 28 10:35 anaconda-13.21.195-1.el6.cc.3.x86_64.rpm
-rw-rw-r-- 1 mockbuild mock  760608  8月 28 10:35 anaconda-debuginfo-13.21.195-1.el6.cc.3.x86_64.rpm
-rw-rw-r-- 1 mockbuild mock   88144  8月 28 10:35 build.log
-rw-rw-r-- 1 mockbuild mock   72418  8月 28 10:35 root.log
-rw-rw-r-- 1 mockbuild mock     422  8月 28 10:35 state.log
[root@rpmbuilder-10-3 anaconda]# mv /var/lib/mock/ccserver-5.2/result /mnt/202/Linux/ccserver/rpms/anaconda/13.21.195-1.el6.cc.3.x86_64/
[root@rpmbuilder-10-3 anaconda]# cd !#$
cd cd
-bash: cd: cd: 没有那个文件或目录
[root@rpmbuilder-10-3 anaconda]# cd /mnt/202/Linux/ccserver/rpms/anaconda/13.21.195-1.el6.cc.3.x86_64/
[root@rpmbuilder-10-3 13.21.195-1.el6.cc.3.x86_64]# ll
总用量 9604
-rw-rw-r-- 1 mockbuild mock 5536719  8月 28 10:32 anaconda-13.21.195-1.el6.cc.3.src.rpm
-rw-rw-r-- 1 mockbuild mock 3335452  8月 28 10:35 anaconda-13.21.195-1.el6.cc.3.x86_64.rpm
-rw-rw-r-- 1 mockbuild mock  760608  8月 28 10:35 anaconda-debuginfo-13.21.195-1.el6.cc.3.x86_64.rpm
-rw-rw-r-- 1 mockbuild mock   88144  8月 28 10:35 build.log
-rw-rw-r-- 1 mockbuild mock   72418  8月 28 10:35 root.log
-rw-rw-r-- 1 mockbuild mock     422  8月 28 10:35 state.log
[root@rpmbuilder-10-3 13.21.195-1.el6.cc.3.x86_64]# cp -a anaconda-13.21.195-1.el6.cc.3.x86_64.rpm ../../../5.4/repo/Packages/


local

ric@localhost ~]$ cd work
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
--- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/product.py	2013-08-28 10:23:31.495664023 +0800
@@ -70,3 +70,5 @@
 
 if productVersion == "development": # hack to transform for now
     productVersion = "rawhide"
+
+productIsFinal = True
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
--- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/product.py	2013-08-28 10:25:25.718663945 +0800
@@ -32,7 +32,7 @@
 productStamp = ""
 productName = "anaconda"
 productVersion = "bluesky"
-productPath = "Packages"
+#productPath = "Packages"
 productArch = None
 bugUrl = "your distribution provided bug reporting tool."
 productIsFinal = False
@@ -70,3 +70,5 @@
 
 if productVersion == "development": # hack to transform for now
     productVersion = "rawhide"
+
+productIsFinal = True
diff -Nur anaconda-13.21.195/product.py~ anaconda-13.21.195-cc/product.py~
--- anaconda-13.21.195/product.py~	1970-01-01 08:00:00.000000000 +0800
+++ anaconda-13.21.195-cc/product.py~	2013-08-28 10:23:31.495664023 +0800
@@ -0,0 +1,74 @@
+#
+# product.py: product identification string
+#
+# Copyright (C) 2003  Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+
+if os.access("/tmp/product/.buildstamp", os.R_OK):
+    path = "/tmp/product/.buildstamp"
+elif os.access("/.buildstamp", os.R_OK):
+    path = "/.buildstamp"
+elif os.environ.has_key("PRODBUILDPATH") and \
+         os.access(os.environ["PRODBUILDPATH"], os.R_OK):
+    path = os.environ["PRODBUILDPATH"]
+else:
+    path = None
+
+productStamp = ""
+productName = "anaconda"
+productVersion = "bluesky"
+productPath = "Packages"
+productArch = None
+bugUrl = "your distribution provided bug reporting tool."
+productIsFinal = False
+
+if path is not None:
+    f = open(path, "r")
+    lines = f.readlines()
+    del f
+    if len(lines) >= 4:
+        productStamp = lines[0][:-1]
+        productArch = productStamp[productStamp.index(".")+1:]
+        productName = lines[1][:-1]
+        productVersion = lines[2][:-1]
+
+        # set productIsFinal
+        isfinal = lines[3].strip().lower()
+        key, sep, isfinal = isfinal.partition("=")
+        productIsFinal = (key == "final" and isfinal == "yes")
+
+    if len(lines) >= 5:
+        bugUrl = lines[4][:-1]
+
+if os.environ.has_key("ANACONDA_PRODUCTNAME"):
+    productName = os.environ["ANACONDA_PRODUCTNAME"]
+if os.environ.has_key("ANACONDA_PRODUCTVERSION"):
+    productVersion = os.environ["ANACONDA_PRODUCTVERSION"]
+if os.environ.has_key("ANACONDA_PRODUCTPATH"):
+    productPath = os.environ["ANACONDA_PRODUCTPATH"]
+if os.environ.has_key("ANACONDA_PRODUCTARCH"):
+    productArch = os.environ["ANACONDA_PRODUCTARCH"]
+if os.environ.has_key("ANACONDA_BUGURL"):
+    bugUrl = os.environ["ANACONDA_BUGURL"]
+if os.environ.has_key("ANACONDA_ISFINAL"):
+    productIsFinal = True
+
+if productVersion == "development": # hack to transform for now
+    productVersion = "rawhide"
+
+productIsFinal = True
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
--- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/product.py	2013-08-28 10:25:25.718663945 +0800
@@ -32,7 +32,7 @@
 productStamp = ""
 productName = "anaconda"
 productVersion = "bluesky"
-productPath = "Packages"
+#productPath = "Packages"
 productArch = None
 bugUrl = "your distribution provided bug reporting tool."
 productIsFinal = False
@@ -70,3 +70,5 @@
 
 if productVersion == "development": # hack to transform for now
     productVersion = "rawhide"
+
+productIsFinal = True
[eric@localhost work]$ cd ccserver/rpms/anaconda/
[eric@localhost anaconda]$ svn diff
Index: anaconda-13.21.195-cc.patch
===================================================================
--- anaconda-13.21.195-cc.patch	(版本 19183)
+++ anaconda-13.21.195-cc.patch	(工作副本)
@@ -71,11 +71,9 @@
 diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
 --- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
 +++ anaconda-13.21.195-cc/product.py	2013-08-28 08:58:14.057902344 +0800
-@@ -70,3 +70,7 @@
+@@ -70,3 +70,5 @@
  
  if productVersion == "development": # hack to transform for now
      productVersion = "rawhide"
 + 
-+ # 强制设置为正式版,忽略前面的任何判断
 + productIsFinal = True
-+ 
Index: anaconda.spec.patch
===================================================================
--- anaconda.spec.patch	(版本 19183)
+++ anaconda.spec.patch	(工作副本)
@@ -5,7 +5,7 @@
  Name:    anaconda
  Version: 13.21.195
 -Release: 1%{?dist}
-+Release: 1%{?dist}.2
++Release: 1%{?dist}.3
  License: GPLv2+
  Group:   Applications/System
  URL:     http://fedoraproject.org/wiki/Anaconda
[eric@localhost anaconda]$ svn diff
Index: anaconda-13.21.195-cc.patch
===================================================================
--- anaconda-13.21.195-cc.patch	(版本 19183)
+++ anaconda-13.21.195-cc.patch	(工作副本)
@@ -71,11 +71,9 @@
 diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
 --- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
 +++ anaconda-13.21.195-cc/product.py	2013-08-28 08:58:14.057902344 +0800
-@@ -70,3 +70,7 @@
+@@ -70,3 +70,5 @@
  
  if productVersion == "development": # hack to transform for now
      productVersion = "rawhide"
 + 
-+ # 强制设置为正式版,忽略前面的任何判断
 + productIsFinal = True
-+ 
Index: anaconda.spec.patch
===================================================================
--- anaconda.spec.patch	(版本 19183)
+++ anaconda.spec.patch	(工作副本)
@@ -5,7 +5,7 @@
  Name:    anaconda
  Version: 13.21.195
 -Release: 1%{?dist}
-+Release: 1%{?dist}.2
++Release: 1%{?dist}.3
  License: GPLv2+
  Group:   Applications/System
  URL:     http://fedoraproject.org/wiki/Anaconda
[eric@localhost anaconda]$ 
[eric@localhost anaconda]$ svn ci -m "取消中文注释,解决python不兼容的问题"
svn: E155004: 提交失败(细节如下): 
svn: E155004: 工作副本“/home/eric/work/ccserver/rpms”已经锁定
svn: E200031: sqlite: attempt to write a readonly database
svn: E200031: sqlite: attempt to write a readonly database
svn: 运行“svn cleanup”删除锁定 (输入“svn help cleanup”得到用法)
[eric@localhost anaconda]$ su roo
su: 用户roo 不存在
[eric@localhost anaconda]$ su root
密码:
[root@localhost anaconda]# svn ci -m "取消中文注释,解决python不兼容的问题"
正在发送       anaconda-13.21.195-cc.patch
正在发送       anaconda.spec.patch
传输文件数据..
提交后的版本为 19185。
[root@localhost anaconda]# svn cleanup^C
[root@localhost anaconda]# exit
exit
[eric@localhost anaconda]$ cd ..
[eric@localhost rpms]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
diff: anaconda-13.21.195: 没有那个文件或目录
diff: anaconda-13.21.195-cc/: 没有那个文件或目录
[eric@localhost rpms]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/^C
[eric@localhost rpms]$ cd ..
[eric@localhost ccserver]$ cd ..
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
diff -Nur anaconda-13.21.195/product.py~ anaconda-13.21.195-cc/product.py~
--- anaconda-13.21.195/product.py~	1970-01-01 08:00:00.000000000 +0800
+++ anaconda-13.21.195-cc/product.py~	2013-08-28 10:25:25.718663945 +0800
@@ -0,0 +1,74 @@
+#
+# product.py: product identification string
+#
+# Copyright (C) 2003  Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+
+if os.access("/tmp/product/.buildstamp", os.R_OK):
+    path = "/tmp/product/.buildstamp"
+elif os.access("/.buildstamp", os.R_OK):
+    path = "/.buildstamp"
+elif os.environ.has_key("PRODBUILDPATH") and \
+         os.access(os.environ["PRODBUILDPATH"], os.R_OK):
+    path = os.environ["PRODBUILDPATH"]
+else:
+    path = None
+
+productStamp = ""
+productName = "anaconda"
+productVersion = "bluesky"
+#productPath = "Packages"
+productArch = None
+bugUrl = "your distribution provided bug reporting tool."
+productIsFinal = False
+
+if path is not None:
+    f = open(path, "r")
+    lines = f.readlines()
+    del f
+    if len(lines) >= 4:
+        productStamp = lines[0][:-1]
+        productArch = productStamp[productStamp.index(".")+1:]
+        productName = lines[1][:-1]
+        productVersion = lines[2][:-1]
+
+        # set productIsFinal
+        isfinal = lines[3].strip().lower()
+        key, sep, isfinal = isfinal.partition("=")
+        productIsFinal = (key == "final" and isfinal == "yes")
+
+    if len(lines) >= 5:
+        bugUrl = lines[4][:-1]
+
+if os.environ.has_key("ANACONDA_PRODUCTNAME"):
+    productName = os.environ["ANACONDA_PRODUCTNAME"]
+if os.environ.has_key("ANACONDA_PRODUCTVERSION"):
+    productVersion = os.environ["ANACONDA_PRODUCTVERSION"]
+if os.environ.has_key("ANACONDA_PRODUCTPATH"):
+    productPath = os.environ["ANACONDA_PRODUCTPATH"]
+if os.environ.has_key("ANACONDA_PRODUCTARCH"):
+    productArch = os.environ["ANACONDA_PRODUCTARCH"]
+if os.environ.has_key("ANACONDA_BUGURL"):
+    bugUrl = os.environ["ANACONDA_BUGURL"]
+if os.environ.has_key("ANACONDA_ISFINAL"):
+    productIsFinal = True
+
+if productVersion == "development": # hack to transform for now
+    productVersion = "rawhide"
+
+productIsFinal = True
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
[eric@localhost work]$ cd anaconda-13.21.195-cc/
[eric@localhost anaconda-13.21.195-cc]$ patch -p1 < ../ccserver/rpms/anaconda/anaconda-13.21.195-cc.patch
patching file installclass.py
patching file iw/network_gui.py
patching file loader/cdinstall.c
patching file loader/loader.c
patching file product.py
[eric@localhost anaconda-13.21.195-cc]$ cd ..
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
diff -Nur anaconda-13.21.195/installclass.py anaconda-13.21.195-cc/installclass.py
--- anaconda-13.21.195/installclass.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/installclass.py	2013-08-28 10:35:11.007663548 +0800
@@ -129,13 +129,16 @@
 	if productIsFinal:
 	    dispatch.skipStep("betanag", permanent=1)
 
-        if not iutil.isX86():
-            dispatch.skipStep("bootloader", permanent=1)
+        #if not iutil.isX86():
+        dispatch.skipStep("bootloader", permanent=1)
 
         # allow backends to disable interactive package selection
-        if not anaconda.backend.supportsPackageSelection:
-            dispatch.skipStep("tasksel", skip = 1, permanent=1)
-            dispatch.skipStep("group-selection", skip = 1, permanent=1)
+        #if not anaconda.backend.supportsPackageSelection:
+        dispatch.skipStep("tasksel", skip = 1, permanent=1)
+        dispatch.skipStep("group-selection", skip = 1, permanent=1)
+
+        # skip timezone selection
+        dispatch.skipStep("timezone", skip = 1, permanent=1)
 
         # allow install classes to turn off the upgrade 
         if not self.showUpgrade or not anaconda.backend.supportsUpgrades:
diff -Nur anaconda-13.21.195/iw/network_gui.py anaconda-13.21.195-cc/iw/network_gui.py
--- anaconda-13.21.195/iw/network_gui.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/iw/network_gui.py	2013-08-28 10:35:11.025663548 +0800
@@ -53,6 +53,8 @@
         self.netconfButton.connect("clicked", self._netconfButton_clicked)
         if len(self.anaconda.id.network.netdevices) == 0:
             self.netconfButton.set_sensitive(False)
+        else:
+            self.anaconda.id.network.updateActiveDevices()
 
         # pressing Enter in confirm == clicking Next
         self.hostnameEntry.connect("activate",
@@ -69,6 +71,9 @@
     def focus(self):
         self.hostnameEntry.grab_focus()
 
+    def renderCallback(self):
+        self.netconfButton.clicked()
+
     def hostnameError(self):
         self.hostnameEntry.grab_focus()
         raise gui.StayOnScreen
diff -Nur anaconda-13.21.195/loader/cdinstall.c anaconda-13.21.195-cc/loader/cdinstall.c
--- anaconda-13.21.195/loader/cdinstall.c	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/loader/cdinstall.c	2013-08-28 10:35:11.026663548 +0800
@@ -246,6 +246,7 @@
 
 /* ask about doing media check */
 static void queryCDMediaCheck(char *dev, char *location) {
+    return;
     int rc;
     char *stage2loc;
 
diff -Nur anaconda-13.21.195/loader/loader.c anaconda-13.21.195-cc/loader/loader.c
--- anaconda-13.21.195/loader/loader.c	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/loader/loader.c	2013-08-28 10:35:11.026663548 +0800
@@ -2480,6 +2480,8 @@
             *argptr++ = "-T";
         else if (FL_GRAPHICAL(flags))
             *argptr++ = "--graphical";
+            *argptr++ = "--lang=zh_CN";
+            *argptr++ = "--keymap=us";
         if (FL_CMDLINE(flags))
             *argptr++ = "-C";
         if (!FL_SELINUX(flags))
diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
--- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/product.py	2013-08-28 10:35:11.026663548 +0800
@@ -70,3 +70,5 @@
 
 if productVersion == "development": # hack to transform for now
     productVersion = "rawhide"
+ 
+ productIsFinal = True
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ 
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/
diff -Nur anaconda-13.21.195/installclass.py anaconda-13.21.195-cc/installclass.py
--- anaconda-13.21.195/installclass.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/installclass.py	2013-08-28 10:35:11.007663548 +0800
@@ -129,13 +129,16 @@
 	if productIsFinal:
 	    dispatch.skipStep("betanag", permanent=1)
 
-        if not iutil.isX86():
-            dispatch.skipStep("bootloader", permanent=1)
+        #if not iutil.isX86():
+        dispatch.skipStep("bootloader", permanent=1)
 
         # allow backends to disable interactive package selection
-        if not anaconda.backend.supportsPackageSelection:
-            dispatch.skipStep("tasksel", skip = 1, permanent=1)
-            dispatch.skipStep("group-selection", skip = 1, permanent=1)
+        #if not anaconda.backend.supportsPackageSelection:
+        dispatch.skipStep("tasksel", skip = 1, permanent=1)
+        dispatch.skipStep("group-selection", skip = 1, permanent=1)
+
+        # skip timezone selection
+        dispatch.skipStep("timezone", skip = 1, permanent=1)
 
         # allow install classes to turn off the upgrade 
         if not self.showUpgrade or not anaconda.backend.supportsUpgrades:
diff -Nur anaconda-13.21.195/iw/network_gui.py anaconda-13.21.195-cc/iw/network_gui.py
--- anaconda-13.21.195/iw/network_gui.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/iw/network_gui.py	2013-08-28 10:35:11.025663548 +0800
@@ -53,6 +53,8 @@
         self.netconfButton.connect("clicked", self._netconfButton_clicked)
         if len(self.anaconda.id.network.netdevices) == 0:
             self.netconfButton.set_sensitive(False)
+        else:
+            self.anaconda.id.network.updateActiveDevices()
 
         # pressing Enter in confirm == clicking Next
         self.hostnameEntry.connect("activate",
@@ -69,6 +71,9 @@
     def focus(self):
         self.hostnameEntry.grab_focus()
 
+    def renderCallback(self):
+        self.netconfButton.clicked()
+
     def hostnameError(self):
         self.hostnameEntry.grab_focus()
         raise gui.StayOnScreen
diff -Nur anaconda-13.21.195/loader/cdinstall.c anaconda-13.21.195-cc/loader/cdinstall.c
--- anaconda-13.21.195/loader/cdinstall.c	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/loader/cdinstall.c	2013-08-28 10:35:11.026663548 +0800
@@ -246,6 +246,7 @@
 
 /* ask about doing media check */
 static void queryCDMediaCheck(char *dev, char *location) {
+    return;
     int rc;
     char *stage2loc;
 
diff -Nur anaconda-13.21.195/loader/loader.c anaconda-13.21.195-cc/loader/loader.c
--- anaconda-13.21.195/loader/loader.c	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/loader/loader.c	2013-08-28 10:35:11.026663548 +0800
@@ -2480,6 +2480,8 @@
             *argptr++ = "-T";
         else if (FL_GRAPHICAL(flags))
             *argptr++ = "--graphical";
+            *argptr++ = "--lang=zh_CN";
+            *argptr++ = "--keymap=us";
         if (FL_CMDLINE(flags))
             *argptr++ = "-C";
         if (!FL_SELINUX(flags))
diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
--- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/product.py	2013-08-28 10:35:11.026663548 +0800
@@ -70,3 +70,5 @@
 
 if productVersion == "development": # hack to transform for now
     productVersion = "rawhide"
+ 
+ productIsFinal = True
[eric@localhost work]$ diff -Nur anaconda-13.21.195 anaconda-13.21.195-cc/ 
diff -Nur anaconda-13.21.195/installclass.py anaconda-13.21.195-cc/installclass.py
--- anaconda-13.21.195/installclass.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/installclass.py	2013-08-28 10:35:11.007663548 +0800
@@ -129,13 +129,16 @@
 	if productIsFinal:
 	    dispatch.skipStep("betanag", permanent=1)
 
-        if not iutil.isX86():
-            dispatch.skipStep("bootloader", permanent=1)
+        #if not iutil.isX86():
+        dispatch.skipStep("bootloader", permanent=1)
 
         # allow backends to disable interactive package selection
-        if not anaconda.backend.supportsPackageSelection:
-            dispatch.skipStep("tasksel", skip = 1, permanent=1)
-            dispatch.skipStep("group-selection", skip = 1, permanent=1)
+        #if not anaconda.backend.supportsPackageSelection:
+        dispatch.skipStep("tasksel", skip = 1, permanent=1)
+        dispatch.skipStep("group-selection", skip = 1, permanent=1)
+
+        # skip timezone selection
+        dispatch.skipStep("timezone", skip = 1, permanent=1)
 
         # allow install classes to turn off the upgrade 
         if not self.showUpgrade or not anaconda.backend.supportsUpgrades:
diff -Nur anaconda-13.21.195/iw/network_gui.py anaconda-13.21.195-cc/iw/network_gui.py
--- anaconda-13.21.195/iw/network_gui.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/iw/network_gui.py	2013-08-28 10:35:11.025663548 +0800
@@ -53,6 +53,8 @@
         self.netconfButton.connect("clicked", self._netconfButton_clicked)
         if len(self.anaconda.id.network.netdevices) == 0:
             self.netconfButton.set_sensitive(False)
+        else:
+            self.anaconda.id.network.updateActiveDevices()
 
         # pressing Enter in confirm == clicking Next
         self.hostnameEntry.connect("activate",
@@ -69,6 +71,9 @@
     def focus(self):
         self.hostnameEntry.grab_focus()
 
+    def renderCallback(self):
+        self.netconfButton.clicked()
+
     def hostnameError(self):
         self.hostnameEntry.grab_focus()
         raise gui.StayOnScreen
diff -Nur anaconda-13.21.195/loader/cdinstall.c anaconda-13.21.195-cc/loader/cdinstall.c
--- anaconda-13.21.195/loader/cdinstall.c	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/loader/cdinstall.c	2013-08-28 10:35:11.026663548 +0800
@@ -246,6 +246,7 @@
 
 /* ask about doing media check */
 static void queryCDMediaCheck(char *dev, char *location) {
+    return;
     int rc;
     char *stage2loc;
 
diff -Nur anaconda-13.21.195/loader/loader.c anaconda-13.21.195-cc/loader/loader.c
--- anaconda-13.21.195/loader/loader.c	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/loader/loader.c	2013-08-28 10:35:11.026663548 +0800
@@ -2480,6 +2480,8 @@
             *argptr++ = "-T";
         else if (FL_GRAPHICAL(flags))
             *argptr++ = "--graphical";
+            *argptr++ = "--lang=zh_CN";
+            *argptr++ = "--keymap=us";
         if (FL_CMDLINE(flags))
             *argptr++ = "-C";
         if (!FL_SELINUX(flags))
diff -Nur anaconda-13.21.195/product.py anaconda-13.21.195-cc/product.py
--- anaconda-13.21.195/product.py	2012-11-27 04:42:02.000000000 +0800
+++ anaconda-13.21.195-cc/product.py	2013-08-28 10:35:50.624663521 +0800
@@ -70,3 +70,6 @@
 
 if productVersion == "development": # hack to transform for now
     productVersion = "rawhide"
+ 
+ # dddd
+ productIsFinal = True



  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值