git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
694c9c9
)
- fix get_partition_path_from_device() to work with 2.x cds that may or
author
Mark Huang
<mlhuang@cs.princeton.edu>
Sat, 13 Jan 2007 18:05:58 +0000
(18:05 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Sat, 13 Jan 2007 18:05:58 +0000
(18:05 +0000)
may not use devfs
source/steps/InstallPartitionDisks.py
patch
|
blob
|
history
diff --git
a/source/steps/InstallPartitionDisks.py
b/source/steps/InstallPartitionDisks.py
index
d7c6468
..
42ce5e5
100644
(file)
--- a/
source/steps/InstallPartitionDisks.py
+++ b/
source/steps/InstallPartitionDisks.py
@@
-293,11
+293,14
@@
def get_partition_path_from_device( device, vars, log ):
else:
part_path= device + "1"
else:
else:
part_path= device + "1"
else:
- #
since
device ends in /disc, we need to make it end in
+ #
if
device ends in /disc, we need to make it end in
# /part1 to indicate the first partition (for devfs based 2.x cds)
dev_parts= string.split(device,"/")
# /part1 to indicate the first partition (for devfs based 2.x cds)
dev_parts= string.split(device,"/")
- dev_parts[len(dev_parts)-1]= "part1"
- part_path= string.join(dev_parts,"/")
+ if dev_parts[-1] == "disc":
+ dev_parts[-1]= "part1"
+ part_path= string.join(dev_parts,"/")
+ else:
+ part_path= device + "1"
return part_path
return part_path