Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0afc1fdc authored by Ethan Yonker's avatar Ethan Yonker Committed by Dees Troy
Browse files

Fix reboot when no OS is present

Change-Id: Idc3d3c79b8a7acf0f632ed39703766005d73de29
parent 84d61ce3
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@
		<page name="reboot_system_routine">
			<action>
				<action function="set">tw_action=reboot</action>
				<action function="set">tw_reboot_param=system</action>
				<action function="set">tw_action_param=system</action>
				<action function="set">tw_has_action2=0</action>
				<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
				<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
@@ -2617,6 +2617,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=poweroff</action>
					<action function="set">tw_reboot_param=poweroff</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -2635,6 +2636,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=recovery</action>
					<action function="set">tw_reboot_param=recovery</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -2653,6 +2655,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=bootloader</action>
					<action function="set">tw_reboot_param=bootloader</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -2671,6 +2674,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=download</action>
					<action function="set">tw_reboot_param=download</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+5 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@
		<page name="reboot_system_routine">
			<action>
				<action function="set">tw_action=reboot</action>
				<action function="set">tw_reboot_param=system</action>
				<action function="set">tw_action_param=system</action>
				<action function="set">tw_has_action2=0</action>
				<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
				<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
@@ -2774,6 +2774,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=poweroff</action>
					<action function="set">tw_reboot_param=poweroff</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -2792,6 +2793,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=recovery</action>
					<action function="set">tw_reboot_param=recovery</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -2810,6 +2812,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=bootloader</action>
					<action function="set">tw_reboot_param=bootloader</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -2828,6 +2831,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=download</action>
					<action function="set">tw_reboot_param=download</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
+5 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@
			<action>
				<action function="set">tw_back=main2</action>
				<action function="set">tw_action=reboot</action>
				<action function="set">tw_reboot_param=system</action>
				<action function="set">tw_action_param=system</action>
				<action function="set">tw_has_action2=0</action>
				<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
				<action function="set">tw_text2={@no_osrb=sure you wish to reboot?}</action>
@@ -3272,6 +3272,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=poweroff</action>
					<action function="set">tw_reboot_param=poweroff</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -3290,6 +3291,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=recovery</action>
					<action function="set">tw_reboot_param=recovery</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -3308,6 +3310,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=bootloader</action>
					<action function="set">tw_reboot_param=bootloader</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>
@@ -3326,6 +3329,7 @@
				<actions>
					<action function="set">tw_back=reboot</action>
					<action function="set">tw_action=reboot</action>
					<action function="set">tw_action_param=download</action>
					<action function="set">tw_reboot_param=download</action>
					<action function="set">tw_has_action2=0</action>
					<action function="set">tw_text1={@no_os1=No OS Installed! Are you}</action>