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
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
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
17 devicePath = entry.device.setupDevice(chroot)
18 - args = [ "/usr/sbin/badblocks", "-vv", devicePath ]
19 + args = [ "/sbin/badblocks", "-vv", devicePath ]
21 # entirely too much cutting and pasting from ext2FormatFileSystem
22 fd = os.open("/dev/tty5", os.O_RDWR | os.O_CREAT | os.O_APPEND)
27 - rc = iutil.execWithRedirect("/usr/sbin/mkreiserfs",
28 + rc = iutil.execWithRedirect("/sbin/mkreiserfs",
29 ["mkreiserfs", devicePath ],
33 if entry.bytesPerInode < 2048:
34 xfsBytesPerInode = entry.bytesPerInode
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),
45 - if not os.access("/usr/sbin/mkfs.jfs", os.X_OK):
46 + if not os.access("/sbin/mkfs.jfs", os.X_OK):
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],
60 def formatDevice(self, entry, progress, chroot='/'):
61 devicePath = entry.device.setupDevice(chroot)
63 - rc = iutil.execWithRedirect("/usr/sbin/mkfs.jfs",
64 + rc = iutil.execWithRedirect("/sbin/mkfs.jfs",
69 label = labelFactory.createLabel(entry.mountpoint, self.maxLabelChars,
70 kslabel = entry.label)
72 - rc = iutil.execWithRedirect("/usr/sbin/e2label",
73 + rc = iutil.execWithRedirect("/sbin/e2label",
74 ["e2label", devicePath, label],
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) ]
85 args.extend(self.extraFormatArgs)
87 if not isys.ext2HasJournal(devicePath, makeDevNode = 0):
90 - rc = iutil.execWithRedirect("/usr/sbin/tune2fs",
91 + rc = iutil.execWithRedirect("/sbin/tune2fs",
92 ["tunefs", "-c0", "-i0", "-Odir_index",
96 log.info("Skipping migration of %s, has a journal already.\n" % devicePath)
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")
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",
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",
123 args = [ "mkdosfs", devicePath ]
126 - rc = iutil.execWithRedirect("/usr/sbin/mkdosfs", args,
127 + rc = iutil.execWithRedirect("/sbin/mkdosfs", args,
128 stdout = "/dev/tty5",
129 stderr = "/dev/tty5")
132 isys.makeDevInode(disk[5:], disk)
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")
140 @@ -2069,7 +2069,7 @@
141 PartitionDevice(device).setupDevice(chroot,
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,)]
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
153 if os.access ("./anaconda", os.X_OK):
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"
160 - path = "/usr/bin/anaconda"
161 + path = "/usr/sbin/anaconda"
163 os.execv (path, ("syslogd", "--syslogd", root, log))