Remove extra trailing newlines at EOF (#804)

jleveque · Shuotian Cheng · commit f49cac086f84 · 2017-07-12T20:54:37.000-07:00
Files now end with a single newline
diff --git a/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py b/device/accton/x86_64-accton_as7512_32x-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile b/device/accton/x86_64-accton_as7712_32x-r0/Accton-AS7712-32X/sai.profile
@@ -1,2 +1 @@
 SAI_INIT_CONFIG_FILE=/etc/bcm/th-as7712-32x100G.config.bcm
-
diff --git a/device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile b/device/accton/x86_64-accton_as7716_32x-r0/Accton-AS7716-32X/sai.profile
@@ -1,2 +1 @@
 SAI_INIT_CONFIG_FILE=/etc/bcm/th-as7716-32x100G.config.bcm
-
diff --git a/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py b/device/arista/x86_64-arista_7050_qx32/plugins/led_control.py
@@ -86,4 +86,3 @@ def __init__(self):
             led_sysfs_path = self.LED_SYSFS_PATH_NO_BREAKOUT.format(qsfp_index)
             with open(led_sysfs_path, 'w') as led_file:
                 led_file.write("%d" % self.LED_COLOR_OFF)
-
diff --git a/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py b/device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py
@@ -81,4 +81,3 @@ def __init__(self):
             led_sysfs_path = self.LED_SYSFS_PATH_NO_BREAKOUT.format(qsfp_index + self.LED_QSFP_OFFSET)
             with open(led_sysfs_path, 'w') as led_file:
                 led_file.write("%d" % self.LED_COLOR_OFF)
-
diff --git a/device/arista/x86_64-arista_7050_qx32s/sensors.conf b/device/arista/x86_64-arista_7050_qx32s/sensors.conf
@@ -46,4 +46,3 @@ chip "pmbus-i2c-5-58"
     label temp1 "Power supply 2 hotspot sensor"
     label temp2 "Power supply 2 inlet temp sensor"
     label temp3 "Power supply 2 sensor"
-
diff --git a/device/arista/x86_64-arista_7060_cx32s/sensors.conf b/device/arista/x86_64-arista_7060_cx32s/sensors.conf
@@ -44,4 +44,3 @@ chip "pmbus-i2c-5-58"
     label temp1 "Power supply 2 hotspot sensor"
     label temp2 "Power supply 2 inlet temp sensor"
     label temp3 "Power supply 2 sensor"
-
diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/eeprom.py
@@ -20,4 +20,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0050/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/fancontrol b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/fancontrol
@@ -9,4 +9,3 @@ MINTEMP=hwmon2/device/pwm2=20 hwmon2/device/pwm1=20
 MAXTEMP=hwmon2/device/pwm2=60 hwmon2/device/pwm1=60
 MINSTART=hwmon2/device/pwm2=75 hwmon2/device/pwm1=75
 MINSTOP=hwmon2/device/pwm2=22 hwmon2/device/pwm1=22
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/eeprom.py b/device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/eeprom.py
@@ -20,4 +20,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/class/i2c-adapter/i2c-17/17-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/fancontrol
@@ -8,4 +8,3 @@ MINTEMP=hwmon2/device/pwm1=20 hwmon2/device/pwm2=20
 MAXTEMP=hwmon2/device/pwm1=60 hwmon2/device/pwm2=60
 MINSTART=hwmon2/device/pwm1=150 hwmon2/device/pwm2=150
 MINSTOP=hwmon2/device/pwm1=0 hwmon2/device/pwm2=0
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/eeprom.py b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/eeprom.py
@@ -20,4 +20,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/sys/class/i2c-adapter/i2c-7/7-0054/eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/sensors.conf b/device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/sensors.conf
@@ -53,4 +53,3 @@ chip "tmp75-i2c-*-49"
     label temp1 "FAN Temp2"
     set temp1_max 50
     set temp1_crit 70
-
diff --git a/device/ingrasys/x86_64-ingrasys_s9100-r0/fancontrol b/device/ingrasys/x86_64-ingrasys_s9100-r0/fancontrol
@@ -9,4 +9,3 @@ MINTEMP=hwmon2/device/pwm2=20 hwmon2/device/pwm1=20
 MAXTEMP=hwmon2/device/pwm2=60 hwmon2/device/pwm1=60
 MINSTART=hwmon2/device/pwm2=75 hwmon2/device/pwm1=75
 MINSTOP=hwmon2/device/pwm2=22 hwmon2/device/pwm1=22
-
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/eeprom.py
@@ -30,4 +30,3 @@ class board(eeprom_tlvinfo.TlvInfoDecoder):
     def __init__(self, name, path, cpld_root, ro):
         self.eeprom_path = "/bsp/eeprom/sys_eeprom"
         super(board, self).__init__(self.eeprom_path, 0, '', True)
-
diff --git a/dockers/docker-base/Dockerfile.j2 b/dockers/docker-base/Dockerfile.j2
@@ -75,4 +75,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /tmp/*
-
diff --git a/dockers/docker-base/LICENSE b/dockers/docker-base/LICENSE
@@ -11,4 +11,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
diff --git a/dockers/docker-base/etc/rsyslog.conf b/dockers/docker-base/etc/rsyslog.conf
@@ -65,4 +65,3 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 ###############
 #### RULES ####
 ###############
-
diff --git a/dockers/docker-basic_router/Dockerfile b/dockers/docker-basic_router/Dockerfile
@@ -20,4 +20,3 @@ COPY ["start.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-basic_router/start.sh b/dockers/docker-basic_router/start.sh
@@ -3,4 +3,3 @@
 rm -f /var/run/rsyslogd.pid
 
 supervisorctl start rsyslogd
-
diff --git a/dockers/docker-basic_router/supervisord.conf b/dockers/docker-basic_router/supervisord.conf
@@ -18,4 +18,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2
@@ -35,4 +35,3 @@ RUN sed -ri 's/^(save .*$)/# \1/g;
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-database/base_image_files/redis-cli b/dockers/docker-database/base_image_files/redis-cli
@@ -1,4 +1,3 @@
 #!/bin/bash
 
 docker exec -it database redis-cli "$@"
-
diff --git a/dockers/docker-database/supervisord.conf b/dockers/docker-database/supervisord.conf
@@ -10,4 +10,3 @@ autostart=true
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-dhcp-relay/Dockerfile.j2 b/dockers/docker-dhcp-relay/Dockerfile.j2
@@ -27,4 +27,3 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["isc-dhcp-relay.j2", "/usr/share/sonic/templates/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-dhcp-relay/isc-dhcp-relay.j2 b/dockers/docker-dhcp-relay/isc-dhcp-relay.j2
@@ -26,4 +26,3 @@ INTERFACES="
 
 # '-a' option provides option 82 circuit_id and remote_id information
 OPTIONS="-a %h:%p %P"
-
diff --git a/dockers/docker-dhcp-relay/isc-dhcp-relay.sh b/dockers/docker-dhcp-relay/isc-dhcp-relay.sh
@@ -16,4 +16,3 @@ if test "$INTERFACES" != ""; then
 fi
 
 exec /usr/sbin/dhcrelay -d -q ${OPTIONS} ${IFCMD} ${SERVERS}
-
diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh
@@ -40,4 +40,3 @@ done
 
 # Start the DHCP relay
 supervisorctl start isc-dhcp-relay
-
diff --git a/dockers/docker-dhcp-relay/supervisord.conf b/dockers/docker-dhcp-relay/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-fpm-frr/config.sh b/dockers/docker-fpm-frr/config.sh
@@ -14,4 +14,3 @@ chmod 0755 /usr/sbin/bgp-unisolate
 
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" >/var/sonic/config_status
-
diff --git a/dockers/docker-fpm-gobgp/Dockerfile.j2 b/dockers/docker-fpm-gobgp/Dockerfile.j2
@@ -26,4 +26,3 @@ COPY ["*.j2", "/usr/share/sonic/templates/"]
 COPY ["daemons", "/etc/quagga/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-fpm-gobgp/start.sh b/dockers/docker-fpm-gobgp/start.sh
@@ -23,4 +23,3 @@ supervisorctl start rsyslogd
 service quagga start
 
 supervisorctl start fpmsyncd
-
diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf
@@ -34,4 +34,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-fpm-quagga/Dockerfile.j2 b/dockers/docker-fpm-quagga/Dockerfile.j2
@@ -28,4 +28,3 @@ COPY ["*.j2", "/usr/share/sonic/templates/"]
 COPY ["daemons", "/etc/quagga/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-fpm-quagga/start.sh b/dockers/docker-fpm-quagga/start.sh
@@ -27,4 +27,3 @@ supervisorctl start rsyslogd
 service quagga start
 
 supervisorctl start fpmsyncd
-
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-lldp-sv2/Dockerfile.j2 b/dockers/docker-lldp-sv2/Dockerfile.j2
@@ -35,4 +35,3 @@ COPY ["lldpd.conf.j2", "/usr/share/sonic/templates/"]
 COPY ["lldpd", "/etc/default/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-lldp-sv2/start.sh b/dockers/docker-lldp-sv2/start.sh
@@ -11,4 +11,3 @@ supervisorctl start rsyslogd
 supervisorctl start lldpd
 supervisorctl start lldpd-conf-reload
 supervisorctl start lldp-syncd
-
diff --git a/dockers/docker-lldp-sv2/supervisord.conf b/dockers/docker-lldp-sv2/supervisord.conf
@@ -47,4 +47,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
@@ -32,4 +32,3 @@ COPY ["ipinip.json.j2", "/usr/share/sonic/templates/"]
 COPY ["mirror.json.j2", "/usr/share/sonic/templates/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-orchagent/orchagent.sh b/dockers/docker-orchagent/orchagent.sh
@@ -19,4 +19,3 @@ elif [ "$ASIC" == "cavium" ]; then
 fi
 
 exec /usr/bin/orchagent ${ORCHAGENT_ARGS}
-
diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
@@ -58,4 +58,3 @@ for file in $SWSSCONFIG_ARGS; do
 done
 
 config_acl
-
diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -59,4 +59,3 @@ COPY ["start.sh", "lm-sensors.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-platform-monitor/lm-sensors.sh b/dockers/docker-platform-monitor/lm-sensors.sh
@@ -9,4 +9,3 @@
 # Currently, there is no way to run sensord in the foreground, so we
 # can't use supervisord. Instead, we just start the service for now.
 service sensord start
-
diff --git a/dockers/docker-platform-monitor/start.sh b/dockers/docker-platform-monitor/start.sh
@@ -23,4 +23,3 @@ if [ -e /usr/share/sonic/platform/fancontrol ]; then
 fi
 
 supervisorctl start ledd
-
diff --git a/dockers/docker-platform-monitor/supervisord.conf b/dockers/docker-platform-monitor/supervisord.conf
@@ -41,4 +41,3 @@ priority=5
 autostart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-saiserver-brcm/Dockerfile b/dockers/docker-saiserver-brcm/Dockerfile
@@ -25,4 +25,3 @@ COPY ["profile.ini", "portmap.ini", "/etc/sai/"]
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y; rm -rf /deps
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-saiserver-brcm/start.sh b/dockers/docker-saiserver-brcm/start.sh
@@ -15,4 +15,3 @@ supervisorctl start rsyslogd
 start_bcm
 
 supervisorctl start saiserver
-
diff --git a/dockers/docker-saiserver-brcm/supervisord.conf b/dockers/docker-saiserver-brcm/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-saiserver-cavm/Dockerfile b/dockers/docker-saiserver-cavm/Dockerfile
@@ -28,4 +28,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf deps
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-saiserver-cavm/start.sh b/dockers/docker-saiserver-cavm/start.sh
@@ -5,4 +5,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 
 supervisorctl start saiserver
-
diff --git a/dockers/docker-saiserver-cavm/supervisord.conf b/dockers/docker-saiserver-cavm/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-saiserver-mlnx/Dockerfile b/dockers/docker-saiserver-mlnx/Dockerfile
@@ -36,4 +36,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /deps
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-saiserver-mlnx/start.sh b/dockers/docker-saiserver-mlnx/start.sh
@@ -13,4 +13,3 @@ supervisorctl start rsyslogd
 start_mlnx
 
 supervisorctl start saiserver
-
diff --git a/dockers/docker-saiserver-mlnx/supervisord.conf b/dockers/docker-saiserver-mlnx/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-snmp-sv2/Dockerfile.j2 b/dockers/docker-snmp-sv2/Dockerfile.j2
@@ -47,4 +47,3 @@ COPY ["*.j2", "/usr/share/sonic/templates/"]
 EXPOSE 161/udp 162/udp
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-snmp-sv2/start.sh b/dockers/docker-snmp-sv2/start.sh
@@ -15,4 +15,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 supervisorctl start snmpd
 supervisorctl start snmp-subagent
-
diff --git a/dockers/docker-snmp-sv2/supervisord.conf b/dockers/docker-snmp-sv2/supervisord.conf
@@ -34,4 +34,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-teamd/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2
@@ -30,4 +30,3 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
 RUN rm -rf /debs
 
 ENTRYPOINT ["/usr/bin/supervisord"]
-
diff --git a/dockers/docker-teamd/base_image_files/teamdctl b/dockers/docker-teamd/base_image_files/teamdctl
@@ -1,4 +1,3 @@
 #!/bin/bash
 
 docker exec -i teamd teamdctl "$@"
-
diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh
@@ -27,4 +27,3 @@ rm -f /var/run/rsyslogd.pid
 supervisorctl start rsyslogd
 
 supervisorctl start teamd
-
diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
@@ -26,4 +26,3 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
diff --git a/dockers/docker-teamd/teamd.sh b/dockers/docker-teamd/teamd.sh
@@ -36,4 +36,3 @@ while true; do
     fi
     sleep 1
 done
-
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
@@ -38,4 +38,3 @@ case "$1" in
         exit 1
         ;;
 esac
-
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -221,4 +221,3 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get autor
 sudo cp {{src}} $FILESYSTEM_ROOT/{{dst}}
 {% endif -%}
 {% endfor -%}
-
diff --git a/files/dhcp/dhclient.conf b/files/dhcp/dhclient.conf
@@ -22,4 +22,3 @@ request subnet-mask, broadcast-address, time-offset, routers,
         dhcp6.name-servers, dhcp6.domain-search, interface-mtu,
         rfc3442-classless-static-routes, ntp-servers, 
         snmp-community, minigraph-url, acl-url;
-
diff --git a/files/dhcp/sethostname b/files/dhcp/sethostname
@@ -10,4 +10,3 @@ case $reason in
         fi
         ;;
 esac
-
diff --git a/files/image_config/bash/bash.bashrc b/files/image_config/bash/bash.bashrc
@@ -53,5 +53,3 @@ if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-no
         fi
     }
 fi
-
-
diff --git a/files/image_config/cron.d/logrotate b/files/image_config/cron.d/logrotate
@@ -1,3 +1,2 @@
 # Attempt to rotate system logs once per minute
 * * * * * root /usr/sbin/logrotate /etc/logrotate.d/rsyslog
-
diff --git a/files/image_config/interfaces/init_interfaces b/files/image_config/interfaces/init_interfaces
@@ -8,4 +8,3 @@ iface lo inet loopback
 # The management network interface
 auto eth0
 iface eth0 inet dhcp
-
diff --git a/files/image_config/interfaces/interfaces-config.service b/files/image_config/interfaces/interfaces-config.service
@@ -8,4 +8,3 @@ ExecStart=/usr/bin/interfaces-config.sh
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/files/image_config/logrotate.d/rsyslog b/files/image_config/logrotate.d/rsyslog
@@ -60,4 +60,3 @@
         kill -HUP $(cat /var/run/rsyslogd.pid)
     endscript
 }
-
diff --git a/files/image_config/ntp/ntp-config.service b/files/image_config/ntp/ntp-config.service
@@ -8,4 +8,3 @@ ExecStart=/usr/bin/ntp-config.sh
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/files/image_config/rsyslog/rsyslog-config.service b/files/image_config/rsyslog/rsyslog-config.service
@@ -8,4 +8,3 @@ ExecStart=/usr/bin/rsyslog-config.sh
 
 [Install]
 WantedBy=multi-user.target
-
diff --git a/files/image_config/rsyslog/rsyslog.conf.j2 b/files/image_config/rsyslog/rsyslog.conf.j2
@@ -68,4 +68,3 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 ###############
 #### RULES ####
 ###############
-
diff --git a/files/image_config/rsyslog/rsyslog.d/00-sonic.conf b/files/image_config/rsyslog/rsyslog.d/00-sonic.conf
@@ -19,4 +19,3 @@ if $programname contains "teamd_" then {
     /var/log/teamd.log
     stop
 }
-
diff --git a/files/image_config/rsyslog/rsyslog.d/99-default.conf b/files/image_config/rsyslog/rsyslog.d/99-default.conf
@@ -68,4 +68,3 @@ daemon.*;mail.*;\
         news.err;\
         *.=debug;*.=info;\
         *.=notice;*.=warn       |/dev/xconsole
-
diff --git a/files/image_config/snmp/snmp.yml b/files/image_config/snmp/snmp.yml
@@ -1,3 +1,2 @@
 snmp_rocommunity: public
 snmp_location: public
-
diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
diff --git a/files/image_config/systemd/journald.conf b/files/image_config/systemd/journald.conf
diff --git a/files/image_config/updategraph/updategraph b/files/image_config/updategraph/updategraph
diff --git a/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk
diff --git a/platform/broadcom/docker-syncd-brcm/Dockerfile.j2 b/platform/broadcom/docker-syncd-brcm/Dockerfile.j2
diff --git a/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd b/platform/broadcom/docker-syncd-brcm/base_image_files/bcmcmd
diff --git a/platform/broadcom/docker-syncd-brcm/start.sh b/platform/broadcom/docker-syncd-brcm/start.sh
diff --git a/platform/broadcom/docker-syncd-brcm/supervisord.conf b/platform/broadcom/docker-syncd-brcm/supervisord.conf
diff --git a/platform/cavium/cavm-platform-modules.mk b/platform/cavium/cavm-platform-modules.mk
diff --git a/platform/cavium/cavm_platform_modules/Makefile b/platform/cavium/cavm_platform_modules/Makefile
diff --git a/platform/cavium/docker-syncd-cavm/profile.ini b/platform/cavium/docker-syncd-cavm/profile.ini
diff --git a/platform/cavium/docker-syncd-cavm/start.sh b/platform/cavium/docker-syncd-cavm/start.sh
diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
diff --git a/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2 b/platform/centec/docker-syncd-centec-rpc/Dockerfile.j2
diff --git a/platform/centec/docker-syncd-centec/Dockerfile.j2 b/platform/centec/docker-syncd-centec/Dockerfile.j2
diff --git a/platform/centec/docker-syncd-centec/start.sh b/platform/centec/docker-syncd-centec/start.sh
diff --git a/platform/centec/docker-syncd-centec/supervisord.conf b/platform/centec/docker-syncd-centec/supervisord.conf
diff --git a/platform/generic/aboot-image.mk b/platform/generic/aboot-image.mk
diff --git a/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
diff --git a/platform/mellanox/docker-syncd-mlnx/supervisord.conf b/platform/mellanox/docker-syncd-mlnx/supervisord.conf
diff --git a/platform/p4/docker-sonic-p4/rsyslog.conf b/platform/p4/docker-sonic-p4/rsyslog.conf
diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
diff --git a/rules/isc-dhcp.mk b/rules/isc-dhcp.mk
diff --git a/rules/python3.mk b/rules/python3.mk
diff --git a/src/isc-dhcp/Makefile b/src/isc-dhcp/Makefile
diff --git a/src/sonic-config-engine/openconfig_acl.py b/src/sonic-config-engine/openconfig_acl.py
diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
diff --git a/src/sonic-config-engine/sonic_platform.py b/src/sonic-config-engine/sonic_platform.py
diff --git a/src/sonic-device-data/src/debian/rules b/src/sonic-device-data/src/debian/rules
diff --git a/src/supervisor/Makefile b/src/supervisor/Makefile

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`SAI_INIT_CONFIG_FILE=/etc/bcm/th-as7712-32x100G.config.bcm`
`2`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`SAI_INIT_CONFIG_FILE=/etc/bcm/th-as7716-32x100G.config.bcm`
`2`		`-`