/[gli]/branches/overhaul/src/GLIArchitectureTemplate.py
Gentoo

Diff of /branches/overhaul/src/GLIArchitectureTemplate.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 599 Revision 600
1""" 1"""
2Gentoo Linux Installer 2Gentoo Linux Installer
3 3
4$Id: GLIArchitectureTemplate.py,v 1.119 2005/05/27 18:58:58 agaffney Exp $ 4$Id: GLIArchitectureTemplate.py,v 1.120 2005/05/27 19:07:40 agaffney Exp $
5Copyright 2005 Gentoo Technologies Inc. 5Copyright 2005 Gentoo Technologies Inc.
6 6
7The ArchitectureTemplate is largely meant to be an abstract class and an 7The ArchitectureTemplate is largely meant to be an abstract class and an
8interface (yes, it is both at the same time!). The purpose of this is to create 8interface (yes, it is both at the same time!). The purpose of this is to create
9subclasses that populate all the methods with working methods for that architecture. 9subclasses that populate all the methods with working methods for that architecture.
273 parts = self._install_profile.get_partition_tables() 273 parts = self._install_profile.get_partition_tables()
274 parts_to_mount = {} 274 parts_to_mount = {}
275 for device in parts: 275 for device in parts:
276 tmp_partitions = parts[device].get_install_profile_structure() 276 tmp_partitions = parts[device].get_install_profile_structure()
277 for partition in tmp_partitions: 277 for partition in tmp_partitions:
278 mountpoint = parts[device][partition]['mountpoint'] 278 mountpoint = tmp_partitions[partition]['mountpoint']
279 mountopts = parts[device][partition]['mountopts'] 279 mountopts = tmp_partitions[partition]['mountopts']
280 minor = str(int(parts[device][partition]['minor'])) 280 minor = str(int(tmp_partitions[partition]['minor']))
281 partition_type = parts[device][partition]['type'] 281 partition_type = tmp_partitions[partition]['type']
282 if mountpoint: 282 if mountpoint:
283 if mountopts: 283 if mountopts:
284 mountopts = "-o "+mountopts+" " 284 mountopts = "-o "+mountopts+" "
285 if partition_type: 285 if partition_type:
286 partition_type = "-t "+partition_type+" " 286 partition_type = "-t "+partition_type+" "
417 newfstab = "" 417 newfstab = ""
418 parts = self._install_profile.get_partition_tables() 418 parts = self._install_profile.get_partition_tables()
419 for device in parts: 419 for device in parts:
420 tmp_partitions = parts[device].get_install_profile_structure() 420 tmp_partitions = parts[device].get_install_profile_structure()
421 for partition in tmp_partitions: 421 for partition in tmp_partitions:
422 mountpoint = parts[device][partition]['mountpoint'] 422 mountpoint = tmp_partitions[partition]['mountpoint']
423 minor = str(int(parts[device][partition]['minor'])) 423 minor = str(int(tmp_partitions[partition]['minor']))
424 partition_type = parts[device][partition]['type'] 424 partition_type = tmp_partitions[partition]['type']
425 mountopts = parts[device][partition]['mountopts'] 425 mountopts = tmp_partitions[partition]['mountopts']
426 if not mountopts.strip(): mountopts = "defaults" 426 if not mountopts.strip(): mountopts = "defaults"
427 if mountpoint: 427 if mountpoint:
428 if not GLIUtility.is_file(self._chroot_dir+mountpoint): 428 if not GLIUtility.is_file(self._chroot_dir+mountpoint):
429 exitstatus = GLIUtility.spawn("mkdir -p " + self._chroot_dir + mountpoint) 429 exitstatus = GLIUtility.spawn("mkdir -p " + self._chroot_dir + mountpoint)
430 if exitstatus != 0: 430 if exitstatus != 0:
626 parts = self._install_profile.get_partition_tables() 626 parts = self._install_profile.get_partition_tables()
627 filesystem_tools = [] 627 filesystem_tools = []
628 for device in parts: 628 for device in parts:
629 tmp_partitions = parts[device].get_install_profile_structure() 629 tmp_partitions = parts[device].get_install_profile_structure()
630 for partition in tmp_partitions: 630 for partition in tmp_partitions:
631 partition_type = parts[device][partition]['type'] 631 partition_type = tmp_partitions[partition]['type']
632 if partition_type not in filesystem_tools: 632 if partition_type not in filesystem_tools:
633 filesystem_tools.append(partition_type) 633 filesystem_tools.append(partition_type)
634 for filesystem in filesystem_tools: 634 for filesystem in filesystem_tools:
635 if filesystem.lower() == "xfs": 635 if filesystem.lower() == "xfs":
636 exitstatus = self._emerge("xfsprogs") 636 exitstatus = self._emerge("xfsprogs")

Legend:
Removed from v.599  
changed lines
  Added in v.600

  ViewVC Help
Powered by ViewVC 1.1.20