adding a change to force networkless mode.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1857 f8877401-5920-0410-a79b-8e2d7e04ca0d

1 files changed, 22 insertions, 22 deletions

diff --git a/src/fe/dialog/gli-dialog.py b/src/fe/dialog/gli-dialog.py
index db4025c..bbcac15 100755
--- a/src/fe/dialog/gli-dialog.py
+++ b/src/fe/dialog/gli-dialog.py
@@ -37,8 +37,8 @@ class GLIDialog(object):
 		self._DLG_HELP = 5
 		self._d.setBackgroundTitle("Gentoo Linux Installer")
 		self.profile_xml_file = None
-		self.advanced_mode = True
-		self.networkless = False
+		self.advanced_mode = False
+		self.networkless = True
 		self.just_starting = 1
 
 
@@ -79,24 +79,24 @@ 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.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)
-				self._install_profile.set_portage_tree_sync_type(None,"snapshot", None)
-				cd_snapshot_uri = GLIUtility.get_cd_snapshot_uri()
-				self._install_profile.set_portage_tree_snapshot_uri(None, cd_snapshot_uri, None)
-				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
+		#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.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)
+		self._install_profile.set_portage_tree_sync_type(None,"snapshot", None)
+		cd_snapshot_uri = GLIUtility.get_cd_snapshot_uri()
+		self._install_profile.set_portage_tree_snapshot_uri(None, cd_snapshot_uri, None)
+		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.
@@ -2096,8 +2096,8 @@ if __name__ == '__main__':
 	
 	gli.show_welcome_screen()
 	gli.ask_load_profile()
-	gli.ask_advanced_mode()
-	gli.ask_networkless()
+	#gli.ask_advanced_mode() -- Disabled.  Standard mode now forced.
+	gli.ask_networkless() #  This is now forced.
 	
 
 	gli.run_phase1()  #Set up networking