]>
Commit | Line | Data |
---|---|---|
3e6a3a30 PZ |
1 | --- anaconda-10.2.0.52-old/scripts/getkeymaps 2004-05-20 03:00:03.000000000 +0200 |
2 | +++ anaconda-10.2.0.52/scripts/getkeymaps 2005-04-24 16:34:23.401958968 +0200 | |
3 | @@ -37,7 +37,7 @@ | |
4 | ||
5 | for map in $MAPS ; do | |
6 | eval find /lib/kbd/keymaps/$PATTERN -name "$map.map*" | while read n; do | |
7 | - /bin/loadkeys `basename $n .gz` >/dev/null | |
8 | + /usr/bin/loadkeys `basename $n .gz` >/dev/null | |
9 | $READMAP $TMPDIR/`basename $n .map.gz`.map | |
10 | done | |
11 | done | |
c0dacf7b ER |
12 | --- anaconda-11.0.5/fsset.py~ 2006-05-24 20:01:14.938740884 +0300 |
13 | +++ anaconda-11.0.5/fsset.py 2006-05-24 20:01:18.218814554 +0300 | |
9fd80055 ER |
14 | @@ -203,7 +203,7 @@ |
15 | w = None | |
16 | ||
17 | devicePath = entry.device.setupDevice(chroot) | |
18 | - args = [ "/usr/sbin/badblocks", "-vv", devicePath ] | |
19 | + args = [ "/sbin/badblocks", "-vv", devicePath ] | |
20 | ||
21 | # entirely too much cutting and pasting from ext2FormatFileSystem | |
22 | fd = os.open("/dev/tty5", os.O_RDWR | os.O_CREAT | os.O_APPEND) | |
c0dacf7b ER |
23 | @@ -406,7 +406,7 @@ |
24 | os.write(p[1], "y\n") | |
25 | os.close(p[1]) | |
26 | ||
27 | - rc = iutil.execWithRedirect("/usr/sbin/mkreiserfs", | |
28 | + rc = iutil.execWithRedirect("/sbin/mkreiserfs", | |
29 | ["mkreiserfs", devicePath ], | |
30 | stdin = p[0], | |
31 | stdout = "/dev/tty5", | |
32 | @@ -451,7 +451,7 @@ | |
33 | if entry.bytesPerInode < 2048: | |
34 | xfsBytesPerInode = entry.bytesPerInode | |
35 | ||
36 | - rc = iutil.execWithRedirect("/usr/sbin/mkfs.xfs", | |
37 | + rc = iutil.execWithRedirect("/sbin/mkfs.xfs", | |
38 | ["mkfs.xfs", "-f", "-l", "internal", | |
39 | "-i", "size=" + str(xfsBytesPerInode), | |
40 | devicePath ], | |
41 | @@ -500,7 +500,7 @@ | |
42 | except: | |
43 | self.supported = 0 | |
44 | ||
45 | - if not os.access("/usr/sbin/mkfs.jfs", os.X_OK): | |
46 | + if not os.access("/sbin/mkfs.jfs", os.X_OK): | |
47 | self.supported = 0 | |
48 | ||
49 | self.name = "jfs" | |
50 | @@ -512,7 +512,7 @@ | |
51 | devicePath = entry.device.setupDevice(chroot) | |
52 | label = labelFactory.createLabel(entry.mountpoint, self.maxLabelChars, | |
53 | kslabel = entry.label) | |
54 | - rc = iutil.execWithRedirect("/usr/sbin/jfs_tune", | |
55 | + rc = iutil.execWithRedirect("/sbin/jfs_tune", | |
56 | ["jfs_tune", "-L", label, devicePath], | |
57 | stdout = "/dev/tty5", | |
58 | stderr = "/dev/tty5") | |
59 | @@ -523,7 +523,7 @@ | |
60 | def formatDevice(self, entry, progress, chroot='/'): | |
61 | devicePath = entry.device.setupDevice(chroot) | |
62 | ||
63 | - rc = iutil.execWithRedirect("/usr/sbin/mkfs.jfs", | |
64 | + rc = iutil.execWithRedirect("/sbin/mkfs.jfs", | |
65 | ["mkfs.jfs", "-q", | |
66 | devicePath ], | |
67 | stdout = "/dev/tty5", | |
68 | @@ -549,7 +549,7 @@ | |
69 | label = labelFactory.createLabel(entry.mountpoint, self.maxLabelChars, | |
70 | kslabel = entry.label) | |
71 | ||
72 | - rc = iutil.execWithRedirect("/usr/sbin/e2label", | |
73 | + rc = iutil.execWithRedirect("/sbin/e2label", | |
74 | ["e2label", devicePath, label], | |
75 | stdout = "/dev/tty5", | |
76 | stderr = "/dev/tty5") | |
77 | @@ -560,7 +560,7 @@ | |
78 | def formatDevice(self, entry, progress, chroot='/'): | |
79 | devicePath = entry.device.setupDevice(chroot) | |
80 | devArgs = self.getDeviceArgs(entry.device) | |
81 | - args = [ "/usr/sbin/mke2fs", devicePath, "-i", str(entry.bytesPerInode) ] | |
82 | + args = [ "/sbin/mke2fs", devicePath, "-i", str(entry.bytesPerInode) ] | |
83 | ||
84 | args.extend(devArgs) | |
85 | args.extend(self.extraFormatArgs) | |
86 | @@ -586,7 +586,7 @@ | |
87 | if not isys.ext2HasJournal(devicePath, makeDevNode = 0): | |
88 | return | |
89 | ||
90 | - rc = iutil.execWithRedirect("/usr/sbin/tune2fs", | |
91 | + rc = iutil.execWithRedirect("/sbin/tune2fs", | |
92 | ["tunefs", "-c0", "-i0", "-Odir_index", | |
93 | devicePath], | |
94 | stdout = "/dev/tty5", | |
95 | @@ -614,7 +614,7 @@ | |
96 | log.info("Skipping migration of %s, has a journal already.\n" % devicePath) | |
97 | return | |
98 | ||
99 | - rc = iutil.execWithRedirect("/usr/sbin/tune2fs", | |
100 | + rc = iutil.execWithRedirect("/sbin/tune2fs", | |
101 | ["tune2fs", "-j", devicePath ], | |
102 | stdout = "/dev/tty5", | |
103 | stderr = "/dev/tty5") | |
104 | @@ -766,7 +766,7 @@ | |
105 | ||
106 | def formatDevice(self, entry, progress, chroot='/'): | |
107 | file = entry.device.setupDevice(chroot) | |
108 | - rc = iutil.execWithRedirect ("/usr/sbin/mkswap", | |
109 | + rc = iutil.execWithRedirect ("/sbin/mkswap", | |
110 | [ "mkswap", '-v1', file ], | |
111 | stdout = "/dev/tty5", | |
112 | stderr = "/dev/tty5", | |
113 | @@ -786,7 +786,7 @@ | |
114 | else: | |
115 | swapLabel = "SWAP-%s" % (devName) | |
116 | label = labelFactory.createLabel(swapLabel, self.maxLabelChars) | |
117 | - rc = iutil.execWithRedirect ("/usr/sbin/mkswap", | |
118 | + rc = iutil.execWithRedirect ("/sbin/mkswap", | |
119 | [ "mkswap", '-v1', "-L", label, file ], | |
120 | stdout = "/dev/tty5", | |
121 | stderr = "/dev/tty5", | |
122 | @@ -824,7 +824,7 @@ | |
123 | args = [ "mkdosfs", devicePath ] | |
124 | args.extend(devArgs) | |
125 | ||
126 | - rc = iutil.execWithRedirect("/usr/sbin/mkdosfs", args, | |
127 | + rc = iutil.execWithRedirect("/sbin/mkdosfs", args, | |
128 | stdout = "/dev/tty5", | |
129 | stderr = "/dev/tty5") | |
130 | if rc: | |
131 | @@ -965,7 +965,7 @@ | |
132 | isys.makeDevInode(disk[5:], disk) | |
133 | ||
134 | log.info("going to run %s" %(args,)) | |
135 | - rc = iutil.execWithRedirect("/usr/sbin/sfdisk", args, | |
136 | + rc = iutil.execWithRedirect("/sbin/sfdisk", args, | |
137 | stdout = "/dev/tty5", stderr = "/dev/tty5") | |
138 | if rc: | |
139 | raise SystemError | |
140 | @@ -2069,7 +2069,7 @@ | |
141 | PartitionDevice(device).setupDevice(chroot, | |
142 | devPrefix=devPrefix) | |
143 | ||
144 | - args = ["/usr/sbin/mdadm", "--create", "/dev/%s" %(self.device,), | |
145 | + args = ["/sbin/mdadm", "--create", "/dev/%s" %(self.device,), | |
146 | "--run", "--chunk=%s" %(self.chunksize,), | |
147 | "--level=%s" %(self.level,), | |
148 | "--raid-devices=%s" %(self.numDisks,)] | |
97561c56 ER |
149 | --- anaconda-11.0.5/syslogd.py~ 2005-08-12 20:02:54.000000000 +0300 |
150 | +++ anaconda-11.0.5/syslogd.py 2006-05-24 20:53:09.758604131 +0300 | |
151 | @@ -77,10 +77,10 @@ | |
152 | if not path: | |
153 | if os.access ("./anaconda", os.X_OK): | |
154 | path = "./anaconda" | |
155 | - elif os.access ("/usr/bin/anaconda.real", os.X_OK): | |
156 | - path = "/usr/bin/anaconda.real" | |
157 | + elif os.access ("/usr/sbin/anaconda.real", os.X_OK): | |
158 | + path = "/usr/sbin/anaconda.real" | |
159 | else: | |
160 | - path = "/usr/bin/anaconda" | |
161 | + path = "/usr/sbin/anaconda" | |
162 | ||
163 | os.execv (path, ("syslogd", "--syslogd", root, log)) | |
164 |