Remove /var/run/rsyslogd.pid bofore starting rsyslog (#453)

This commit is contained in:
pavel-shirshov 2017-03-29 18:07:25 -07:00 committed by GitHub
parent 7f703a9c8f
commit 814fd87e63
18 changed files with 21 additions and 3 deletions

View File

@ -17,5 +17,6 @@ RUN dpkg -i /deps/libopennsl_*.deb; \
RUN mv /deps/basic_router /usr/sbin/basic_router RUN mv /deps/basic_router /usr/sbin/basic_router
ENTRYPOINT service rsyslog start \ ENTRYPOINT rm -f /var/run/rsyslogd.pid \
&& service rsyslog start \
&& /bin/bash && /bin/bash

View File

@ -18,6 +18,5 @@ COPY ["config.sh", "/usr/bin/"]
COPY ["start.sh", "/usr/bin/"] COPY ["start.sh", "/usr/bin/"]
ENTRYPOINT /usr/bin/config.sh \ ENTRYPOINT /usr/bin/config.sh \
&& service rsyslog start \
&& /usr/bin/start.sh \ && /usr/bin/start.sh \
&& /bin/bash && /bin/bash

View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
rm -f /var/run/rsyslogd.pid
service rsyslog start
VLAN_IFACE_NAME=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_vlan_interfaces[0]['name']"` VLAN_IFACE_NAME=`sonic-cfggen -m /etc/sonic/minigraph.xml -v "minigraph_vlan_interfaces[0]['name']"`
# Wait for the VLAN to come up (i.e., 'ip link show' returns 0) # Wait for the VLAN to come up (i.e., 'ip link show' returns 0)

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
service quagga start service quagga start
fpmsyncd & fpmsyncd &

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
service quagga start service quagga start
fpmsyncd & fpmsyncd &

View File

@ -5,3 +5,4 @@ sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/lldpd.con
mkdir -p /var/sonic mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status
rm -f /var/run/rsyslogd.pid

View File

@ -65,6 +65,7 @@ elif [ "$HWSKU" == "ACS-MSN2700" ]; then
SWSSCONFIG_ARGS+="msn2700.32ports.buffers.json msn2700.32ports.qos.json " SWSSCONFIG_ARGS+="msn2700.32ports.buffers.json msn2700.32ports.qos.json "
fi fi
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
while true; do while true; do

View File

@ -9,3 +9,4 @@ fi
mkdir -p /var/sonic mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status
rm -f /var/run/rsyslogd.pid

View File

@ -13,6 +13,7 @@ start_bcm()
trap clean_up SIGTERM SIGKILL trap clean_up SIGTERM SIGKILL
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
start_bcm start_bcm

View File

@ -6,6 +6,7 @@ function clean_up {
trap clean_up SIGTERM SIGKILL trap clean_up SIGTERM SIGKILL
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini /usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini

View File

@ -11,6 +11,7 @@ start_mlnx()
trap clean_up SIGTERM SIGKILL trap clean_up SIGTERM SIGKILL
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
start_mlnx start_mlnx

View File

@ -13,3 +13,4 @@ sonic-cfggen -m /etc/sonic/minigraph.xml -s >/etc/snmp/alias_map.json
mkdir -p /var/sonic mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status
rm -f /var/run/rsyslogd.pid

View File

@ -28,6 +28,7 @@ function clean_up {
trap clean_up SIGTERM SIGKILL trap clean_up SIGTERM SIGKILL
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
# Before teamd could automatically add newly created host interfaces into the # Before teamd could automatically add newly created host interfaces into the

View File

@ -30,7 +30,8 @@ VOLUME /var/opt/quest/vas/vasd/
VOLUME /home/ VOLUME /home/
## Delete the symlinks and create full copies to host folder ## Delete the symlinks and create full copies to host folder
ENTRYPOINT service rsyslog start \ ENTRYPOINT rm -f /var/run/rsyslogd.pid \
&& service rsyslog start \
&& cp --remove-destination /opt/quest/lib64/nss/libnss_vas4.so.2 \ && cp --remove-destination /opt/quest/lib64/nss/libnss_vas4.so.2 \
/host/lib/x86_64-linux-gnu/ \ /host/lib/x86_64-linux-gnu/ \
&& cp --remove-destination /opt/quest/lib64/security/pam_vas3.so \ && cp --remove-destination /opt/quest/lib64/security/pam_vas3.so \

View File

@ -8,6 +8,7 @@ function clean_up {
trap clean_up SIGTERM SIGKILL trap clean_up SIGTERM SIGKILL
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
service syncd start service syncd start

View File

@ -2,6 +2,7 @@
export XP_ROOT=/usr/bin/ export XP_ROOT=/usr/bin/
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
while true; do while true; do

View File

@ -8,6 +8,7 @@ function clean_up {
trap clean_up SIGTERM SIGKILL trap clean_up SIGTERM SIGKILL
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
service syncd start service syncd start

View File

@ -4,6 +4,7 @@ echo "Set onie_platform to x86_64-barefoot_p4-r0"
export onie_platform=x86_64-barefoot_p4-r0 export onie_platform=x86_64-barefoot_p4-r0
echo "Start rsyslog" echo "Start rsyslog"
rm -f /var/run/rsyslogd.pid
service rsyslog start service rsyslog start
echo "Start redis server" echo "Start redis server"