Rename configure to setup.

Fix install mbr.

install/cl_install.py

@@ -810,9 +810,10 @@ class Install(color_print):
             if self.clVars.Get('cl_setup') == 'boot' and \
                 self.clVars.Get('os_root_type') != 'livecd':
                 target = self.clVars.Get('cl_image')
-                self.startTask(_("Installing bootloader"))
-                self.prepareBoot(target)
-                self.endTask()
+                if self.clVars.Get('os_install_mbr'):
+                    self.startTask(_("Installing bootloader"))
+                    self.prepareBoot(target)
+                    self.endTask()
                 root_dev = self.clVars.Select('os_disk_parent',
                                        where='os_disk_mount',
                                        eq='/',limit=1)
@@ -830,6 +831,9 @@ class Install(color_print):
                         pass
             if not setupType:
                 self.installDesktopClient()
+        except KeyboardInterrupt:
+            error = _("Configuration manually interrupted")
+            self.printERROR(error)
         except (MigrationError,
                 TemplatesError,
                 InstallError,

install/cl_wsdl_install.py

@@ -308,7 +308,7 @@ class Wsdl:
         self.set_cache(sid, 'install_pxe', "vars",dv,smart=False)
         return view
 
-    def configure_network_vars(self):
+    def setup_network_vars(self):
         dv = cl_install.DataVarsInstall()
         dv.importInstall()
         dv.flIniFile()
@@ -326,31 +326,31 @@ class Wsdl:
     @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
     @core_method(category=__('Configuration'),title=__('Network'),
         image='network-idle,preferences-system-network',
-        command="cl-configure-network",
-        gui=True, rights=['configure'])
-    def configure_network ( self, sid, info):
+        command="cl-setup-network",
+        gui=True, rights=['setup'])
+    def setup_network ( self, sid, info):
         """
         Setup network
         """
-        return self.installCommon(sid,info,'configure_network',
-                                  self.configure_network_vars,
+        return self.installCommon(sid,info,'setup_network',
+                                  self.setup_network_vars,
                                   installFunc="setupSystem")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @catchExcept
-    def configure_network_view (self, sid, params):
-        dv = self.get_cache(sid,"configure_network","vars")
+    def setup_network_view (self, sid, params):
+        dv = self.get_cache(sid,"setup_network","vars")
         if not dv:
-            dv = self.configure_network_vars()
+            dv = self.setup_network_vars()
         else:
             dv.processRefresh()
         view = ViewInfo(dv,step=params.step,
                            expert=params.expert,
                            brief=params.brief)
-        self.set_cache(sid, 'configure_network', "vars",dv,smart=False)
+        self.set_cache(sid, 'setup_network', "vars",dv,smart=False)
         return view
 
-    def configure_video_vars(self):
+    def setup_video_vars(self):
         dv = cl_install.DataVarsInstall()
         dv.importInstall()
         dv.flIniFile()
@@ -366,31 +366,31 @@ class Wsdl:
     @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
     @core_method(category=__('Configuration'),title=__('Video'),
         image='gnome-multimedia,video-display',
-        command="cl-configure-video",
-        gui=True, rights=['configure'])
-    def configure_video ( self, sid, info):
+        command="cl-setup-video",
+        gui=True, rights=['setup'])
+    def setup_video ( self, sid, info):
         """
         Setup video
         """
-        return self.installCommon(sid,info,'configure_video',
-                                  self.configure_video_vars,
+        return self.installCommon(sid,info,'setup_video',
+                                  self.setup_video_vars,
                                   installFunc="setupSystem")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @catchExcept
-    def configure_video_view (self, sid, params):
-        dv = self.get_cache(sid,"configure_video","vars")
+    def setup_video_view (self, sid, params):
+        dv = self.get_cache(sid,"setup_video","vars")
         if not dv:
-            dv = self.configure_video_vars()
+            dv = self.setup_video_vars()
         else:
             dv.processRefresh()
         view = ViewInfo(dv,step=params.step,
                            expert=params.expert,
                            brief=params.brief)
-        self.set_cache(sid, 'configure_video', "vars",dv,smart=False)
+        self.set_cache(sid, 'setup_video', "vars",dv,smart=False)
         return view
 
-    def configure_locale_vars(self):
+    def setup_locale_vars(self):
         dv = cl_install.DataVarsInstall()
         dv.importInstall()
         dv.flIniFile()
@@ -406,31 +406,31 @@ class Wsdl:
     @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
     @core_method(category=__('Configuration'),title=__('Locale'),
         image='locale,preferences-desktop-locale',
-        command="cl-configure-locale",
-        gui=True, rights=['configure'])
-    def configure_locale ( self, sid, info):
+        command="cl-setup-locale",
+        gui=True, rights=['setup'])
+    def setup_locale ( self, sid, info):
         """
         Setup locale
         """
