← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/likewise-open/oneiric

« back to all changes in this revision

Viewing changes to git-build/packaging/ubuntu/patches/daemon_restart.patch

  • Committer: Bazaar Package Importer
  • Author(s): Scott Salley
  • Date: 2010-11-22 12:06:00 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20101122120600-8lba1fpceot71wlb
Tags: 6.0.0.53010-1
Likewise Open 6.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
git-build/packaging/ubuntu/patches/daemon_restart.patch
 
1
Index: likewise-open-4.1.2956/domainjoin/libdomainjoin/src/djdaemonmgr_nonmac.c
 
2
===================================================================
 
3
--- likewise-open-4.1.2956.orig/domainjoin/libdomainjoin/src/djdaemonmgr_nonmac.c       2008-08-04 01:01:17.000000000 -0500
 
4
+++ likewise-open-4.1.2956/domainjoin/libdomainjoin/src/djdaemonmgr_nonmac.c    2008-08-12 13:50:57.000000000 -0500
 
5
@@ -615,8 +615,13 @@
 
6
 
 
7
     }
 
8
 
 
9
+#if 0  /* Disabled to allow Ubuntu's upstart process and packaging 
 
10
+         to manage the daemon's restart on boot */
 
11
+
 
12
     LW_TRY(exc, DJConfigureForDaemonRestart(pszName, bStatus, pszStartPriority, pszStopPriority, &LW_EXC));
 
13
 
 
14
+#endif
 
15
+
 
16
 cleanup:
 
17
     ;
 
18
 }