diff options
| -rwxr-xr-x | src/fe/dialog/gli-dialog.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/fe/dialog/gli-dialog.py b/src/fe/dialog/gli-dialog.py index d0b4898..83c734e 100755 --- a/src/fe/dialog/gli-dialog.py +++ b/src/fe/dialog/gli-dialog.py @@ -79,11 +79,14 @@ Press OK to continue""") def ask_networkless(self): networkless_string = _(u"Do you want to do a networkless installation? This will limit the customizability of your install due to the limitations of the LiveCD. For example, choosing networkless will set your installation stage, portage snapshot, and limit your extra packages selections. NOTE: It is easily possible to do a networkless installation on a machine with an active Internet connection; in fact this may result in the fastest installations for many users.") #Change the Yes/No buttons - #self._d.add_persistent_args(["--yes-label", _(u"Networkless")]) - #self._d.add_persistent_args(["--no-label", _(u"Internet enabled")]) - #if self._d.yesno(networkless_string, width=70, height=20) == self._DLG_YES: + self._d.add_persistent_args(["--yes-label", _(u"Networkless")]) + self._d.add_persistent_args(["--no-label", _(u"Internet enabled")]) + if self.advanced_mode: + if self._d.yesno(networkless_string, width=70, height=20) == self._DLG_NO: + self.networkless = False + return + self.networkless = True - # try: self._install_profile.set_grp_install(None, True, None) self._install_profile.set_install_stage(None, "3", None) self._install_profile.set_dynamic_stage3(None, True, None) @@ -93,10 +96,6 @@ Press OK to continue""") self._install_profile.set_kernel_source_pkg(None, "livecd-kernel", None) self._install_profile.set_cron_daemon_pkg(None, "vixie-cron", None) self._install_profile.set_logging_daemon_pkg(None,"syslog-ng", None) - # except: - # self._d.msgbox(_(u"ERROR: Could not set networkless information in the profile")) - #else: - # self.networkless = False def ask_load_profile(self): #Reset the Yes/No labels. @@ -2105,7 +2104,9 @@ if __name__ == '__main__': #d = dialog.Dialog() gli = GLIDialog() - + if '-a' in sys.argv or '--advanced' in sys.argv: #special mode shhh don't tell anybody! + gli.advanced_mode = True + gli.show_welcome_screen() gli.ask_load_profile() #gli.ask_advanced_mode() -- Disabled. Standard mode now forced. |