Removing now unused quagga upgrade handling in frr postinst.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
8a74846550
commit
75efb48d2e
1 changed files with 7 additions and 57 deletions
50
debian/frr.postinst
vendored
50
debian/frr.postinst
vendored
|
@ -22,54 +22,6 @@ mkdir -p /etc/frr
|
||||||
|
|
||||||
chown frr: /var/lib/frr
|
chown frr: /var/lib/frr
|
||||||
|
|
||||||
# only change ownership of files when they were previously owned by root or
|
|
||||||
# quagga; this is to ensure we don't trample over some custom user setup.
|
|
||||||
#
|
|
||||||
# if we are on a freshly installed package (or we added new configfiles),
|
|
||||||
# the files should be owned by root by default so we should end up with "frr"
|
|
||||||
# owned configfiles.
|
|
||||||
|
|
||||||
quaggauid=`id -u quagga 2>/dev/null || echo 0`
|
|
||||||
quaggagid=`id -g quagga 2>/dev/null || echo 0`
|
|
||||||
|
|
||||||
find \
|
|
||||||
/etc/frr \
|
|
||||||
/var/log/frr \
|
|
||||||
\( -uid 0 -o -uid $quaggauid \) -a \
|
|
||||||
\( -gid 0 -o -gid $quaggauid \) | \
|
|
||||||
while read filename; do
|
|
||||||
|
|
||||||
# don't chown anything that has ACLs (but don't fail if we don't
|
|
||||||
# have getfacl)
|
|
||||||
if { getfacl -c "$filename" 2>/dev/null || true; } \
|
|
||||||
| grep -E -q -v '^((user|group|other)::|$)'; then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
chown frr: "$filename"
|
|
||||||
chmod o-rwx "$filename"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# fix misconfigured vtysh.conf & frr.conf ownership caused by config save
|
|
||||||
# mishandling in earlier FRR (and Quagga) versions
|
|
||||||
find /etc/frr -maxdepth 1 \( -name vtysh.conf -o -name frr.conf \) \
|
|
||||||
-group frrvty -exec chgrp frr {} \;
|
|
||||||
|
|
||||||
# more Quagga -> FRR upgrade smoothing. Not technically needed, but let's
|
|
||||||
# at least do the straightforward pieces.
|
|
||||||
|
|
||||||
check_old_config() {
|
|
||||||
oldcfg="$1"
|
|
||||||
[ -r "$oldcfg" ] || return 0
|
|
||||||
[ -s "$oldcfg" ] || return 0
|
|
||||||
grep -v '^[[:blank:]]*\(#\|$\)' "$oldcfg" > /dev/null || return 0
|
|
||||||
|
|
||||||
cat >&2 <<EOF
|
|
||||||
Note: deprecated $oldcfg is present. This file is still read by
|
|
||||||
the FRR service but its contents should be migrated to /etc/frr/daemons.
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
rmsum() {
|
rmsum() {
|
||||||
fname="$1"
|
fname="$1"
|
||||||
test -f "$1" || return 0
|
test -f "$1" || return 0
|
||||||
|
@ -82,8 +34,6 @@ rmsum() {
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
configure)
|
configure)
|
||||||
check_old_config /etc/frr/daemons.conf
|
|
||||||
check_old_config /etc/default/frr
|
|
||||||
if test -f /etc/frr/.pkg.frr.nointegrated; then
|
if test -f /etc/frr/.pkg.frr.nointegrated; then
|
||||||
# remove integrated config setup
|
# remove integrated config setup
|
||||||
# (if checksums match, the files match freshly installed
|
# (if checksums match, the files match freshly installed
|
||||||
|
|
Loading…
Add table
Reference in a new issue