r5969 - in glibc-package/branches/eglibc-2.19/debian: . debhelper.in
Author: aurel32
Date: 2014-02-24 21:11:48 +0000 (Mon, 24 Feb 2014)
New Revision: 5969
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst
Log:
debian/debhelper.in/libc.preinst: don't act on the filesystem until it
is sure that the libc is going to be upgraded.
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-24 05:32:14 UTC (rev 5968)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-24 21:11:48 UTC (rev 5969)
@@ -43,6 +43,8 @@
support has been removed with Lenny.
* debian/debhelper.in/libc.preinst: remove code to upgrade armhf systems
from pre-Wheezy versions.
+ * debian/debhelper.in/libc.preinst: don't act on the filesystem until it
+ is sure that the libc is going to be upgraded.
-- Adam Conrad <adconrad@0c3.net> Sun, 09 Feb 2014 09:46:13 -0700
Modified: glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst 2014-02-24 05:32:14 UTC (rev 5968)
+++ glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst 2014-02-24 21:11:48 UTC (rev 5969)
@@ -154,12 +154,6 @@
if [ "$type" = upgrade ]
then
- # Remove old /etc/init.d/glibc.sh init script
- if dpkg --compare-versions "$preversion" le "2.9-22"; then
- rm_conffile $(package_name) "/etc/init.d/glibc.sh"
- update-rc.d glibc.sh remove >/dev/null
- fi
-
# Load debconf module if available
if [ -f /usr/share/debconf/confmodule ] ; then
. /usr/share/debconf/confmodule
@@ -248,10 +242,6 @@
fi # end upgrading and $preversion lt 2.19
fi # Upgrading
- # This will keep us from using hwcap libs (optimized) during an
- # upgrade.
- touch /etc/ld.so.nohwcap
-
# Try to detect copies of the libc library in the various places
# the dynamic linker uses.
ldfile=$(readlink -e RTLD_SO)
@@ -293,6 +283,12 @@
fi
fi
+ # Remove old /etc/init.d/glibc.sh init script
+ if dpkg --compare-versions "$preversion" le "2.9-22"; then
+ rm_conffile $(package_name) "/etc/init.d/glibc.sh"
+ update-rc.d glibc.sh remove >/dev/null
+ fi
+
# ldconfig might have broken the ld.so symlink in case a biarch package
# of the same architecture than the native one has been installed (e.g.:
# libc6-amd64:i386 on amd64). Try to detect this by checking that the
@@ -306,6 +302,10 @@
echo "will be reenabled when a new version of libc-bin is unpacked."
ln -sf /bin/true /sbin/ldconfig
fi
+
+ # This will keep us from using hwcap libs (optimized) during an
+ # upgrade.
+ touch /etc/ld.so.nohwcap
fi
if [ "$type" != abort-upgrade ]
Reply to: