From 46de99a245db4778b70dd8c33972f918f39f3780 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Thu, 20 Mar 2008 16:51:12 -0400
Subject: 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
---
 anaconda | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'anaconda')

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, ':')
-- 
cgit