1 --- anaconda-11.0.5/constants.py 2006-03-07 18:45:05.000000000 +0200
2 +++ /usr/lib/anaconda/constants.py 2006-05-17 23:50:54.459319784 +0300
7 -cmdline = open("/proc/cmdline", "r").read()
8 -if cmdline.find("debug") != -1:
11 + cmdline = open("/proc/cmdline", "r").read()
12 + if cmdline.find("debug") != -1:
19 --- anaconda-11.0.5/flags.py 2006-02-09 20:43:41.000000000 +0200
20 +++ /usr/lib/anaconda/flags.py 2006-05-17 23:54:11.513723977 +0300
22 self.__dict__['flags']['virtpconsole'] = None
25 - # determine if selinux is enabled or not
26 - f = open("/proc/cmdline", "r")
30 + # determine if selinux is enabled or not
31 + f = open("/proc/cmdline", "r")
35 - tokens = line.split()
37 - if tok == "selinux":
38 - self.__dict__['flags']['selinux'] = 1
39 - elif tok == "selinux=0":
40 - self.__dict__['flags']['selinux'] = 0
41 - elif tok == "selinux=1":
42 - self.__dict__['flags']['selinux'] = 1
43 + tokens = line.split()
45 + if tok == "selinux":
46 + self.__dict__['flags']['selinux'] = 1
47 + elif tok == "selinux=0":
48 + self.__dict__['flags']['selinux'] = 0
49 + elif tok == "selinux=1":
50 + self.__dict__['flags']['selinux'] = 1
52 - if not os.path.exists("/selinux/load"):
53 - self.__dict__['flags']['selinux'] = 0
54 + if not os.path.exists("/selinux/load"):
55 + self.__dict__['flags']['selinux'] = 0
61 --- anaconda-11.0.5/iutil.py 2006-02-06 23:06:46.000000000 +0200
62 +++ /usr/lib/anaconda/iutil.py 2006-05-17 23:55:32.015524290 +0300
64 myarch = rhpl.arch.canonArch
66 # now allow an override with rpmarch=i586 on the command line (#101971)
67 - f = open("/proc/cmdline", "r")
72 - if arg.startswith("rpmarch="):
75 + f = open("/proc/cmdline", "r")
80 + if arg.startswith("rpmarch="):
85 # now make the current install believe it, too
86 rhpl.arch.canonArch = myarch