[Astlinux-commits] SF.net SVN: astlinux:[7501] branches/1.0/project/runnix-iso/target_skeleton

[<abe...@us...>]

Revision: 7501
          http://sourceforge.net/p/astlinux/code/7501
Author:   abelbeck
Date:     2016-02-03 12:26:57 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, add 'Network' menu item to choose to 'Exit to shell with ssh server'

Modified Paths:
--------------
    branches/1.0/project/runnix-iso/target_skeleton/runnix
    branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu

Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix	2016-02-02 23:19:10 UTC (rev 7500)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix	2016-02-03 12:26:57 UTC (rev 7501)
@@ -166,13 +166,16 @@
 
 echo "Menu..."
 /sbin/installer-menu
+menu_rtn=$?
 
 if [ -f $BASE/os/default.conf ]; then
   . $BASE/os/default.conf
 fi
 
-if setup_network eth0; then
-  setup_ssh 2222
+if [ $menu_rtn -eq 8 ]; then
+  if setup_network eth0; then
+    setup_ssh 2222
+  fi
 fi
 do_shell
 # reboot

Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu	2016-02-02 23:19:10 UTC (rev 7500)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu	2016-02-03 12:26:57 UTC (rev 7501)
@@ -50,7 +50,7 @@
     --backtitle "$BACKTITLE" \
     --title "[ AstLinux Install Image ]" \
     --menu "UP/DOWN arrow keys to select the AstLinux Install Image:" \
-    12 60 2 $(menu_image)
+    12 60 3 $(menu_image)
 }
 
 menu_disk()
@@ -72,7 +72,7 @@
     --backtitle "$BACKTITLE" \
     --title "[ Target Install Disk ]" \
     --menu "UP/DOWN arrow keys to select the target install disk:\nWarning: Selected disk will be overwritten !" \
-    12 60 2 $(menu_disk)
+    12 60 3 $(menu_disk)
 }
 
 install_disk()
@@ -212,13 +212,16 @@
     --title "[ $BACKTITLE Menu ]" \
     --no-cancel \
     --menu "UP/DOWN arrow keys to select actions:" \
-    12 60 4 \
+    12 60 5 \
     Install "Install AstLinux to an existing drive" \
     Shutdown "Shutdown the install system" \
     Reboot "Reboot the install system" \
+    Network "Exit to shell with ssh server" \
     Shell "Exit to shell"
 }
 
+menu_rtn=0
+
 while true; do
   select_main 2>"$TMP_RESULT"
   MAIN="$(cat "$TMP_RESULT")"
@@ -227,10 +230,12 @@
     Install) do_install ;;
     Shutdown) do_shutdown ;;
     Reboot) do_reboot ;;
+    Network) menu_rtn=8 ; break ;;
     Shell) break ;;
   esac
 done
 
 rm -f "$TMP_RESULT"
 clear
+exit $menu_rtn
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.