From fac3c6040e05e71cd6ee8beac72cfb4c93c6641a Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Fri, 26 Sep 2014 13:49:48 +0000
Subject: [PATCH] bug on virtualbox VMs for hostname bash command.
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5808 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash | 3 ++-
targets/PROJECTS/GENERIC-LTE-EPC/utils.bash | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash
index 63535b1abbc..5a0b462aec7 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_epc.bash
@@ -327,6 +327,7 @@ PCAP_S1C_LOG_FILE=tshark_mme_s1c.$HOSTNAME.pcap
PCAP_S6A_LOG_FILE=tshark_mme_s6a.$HOSTNAME.pcap
#rotate_log_file $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$PCAP_S6A_LOG_FILE
+PCAP_S6A_S1C_LOG_FILE=tshark_mme_s6a_s1c.$HOSTNAME.pcap
touch $THIS_SCRIPT_PATH/kill_epc.bash
@@ -344,7 +345,7 @@ MME_INTERFACE_NAME_FOR_S6A=`ip route get $HSS_IP | grep $HSS_IP | cut -d ' ' -f
echo_success "MME_INTERFACE_NAME_FOR_S1_MME : $MME_INTERFACE_NAME_FOR_S1_MME"
echo_success "MME_INTERFACE_NAME_FOR_S6A : $MME_INTERFACE_NAME_FOR_S6A"
if [ x$MME_INTERFACE_NAME_FOR_S1_MME == x$MME_INTERFACE_NAME_FOR_S6A ]; then
- nohup tshark -i $MME_INTERFACE_NAME_FOR_S1_MME -f "not port 22" -w $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$PCAP_S1C_LOG_FILE &
+ nohup tshark -i $MME_INTERFACE_NAME_FOR_S1_MME -f "not port 22" -w $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$PCAP_S6A_S1C_LOG_FILE &
else
nohup tshark -i $MME_INTERFACE_NAME_FOR_S1_MME -f "not port 22" -w $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$PCAP_S1C_LOG_FILE &
nohup tshark -i $MME_INTERFACE_NAME_FOR_S6A -f "not port 22" -w $THIS_SCRIPT_PATH/OUTPUT/$HOSTNAME/$PCAP_S6A_LOG_FILE &
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
index 3a4e80a2ee8..3e448d8baf4 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/utils.bash
@@ -47,6 +47,11 @@ ROOT_UID=0
E_NOTROOT=67
HOSTNAME=$(hostname -f)
+if [ $? -eq 1 ]
+then
+ HOSTNAME=$(hostname)
+fi
+
IPTABLES=`which iptables`
trim ()
--
GitLab