Consistency: calamares_main ==> run; global_storage => globalStorage

This commit is contained in:
Teo Mrnjavac 2014-07-25 16:41:21 +02:00
parent fb6d80ccb6
commit beafcd9cc4
7 changed files with 31 additions and 29 deletions

View file

@ -52,13 +52,13 @@ def mountPartitions( rootMountPoint, partitions ):
)
def calamares_main():
def run():
rootMountPoint = tempfile.mkdtemp( prefix="calamares-root-" )
partitions = libcalamares.global_storage.value( "partitions" )
partitions = libcalamares.globalStorage.value( "partitions" )
# Sort by mount points to ensure / is mounted before the rest
partitions.sort( key = lambda x: x[ "mountPoint" ] )
mountPartitions( rootMountPoint, libcalamares.global_storage.value( "partitions" ) )
mountPartitions( rootMountPoint, libcalamares.globalStorage.value( "partitions" ) )
libcalamares.global_storage.insert( "rootMountPoint", rootMountPoint )
libcalamares.globalStorage.insert( "rootMountPoint", rootMountPoint )
return "All done, mounted at {}".format( rootMountPoint )