diff options
| author | Roger Leigh <rleigh@debian.org> | 2012-07-18 20:05:33 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2012-07-18 20:05:33 +0100 |
| commit | a68330dd7909fafc5fe7730876e81aeb0f286b6f (patch) | |
| tree | 28ea7c900cf80547c8816d7e0bbda378f409fb8c | |
| parent | 57334dd68cfadc85c0d56d594cced20da031ab91 (diff) | |
| download | schroot-a68330dd7909fafc5fe7730876e81aeb0f286b6f.tar.gz | |
debian: Remove compatibility symlinks
Compatibility symlinks were being created on install/upgrade
in /etc/schroot. Remove them.
| -rw-r--r-- | debian/schroot.postinst | 22 | ||||
| -rw-r--r-- | debian/schroot.postrm | 4 | ||||
| -rw-r--r-- | debian/schroot.preinst | 17 |
3 files changed, 6 insertions, 37 deletions
diff --git a/debian/schroot.postinst b/debian/schroot.postinst index fe4fef01..8e35d40e 100644 --- a/debian/schroot.postinst +++ b/debian/schroot.postinst @@ -34,28 +34,6 @@ mv_conffile() { fi } -if dpkg --compare-versions "$2" le "1.4.0-1"; then - mv_conffile "/etc/schroot/script-defaults" \ - "/etc/schroot/default/config" - mv_conffile "/etc/schroot/mount-defaults" \ - "/etc/schroot/default/fstab" - mv_conffile "/etc/schroot/copyfiles-defaults" \ - "/etc/schroot/default/copyfiles" - mv_conffile "/etc/schroot/nssdatabases-defaults" \ - "/etc/schroot/default/nssdatabases" -fi - -if dpkg --compare-versions "$2" le "1.4.1-1"; then - ln -sf "/etc/schroot/default/config" \ - "/etc/schroot/script-defaults" - ln -sf "/etc/schroot/default/fstab" \ - "/etc/schroot/mount-defaults" - ln -sf "/etc/schroot/default/copyfiles" \ - "/etc/schroot/copyfiles-defaults" - ln -sf "/etc/schroot/default/nssdatabases" \ - "/etc/schroot/nssdatabases-defaults" -fi - # This is needed in order to migrate from using rcS to standard runlevels. if dpkg --compare-versions "$2" lt "1.6.0-1"; then update-rc.d -f schroot remove >/dev/null diff --git a/debian/schroot.postrm b/debian/schroot.postrm index e50d9b46..52124953 100644 --- a/debian/schroot.postrm +++ b/debian/schroot.postrm @@ -56,10 +56,6 @@ case "$1" in ;; remove) - LINKS="/etc/schroot/copyfiles-defaults /etc/schroot/mount-defaults /etc/schroot/nssdatabases-defaults /etc/schroot/script-defaults" - for link in $LINKS; do - [ -L "$link" ] && rm -f "$link" - done ;; purge|disappear) diff --git a/debian/schroot.preinst b/debian/schroot.preinst index ca3e4476..44178964 100644 --- a/debian/schroot.preinst +++ b/debian/schroot.preinst @@ -46,23 +46,18 @@ prep_mv_conffile() { case "$1" in install|upgrade) - if dpkg --compare-versions "$2" le "1.1.6-1"; then - rm_conffile "schroot" "/etc/schroot/setup.d/20network" - rm_conffile "schroot" "/etc/schroot/setup.d/30passwd" - fi - if dpkg --compare-versions "$2" le "1.4.0-1"; then - rm_conffile "schroot" "/etc/schroot/script-defaults" - rm_conffile "schroot" "/etc/schroot/mount-defaults" - rm_conffile "schroot" "/etc/schroot/copyfiles-defaults" - rm_conffile "schroot" "/etc/schroot/nssdatabases-defaults" - fi if dpkg --compare-versions "$2" lt "1.5.2-1"; then rm_conffile "schroot" "/etc/schroot/buildd/config" rm_conffile "schroot" "/etc/schroot/default/config" rm_conffile "schroot" "/etc/schroot/desktop/config" rm_conffile "schroot" "/etc/schroot/minimal/config" rm_conffile "schroot" "/etc/schroot/sbuild/config" - + fi + if dpkg --compare-versions "$2" lt "1.6.1-1"; then + LINKS="/etc/schroot/copyfiles-defaults /etc/schroot/mount-defaults /etc/schroot/nssdatabases-defaults /etc/schroot/script-defaults" + for link in $LINKS; do + [ -L "$link" ] && rm -f "$link" + done fi esac |