/[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 1580 Revision 1581
225 newfstab += mount['devnode']+"\t none swap sw 0 0\n" 225 newfstab += mount['devnode']+"\t none swap sw 0 0\n"
226 continue #Stop here and move on. 226 continue #Stop here and move on.
227 if not mount['mountopts'].strip(): mount['mountopts'] = "defaults" 227 if not mount['mountopts'].strip(): mount['mountopts'] = "defaults"
228 if mount['mountpoint']: 228 if mount['mountpoint']:
229 if not GLIUtility.is_file(self._chroot_dir+mount['mountpoint']): 229 if not GLIUtility.is_file(self._chroot_dir+mount['mountpoint']):
230 if self._debug: self._logger.log("DEBUG: making mountpoint: "+mount['mountpoint']) exitstatus = GLIUtility.spawn("mkdir -p " + self._chroot_dir + mount['mountpoint']) 230 if self._debug: self._logger.log("DEBUG: making mountpoint: "+mount['mountpoint'])
231 exitstatus = GLIUtility.spawn("mkdir -p " + self._chroot_dir + mount['mountpoint'])
231 if not GLIUtility.exitsuccess(exitstatus): 232 if not GLIUtility.exitsuccess(exitstatus):
232 raise GLIException("MkdirError", 'fatal','configure_fstab', "Making the mount point failed!") 233 raise GLIException("MkdirError", 'fatal','configure_fstab', "Making the mount point failed!")
233 newfstab += mount['devnode']+"\t "+mount['mountpoint']+"\t "+mount['type']+"\t "+mount['mountopts']+"\t\t " 234 newfstab += mount['devnode']+"\t "+mount['mountpoint']+"\t "+mount['type']+"\t "+mount['mountopts']+"\t\t "
234 #Now figure out the last 2 numbers depending on the mountpoint. 235 #Now figure out the last 2 numbers depending on the mountpoint.
235 if mount['mountpoint'] == "/boot": 236 if mount['mountpoint'] == "/boot":
285 elif partition_type: 286 elif partition_type:
286 if partition_type == "fat32" or partition_type == "fat16": 287 if partition_type == "fat32" or partition_type == "fat16":
287 partition_type = "vfat" 288 partition_type = "vfat"
288 partition_type = "-t " + partition_type + " " 289 partition_type = "-t " + partition_type + " "
289 else: #Unknown partition type!!! 290 else: #Unknown partition type!!!
290 self._logger.log("ERROR! : Unknown partition type for mountpoint %s which is device %s" % (mountpoint, mount['devnode']) 291 self._logger.log("ERROR! : Unknown partition type for mountpoint %s which is device %s" % (mountpoint, mount['devnode']))
291 parts_to_mount[mountpoint] = (mountopts, partition_type, mount['devnode']) 292 parts_to_mount[mountpoint] = (mountopts, partition_type, mount['devnode'])
292 293
293 sorted_list = parts_to_mount.keys() 294 sorted_list = parts_to_mount.keys()
294 sorted_list.sort() 295 sorted_list.sort()
295 296

Legend:
Removed from v.1580  
changed lines
  Added in v.1581

  ViewVC Help
Powered by ViewVC 1.1.20