소스 검색

Simplify klish xml-examples infrastructure.

git-svn-id: https://klish.googlecode.com/svn/trunk@261 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb
Serj Kalichev 13 년 전
부모
커밋
1441376ed5
4개의 변경된 파일2개의 추가작업 그리고 15개의 파일을 삭제
  1. 0 12
      xml-examples/klish/bin/klish
  2. 0 1
      xml-examples/klish/bin/klish-enable
  3. 1 1
      xml-examples/klish/etc/clish-xml/info-mode.xml
  4. 1 1
      xml-examples/klish/etc/init.d/klish-init

+ 0 - 12
xml-examples/klish/bin/klish

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-export SYSTEM_NAME=`hostname`
-
-progname=`basename $0`
-
-if [ "$progname" = "klish-enable" ]; then
-	export CLISH_PATH=/etc/clish-enable
-fi
-
-exec /usr/bin/clish "$@"
-

+ 0 - 1
xml-examples/klish/bin/klish-enable

@@ -1 +0,0 @@
-klish

+ 1 - 1
xml-examples/klish/etc/clish-xml/info-mode.xml

@@ -19,7 +19,7 @@
 	<COMMAND name="enable"
 		help="Turn on privileged commands"
 		lock="false">
-		<ACTION>su -c klish-enable</ACTION>
+		<ACTION>su -l -c "clish -x /etc/clish-enable"</ACTION>
 	</COMMAND>
 
 </VIEW>

+ 1 - 1
xml-examples/klish/etc/init.d/klish-init

@@ -4,5 +4,5 @@
 /usr/bin/konfd >/dev/null 2>/dev/null &
 
 # Initialize system with startup-config
-CLISH_VIEW=configure-view /bin/klish-enable /etc/startup-config
+/usr/bin/clish -x /etc/clish-enable -w configure-view /etc/startup-config