Skip to content

[rsyslog]: Remove /var/run/rsyslogd.pid before starting rsyslog #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavel-shirshov merged 1 commit into from
Mar 30, 2017
Merged

[rsyslog]: Remove /var/run/rsyslogd.pid before starting rsyslog #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dockers/docker-basic_router/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ RUN dpkg -i /deps/libopennsl_*.deb; \

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
1 change: 0 additions & 1 deletion dockers/docker-dhcp-relay/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,5 @@ COPY ["config.sh", "/usr/bin/"]
COPY ["start.sh", "/usr/bin/"]

ENTRYPOINT /usr/bin/config.sh \
&& service rsyslog start \
&& /usr/bin/start.sh \
&& /bin/bash
3 changes: 3 additions & 0 deletions dockers/docker-dhcp-relay/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/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']"`

# Wait for the VLAN to come up (i.e., 'ip link show' returns 0)
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-fpm-gobgp/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

rm -f /var/run/rsyslogd.pid
service rsyslog start
service quagga start
fpmsyncd &
1 change: 1 addition & 0 deletions dockers/docker-fpm/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

rm -f /var/run/rsyslogd.pid
service rsyslog start
service quagga start
fpmsyncd &
1 change: 1 addition & 0 deletions dockers/docker-lldp-sv2/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ sonic-cfggen -m /etc/sonic/minigraph.xml -t /usr/share/sonic/templates/lldpd.con
mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status

rm -f /var/run/rsyslogd.pid
1 change: 1 addition & 0 deletions dockers/docker-orchagent/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ elif [ "$HWSKU" == "ACS-MSN2700" ]; then
SWSSCONFIG_ARGS+="msn2700.32ports.buffers.json msn2700.32ports.qos.json "
fi

rm -f /var/run/rsyslogd.pid
service rsyslog start

while true; do
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-platform-monitor/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ fi
mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status

rm -f /var/run/rsyslogd.pid
1 change: 1 addition & 0 deletions dockers/docker-saiserver-brcm/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ start_bcm()

trap clean_up SIGTERM SIGKILL

rm -f /var/run/rsyslogd.pid
service rsyslog start

start_bcm
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-saiserver-cavm/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ function clean_up {

trap clean_up SIGTERM SIGKILL

rm -f /var/run/rsyslogd.pid
service rsyslog start

/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
1 change: 1 addition & 0 deletions dockers/docker-saiserver-mlnx/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ start_mlnx()

trap clean_up SIGTERM SIGKILL

rm -f /var/run/rsyslogd.pid
service rsyslog start

start_mlnx
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-snmp-sv2/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ sonic-cfggen -m /etc/sonic/minigraph.xml -s >/etc/snmp/alias_map.json
mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status

rm -f /var/run/rsyslogd.pid
1 change: 1 addition & 0 deletions dockers/docker-teamd/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function clean_up {

trap clean_up SIGTERM SIGKILL

rm -f /var/run/rsyslogd.pid
service rsyslog start

# Before teamd could automatically add newly created host interfaces into the
Expand Down
3 changes: 2 additions & 1 deletion dockers/docker-vas/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ VOLUME /var/opt/quest/vas/vasd/
VOLUME /home/

## 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 \
/host/lib/x86_64-linux-gnu/ \
&& cp --remove-destination /opt/quest/lib64/security/pam_vas3.so \
Expand Down
1 change: 1 addition & 0 deletions platform/broadcom/docker-syncd-brcm/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ function clean_up {

trap clean_up SIGTERM SIGKILL

rm -f /var/run/rsyslogd.pid
service rsyslog start
service syncd start

Expand Down
1 change: 1 addition & 0 deletions platform/cavium/docker-syncd-cavm/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

export XP_ROOT=/usr/bin/

rm -f /var/run/rsyslogd.pid
service rsyslog start

while true; do
Expand Down
1 change: 1 addition & 0 deletions platform/centec/docker-syncd-centec/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ function clean_up {

trap clean_up SIGTERM SIGKILL

rm -f /var/run/rsyslogd.pid
service rsyslog start
service syncd start

Expand Down
1 change: 1 addition & 0 deletions platform/p4/docker-sonic-p4/startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ echo "Set onie_platform to x86_64-barefoot_p4-r0"
export onie_platform=x86_64-barefoot_p4-r0

echo "Start rsyslog"
rm -f /var/run/rsyslogd.pid
service rsyslog start

echo "Start redis server"
Expand Down