-        return self.installCommon(sid,info,'configure_locale',
-                                  self.configure_locale_vars,
+        return self.installCommon(sid,info,'setup_locale',
+                                  self.setup_locale_vars,
                                   installFunc="setupSystem")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @catchExcept
-    def configure_locale_view (self, sid, params):
-        dv = self.get_cache(sid,"configure_locale","vars")
+    def setup_locale_view (self, sid, params):
+        dv = self.get_cache(sid,"setup_locale","vars")
         if not dv:
-            dv = self.configure_locale_vars()
+            dv = self.setup_locale_vars()
         else:
             dv.processRefresh()
         view = ViewInfo(dv,step=params.step,
                            expert=params.expert,
                            brief=params.brief)
-        self.set_cache(sid, 'configure_locale', "vars",dv,smart=False)
+        self.set_cache(sid, 'setup_locale', "vars",dv,smart=False)
         return view
 
-    def configure_boot_vars(self):
+    def setup_boot_vars(self):
         dv = cl_install.DataVarsInstall()
         dv.importInstall()
         dv.flIniFile()
@@ -445,31 +445,31 @@ class Wsdl:
 
     @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
     @core_method(category=__('Configuration'),title=__('Boot'),
-        image='stock_save,drive-harddisk',command="cl-configure-boot",
-        gui=True, rights=['configure'])
-    def configure_boot ( self, sid, info):
+        image='stock_save,drive-harddisk',command="cl-setup-boot",
+        gui=True, rights=['setup'])
+    def setup_boot ( self, sid, info):
         """
         Setup locale
         """
-        return self.installCommon(sid,info,'configure_boot',
-                                  self.configure_boot_vars,
+        return self.installCommon(sid,info,'setup_boot',
+                                  self.setup_boot_vars,
                                   installFunc="setupSystem")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @catchExcept
-    def configure_boot_view (self, sid, params):
-        dv = self.get_cache(sid,"configure_boot","vars")
+    def setup_boot_view (self, sid, params):
+        dv = self.get_cache(sid,"setup_boot","vars")
         if not dv:
-            dv = self.configure_boot_vars()
+            dv = self.setup_boot_vars()
         else:
             dv.processRefresh()
         view = ViewInfo(dv,step=params.step,
                            expert=params.expert,
                            brief=params.brief)
-        self.set_cache(sid, 'configure_boot', "vars",dv,smart=False)
+        self.set_cache(sid, 'setup_boot', "vars",dv,smart=False)
         return view
 
-    def configure_system_vars(self):
+    def setup_system_vars(self):
         dv = cl_install.DataVarsInstall()
         dv.importInstall()
         dv.flIniFile()
@@ -481,26 +481,26 @@ class Wsdl:
 
     @rpc(Integer, InstallInfo, _returns = Array(ReturnedMessage))
     @core_method(category=__('Configuration'),title=__('System'),
-        image='system,computer',command="cl-configure",
-        gui=True, rights=['configure'])
-    def configure_system ( self, sid, info):
+        image='system,computer',command="cl-setup-system",
+        gui=True, rights=['setup'])
+    def setup_system ( self, sid, info):
         """
-        Setup locale
+        Setup system
         """
-        return self.installCommon(sid,info,'configure_system',
-                                  self.configure_system_vars,
+        return self.installCommon(sid,info,'setup_system',
+                                  self.setup_system_vars,
                                   installFunc="setupSystem")
 
     @rpc(Integer, ViewParams,_returns = ViewInfo)
     @catchExcept
-    def configure_system_view (self, sid, params):
-        dv = self.get_cache(sid,"configure_system","vars")
+    def setup_system_view (self, sid, params):
+        dv = self.get_cache(sid,"setup_system","vars")
         if not dv:
-            dv = self.configure_system_vars()
+            dv = self.setup_system_vars()
         else:
             dv.processRefresh()
         view = ViewInfo(dv,step=params.step,
                            expert=params.expert,
                            brief=params.brief)
-        self.set_cache(sid, 'configure_system', "vars",dv,smart=False)
+        self.set_cache(sid, 'setup_system', "vars",dv,smart=False)
         return view