Author: adconrad
Date: 2014-02-20 09:35:03 +0000 (Thu, 20 Feb 2014)
New Revision: 5945

Modified:
   glibc-package/branches/eglibc-2.19/debian/changelog
   glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.postinst
Log:
debian/debhelper.in/libc.postinst: Track samba to smbd service mangling.

Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-20 09:25:16 UTC 
(rev 5944)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-20 09:35:03 UTC 
(rev 5945)
@@ -35,6 +35,7 @@
   * debian/sysdeps/powerpc.mk: Follow rename of stubs-64.h to stubs-64-v1.h.
   * debian/patches/any/submitted-sysdeps-auxv.diff: Fix implicit declaration
     when including <sys/auxv.h> in the testsuite by fixing up header guards.
+  * debian/debhelper.in/libc.postinst: Track samba to smbd service mangling.
 
  -- Adam Conrad <[email protected]>  Sun, 09 Feb 2014 09:46:13 -0700
 

Modified: glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.postinst        
2014-02-20 09:25:16 UTC (rev 5944)
+++ glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.postinst        
2014-02-20 09:35:03 UTC (rev 5945)
@@ -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


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to