diff options
author | Daniel Baumann <daniel@debian.org> | 2024-11-10 11:37:46 +0100 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2024-11-10 17:04:33 +0100 |
commit | 35862741a6b54f49062cc1cedd51309c3d29773f (patch) | |
tree | b71ed4b10281fdc01ff6527b65b21bd37410df63 | |
parent | Replacing adduser with tools from util-linux. (diff) | |
download | frr-35862741a6b54f49062cc1cedd51309c3d29773f.tar.xz frr-35862741a6b54f49062cc1cedd51309c3d29773f.zip |
Removing now unused quagga upgrade handling in frr postinst.
Signed-off-by: Daniel Baumann <daniel@debian.org>
-rwxr-xr-x | debian/frr.postinst | 64 |
1 files changed, 7 insertions, 57 deletions
diff --git a/debian/frr.postinst b/debian/frr.postinst index 3d9a0d5c..be14116b 100755 --- a/debian/frr.postinst +++ b/debian/frr.postinst @@ -22,68 +22,18 @@ mkdir -p /etc/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() { - fname="$1" - test -f "$1" || return 0 - fhash="`sha1sum \"$fname\"`" - fhash="${fhash%% *}" - if test "$fhash" = "$2"; then - rm "$fname" - fi + fname="$1" + test -f "$1" || return 0 + fhash="`sha1sum \"$fname\"`" + fhash="${fhash%% *}" + if test "$fhash" = "$2"; then + rm "$fname" + fi } case "$1" in configure) - check_old_config /etc/frr/daemons.conf - check_old_config /etc/default/frr if test -f /etc/frr/.pkg.frr.nointegrated; then # remove integrated config setup # (if checksums match, the files match freshly installed |