diff options
| author | Gustavo Niemeyer <gustavo@niemeyer.net> | 2016-06-06 11:30:51 -0300 |
|---|---|---|
| committer | Gustavo Niemeyer <gustavo@niemeyer.net> | 2016-06-06 11:30:51 -0300 |
| commit | 3d2c0a4abe7ac90bf36b1d89b6c4e86425997092 (patch) | |
| tree | 086cbfdaefbce34d270cee8c4dddc503bae25ac7 /debian | |
| parent | 07b0446983e9a8932bdc9a57730646fcb34f72ca (diff) | |
| parent | 85a3a7c03b726712586b382f36ff0722d190546c (diff) | |
Merge pull request #1271 from mvo5/bugfix/mount-busy-lp1589006
debian: do not ship /etc/ld.so.conf.d/snappy.conf (LP: #1589006)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/snapd.install | 2 | ||||
| -rw-r--r-- | debian/snapd.maintscript | 2 | ||||
| -rw-r--r-- | debian/snapd.postinst | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/debian/snapd.install b/debian/snapd.install index 21f3d3f2a7..852e06c662 100644 --- a/debian/snapd.install +++ b/debian/snapd.install @@ -8,8 +8,6 @@ data/completion/snap /usr/share/bash-completion/completions/ etc/profile.d # etc/X11/Xsession.d will add to XDG_DATA_DIRS so that we have .desktop support etc/X11 -# etc/ld.so.conf.d contains the SNAP_LIBRARY_PATH directories -etc/ld.so.conf.d # systemd stuff diff --git a/debian/snapd.maintscript b/debian/snapd.maintscript index ea90c1a605..b523f0110a 100644 --- a/debian/snapd.maintscript +++ b/debian/snapd.maintscript @@ -1,3 +1,5 @@ # we used to ship a custom grub config that is no longer needed rm_conffile /etc/grub.d/09_snappy 1.7.3ubuntu1 +# keep mount point busy +rm_conffile /etc/ld.so.conf.d/snappy.conf 2.0.7~ \ No newline at end of file diff --git a/debian/snapd.postinst b/debian/snapd.postinst new file mode 100644 index 0000000000..9aefd971a3 --- /dev/null +++ b/debian/snapd.postinst @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + + +case "$1" in + configure) + # ensure /var/lib/snapd/lib/gl is cleared + if dpkg --compare-versions "$2" lt-nl "2.0.7"; then + ldconfig + fi +esac |