diff --git a/interface/ri_install.py b/interface/ri_install.py index 79ba8a1..97a3dbc 100644 --- a/interface/ri_install.py +++ b/interface/ri_install.py @@ -48,8 +48,6 @@ def main(): has_run = False -oper_list = [ri_oper.MakeRaid(3),ri_oper.Format(7),ri_oper.Mount(3),ri_oper.InstallPkg(54),ri_oper.MakeRaidConfigure(2),ri_oper.ConfigureFstab(5),ri_oper.GenerateIssue(3),ri_oper.ConfigureNetwork(2),ri_oper.MakeServiceAutoBoot(5),ri_oper.CopyKernel(7),ri_oper.ConfigureBootloader(5),ri_oper.BootLoader(2),ri_oper.ExecFinishInstall(2)] - def print_usages(): print 'Usages: %s [-l|--language language] [-d|--display display-mode] [install_xml_file]' %sys.argv[0] @@ -82,4 +80,6 @@ ri_oper.display_operation = display.set_task ri_oper.display_sub_operation = display.set_sub_task ri_oper.display_scale = display.set_task_scale +oper_list = [ri_oper.MakeRaid(3),ri_oper.Format(7),ri_oper.Mount(3),ri_oper.InstallPkg(54),ri_oper.MakeRaidConfigure(2),ri_oper.ConfigureFstab(5),ri_oper.GenerateIssue(3),ri_oper.ConfigureNetwork(2),ri_oper.MakeServiceAutoBoot(5),ri_oper.CopyKernel(7),ri_oper.ConfigureBootloader(5),ri_oper.BootLoader(2),ri_oper.ExecFinishInstall(2)] + display.start(main) diff --git a/interface/ri_oper.py b/interface/ri_oper.py index a1191ca..70aa170 100644 --- a/interface/ri_oper.py +++ b/interface/ri_oper.py @@ -186,7 +186,7 @@ class InstallPkg(Operation): def get_stdin(self): pkgname = ri_data.Group.get_install_pkgs() + ri_dep.extra_pkgs self.steps += len(pkgname) - return '\n'.join(pkgname) + return '\n'.join(pkgname) + '\n' def get_arguments(self): return ["-s","/Rocky/packages"]