summaryrefslogtreecommitdiffstats
path: root/defaultenv-2
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-04-04 14:20:32 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-04-04 14:20:32 +0200
commit8f2c6a3d2b513e64f680e7e9a70d1e068b71110a (patch)
tree2cd7facc579bfe2c268567a35e8322f178b692dc /defaultenv-2
parent4856aee6a85e50ce73a9d8a2b827766454faf033 (diff)
parenta17aee8d86956f0e6071489f37d45a8f264dabdb (diff)
downloadbarebox-8f2c6a3d2b513e64f680e7e9a70d1e068b71110a.tar.gz
barebox-8f2c6a3d2b513e64f680e7e9a70d1e068b71110a.tar.xz
Merge branch 'for-next/misc'
Diffstat (limited to 'defaultenv-2')
-rw-r--r--defaultenv-2/menu/menu/mainmenu6
-rw-r--r--defaultenv-2/menu/menu/settings21
2 files changed, 22 insertions, 5 deletions
diff --git a/defaultenv-2/menu/menu/mainmenu b/defaultenv-2/menu/menu/mainmenu
index c74cc9c767..f10f67a62f 100644
--- a/defaultenv-2/menu/menu/mainmenu
+++ b/defaultenv-2/menu/menu/mainmenu
@@ -14,11 +14,7 @@ while true; do
boot-entries-collect
- menu -e -a -R -m boot -c "$global.editcmd /env/network/eth0" -d "Network settings"
- menu -e -a -R -m boot -c "$global.editcmd /env/config" -d "Config settings"
- menu -e -a -m boot -c "boot-entries-edit" -d "Edit boot entries"
- menu -e -a -m boot -c "init-entries-edit" -d "Edit init entries"
- menu -e -a -R -m boot -c "saveenv || echo \"failed to save environment\" && sleep 2" -d "Save settings"
+ menu -e -a -m boot -c "settings" -d "Settings"
menu -e -a -m boot -c 'PATH=$savepath; echo "enter exit to return to menu"; sh' -d "${DARK_YELLOW}Shell${NC}"
menu -e -a -m boot -c reset -d "${RED}Reset${NC}"
diff --git a/defaultenv-2/menu/menu/settings b/defaultenv-2/menu/menu/settings
new file mode 100644
index 0000000000..3b95d4ce16
--- /dev/null
+++ b/defaultenv-2/menu/menu/settings
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+export menu_exit=false
+
+while true; do
+ menu -a -m settings -d "${CYAN}Settings${NC}"
+
+ menu -e -a -R -m settings -c "$global.editcmd /env/network/eth0" -d "Network settings"
+ menu -e -a -R -m settings -c "$global.editcmd /env/config" -d "Config settings"
+ menu -e -a -m settings -c "settings-entries-edit" -d "Edit settings entries"
+ menu -e -a -m settings -c "init-entries-edit" -d "Edit init entries"
+ menu -e -a -R -m settings -c "saveenv || echo \"failed to save environment\" && sleep 2" -d "Save settings"
+ menu -e -a -m settings -c "menu_exit=true" -d "back"
+
+ menu -s -m settings
+ menu -r -m settings
+
+ if [ $menu_exit = true ]; then
+ exit
+ fi
+done