summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2008-03-20 16:51:12 -0400
committerJeremy Katz <katzj@redhat.com>2008-03-20 16:51:12 -0400
commit46de99a245db4778b70dd8c33972f918f39f3780 (patch)
treea06415a7aa5324f95fb6f76c0be739c2d78fa4a1 /anaconda
parente1de255048cfed5dc120b6e7f77dfc65ebfaeaba (diff)
downloadanaconda-46de99a245db4778b70dd8c33972f918f39f3780.tar.gz
anaconda-46de99a245db4778b70dd8c33972f918f39f3780.tar.xz
anaconda-46de99a245db4778b70dd8c33972f918f39f3780.zip
Handle /dev being on hard drive devices in the second stage
Sometimes, we can have a device without the leading /dev (method= or stage2= for compatibility) and doing strrchr breaks on cciss too. So just pass whatever we got to the second stage and deal with it where we can at least use python string handling
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda2
1 files changed, 2 insertions, 0 deletions
diff --git a/anaconda b/anaconda
index 502916546..d84403624 100755
--- a/anaconda
+++ b/anaconda
@@ -585,6 +585,8 @@ class Anaconda:
f.write("cdrom\n")
elif self._loaderMethodstr.startswith('hd:'):
(partition, filesystem, dir) = string.split(self._loaderMethodstr[3:], ':')
+ if partition.startswith("/dev/"):
+ partition = partition[5:]
f.write("harddrive --partition=%s --dir=%s\n" % (partition, dir))
elif self._loaderMethodstr.startswith('nfs:') or self._loaderMethodstr.startswith('nfsiso:'):
(method, server, dir) = string.split(self._loaderMethodstr, ':')