r5946 - in glibc-package/branches/eglibc-2.18/debian: . debhelper.in
Author: adconrad
Date: 2014-02-20 22:40:37 +0000 (Thu, 20 Feb 2014)
New Revision: 5946
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/debhelper.in/libc.postinst
Log:
debian/debhelper.in/libc.postinst: Track samba to smbd service rename.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2014-02-20 09:35:03 UTC (rev 5945)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2014-02-20 22:40:37 UTC (rev 5946)
@@ -8,6 +8,7 @@
no longer apply pointer encryption to the frame pointer (LP: #1268937)
* debian/patches/powerpc/cvs-gettimeofday-32.diff: Replace the submitted
version of this patch with the upstream commit, which also fixes time.
+ * debian/debhelper.in/libc.postinst: Track samba to smbd service rename.
[ Aurelien Jarno ]
* debian/testsuite-checking/expected-results-mips*: Update following
Modified: glibc-package/branches/eglibc-2.18/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/debhelper.in/libc.postinst 2014-02-20 09:35:03 UTC (rev 5945)
+++ glibc-package/branches/eglibc-2.18/debian/debhelper.in/libc.postinst 2014-02-20 22:40:37 UTC (rev 5946)
@@ -158,6 +158,13 @@
echo "Restarting services possibly affected by the upgrade:"
failed=""
for service in $services; do
+ # We can't just use a generic rewrite here, as it was
+ # samba in wheezy and smbd in jessie, which confuses.
+ if [ "$service" = "samba" ]; then
+ if [ -x /etc/init.d/smbd ] || [ -f /etc/init/smbd ]; then
+ service="smbd"
+ fi
+ fi
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
idl="invoke-rc.d ${service}"
elif [ -f /usr/share/file-rc/rc ] || [ -f /usr/lib/file-rc/rc ] && [ -f /etc/runlevel.conf ]; then
Reply to: