From 20031bd7731dfc41f54d643299bf1fce375edc43 Mon Sep 17 00:00:00 2001
From: arrow_zhang <arrowworld@gmail.com>
Date: Fri, 23 May 2008 14:32:29 +0800
Subject: [PATCH] [FIX] grub can not boot, bash_profile source arrowenv

---
 .gitignore                        | 2 ++
 conf_slk120/Makefile              | 2 ++
 conf_slk120/bash/.bash_profile    | 2 +-
 conf_slk120/grub/Makefile         | 2 +-
 conf_slk120/grub/menu.lst.ACER    | 3 ++-
 conf_slk120/ssh/Makefile          | 6 ++++++
 conf_slk120/sysinit/Makefile      | 4 ++--
 conf_slk120/sysinit/rc.local.ACER | 2 --
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c2ff61f..bfb345b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 
 Module.symvers
 .tmp_versions
+
+conf_slk120/ssh/.ssh/known_hosts
diff --git a/conf_slk120/Makefile b/conf_slk120/Makefile
index 683067e..84a9ce4 100644
--- a/conf_slk120/Makefile
+++ b/conf_slk120/Makefile
@@ -4,6 +4,8 @@ export TOP=$(shell pwd)
 export RM=/bin/rm -rf
 export LN=/bin/ln -s
 export ECHO=/bin/echo
+export TOUCH=/usr/bin/touch
+export INSTALL=/usr/bin/install
 
 DIRS:= bash bin dhcp dict emacs env ethereal fonts fvwm galculator
 DIRS+= git grub gtk http indent inetd latex mail mplayer rest scim
diff --git a/conf_slk120/bash/.bash_profile b/conf_slk120/bash/.bash_profile
index d0fd69b..7df4960 100644
--- a/conf_slk120/bash/.bash_profile
+++ b/conf_slk120/bash/.bash_profile
@@ -1,7 +1,7 @@
 
+source /etc/arrowenv
 if [ "$ETH_LAN" == "" ]; then
 	/bin/echo "please set ETH_LAN/ETH_WAN/ETH_WLAN first"
-	exit
 fi
 
 source .bashrc
diff --git a/conf_slk120/grub/Makefile b/conf_slk120/grub/Makefile
index 5259111..90fe89d 100644
--- a/conf_slk120/grub/Makefile
+++ b/conf_slk120/grub/Makefile
@@ -1,5 +1,5 @@
 
 all:
-	sudo ${LN} ${TOP}/grub/menu.lst.${ARROW_HOST} /boot/grub/menu.lst
+	sudo ${INSTALL} ${TOP}/grub/menu.lst.${ARROW_HOST} /boot/grub/menu.lst
 del:
 	sudo ${RM} /boot/grub/menu.lst
diff --git a/conf_slk120/grub/menu.lst.ACER b/conf_slk120/grub/menu.lst.ACER
index 8b7a19d..c46bad3 100644
--- a/conf_slk120/grub/menu.lst.ACER
+++ b/conf_slk120/grub/menu.lst.ACER
@@ -4,7 +4,8 @@
 password --md5 $1$X2ak8$nTL6SVA0a8h7F/yUoGF3C.
 timeout 1
 default 0
-color light-gray/blue black/light-gray
+# color light-gray/blue black/light-gray
+color light-green/brown blink-red/blue
 
 title slk 2.6.25.4
 	root (hd0,0)
diff --git a/conf_slk120/ssh/Makefile b/conf_slk120/ssh/Makefile
index b608cfb..7fc7eba 100644
--- a/conf_slk120/ssh/Makefile
+++ b/conf_slk120/ssh/Makefile
@@ -1,9 +1,15 @@
 
+TMP_KNM_HOST=/tmp/.tmp_known_hosts
+
 all:
 	${LN} ${TOP}/ssh/.ssh ~/.ssh
+	${TOUCH} ${TMP_KNM_HOST}
+	${INSTALL} ${TMP_KNM_HOST} ~/.ssh/known_hosts
 	sudo ${LN} ${TOP}/ssh/Equifax_Secure_Certificate_Authority.pem /etc/ssl/certs/Equifax_Secure_Certificate_Authority.pem
 
 del:
+	test -a ~/.ssh/known_hosts && ${TOUCH} ~/.ssh/known_hosts || ${ECHO} "no old hosts"
+	test -a ~/.ssh/known_hosts && ${INSTALL} ~/.ssh/known_hosts ${TMP_KNM_HOST} || ${ECHO} "re-del?"
 	${RM} ~/.ssh
 	sudo ${RM} /etc/ssl/certs/Equifax_Secure_Certificate_Authority.pem
 
diff --git a/conf_slk120/sysinit/Makefile b/conf_slk120/sysinit/Makefile
index 86dc232..7cf1907 100644
--- a/conf_slk120/sysinit/Makefile
+++ b/conf_slk120/sysinit/Makefile
@@ -1,8 +1,8 @@
 
 all:
 	sudo ${LN} ${TOP}/sysinit/rc.local.${ARROW_HOST} /etc/rc.d/rc.local
-	sudo ${LN} ${TOP}/sysinit/arrowenv /etc/rc.d/arrowenv
+	sudo ${LN} ${TOP}/sysinit/arrowenv /etc/arrowenv
 
 del:
 	sudo ${RM} /etc/rc.d/rc.local
-	sudo ${RM} /etc/rc.d/arrowenv
+	sudo ${RM} /etc/arrowenv
diff --git a/conf_slk120/sysinit/rc.local.ACER b/conf_slk120/sysinit/rc.local.ACER
index 33a736c..e0c2816 100755
--- a/conf_slk120/sysinit/rc.local.ACER
+++ b/conf_slk120/sysinit/rc.local.ACER
@@ -7,8 +7,6 @@
 # make an /etc/rc.d/rc.local_shutdown script and put those
 # commands in there.
 
-source /etc/rc.d/arrowenv
-
 modprobe e100
 modprobe loop
 #modprobe blade
-- 
2.11.4.GIT