Hello community, here is the log from the commit of package ivman checked in at Thu Mar 27 22:05:13 CET 2008. -------- --- ivman/ivman.changes 2007-02-23 16:19:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/ivman/ivman.changes 2008-03-27 10:30:43.781079000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 26 11:55:56 CET 2008 - mkoenig@suse.de + +- daemonize earlier to avoid hang if dbus is not running [bnc#373704] + +------------------------------------------------------------------- New: ---- ivman-0.6.14-daemonize_early.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ivman.spec ++++++ --- /var/tmp/diff_new_pack.L27118/_old 2008-03-27 22:04:31.000000000 +0100 +++ /var/tmp/diff_new_pack.L27118/_new 2008-03-27 22:04:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ivman (Version 0.6.14) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,20 +10,22 @@ # norootforbuild + Name: ivman Summary: A Generic Handler for HAL Events -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/Daemons -URL: http://ivman.sourceforge.net/ +Url: http://ivman.sourceforge.net/ Version: 0.6.14 -Release: 5 +Release: 134 Source0: http://puzzle.dl.sourceforge.net/sourceforge/ivman/%name-%version.tar.bz2 Source1: halmount.py Source2: ivman.init Source3: halmount.1 Patch0: %{name}-config.patch +Patch1: ivman-0.6.14-daemonize_early.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Autoreq: on +AutoReq: on BuildRequires: dbus-1-devel glib2-devel hal-devel libxml2-devel pkgconfig Requires: dbus-1-python @@ -44,6 +46,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build autoreconf -fi @@ -81,7 +84,6 @@ %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog README TODO - %_sysconfdir/%name %config /etc/init.d/%{name} %_bindir/* @@ -91,45 +93,47 @@ /usr/sbin/rcivman %changelog -* Fri Feb 23 2007 - lnussel@suse.de +* Wed Mar 26 2008 mkoenig@suse.de +- daemonize earlier to avoid hang if dbus is not running [bnc#373704] +* Fri Feb 23 2007 lnussel@suse.de - halmount: add support for luks encrypted volumes -* Mon Feb 05 2007 - mkoenig@suse.de +* Mon Feb 05 2007 mkoenig@suse.de - update to version 0.6.14: * ivman-0.6.13-dbus_hal.patch merged upstream -* Mon Jan 22 2007 - mkoenig@suse.de +* Mon Jan 22 2007 mkoenig@suse.de - Make sure all dbus errors get freed. -* Fri Jan 19 2007 - mkoenig@suse.de +* Fri Jan 19 2007 mkoenig@suse.de - added missing error handling for some dbus functions. -* Thu Jan 18 2007 - mkoenig@suse.de +* Thu Jan 18 2007 mkoenig@suse.de - fixed DBus/HAL integration [#219584] -* Tue Dec 05 2006 - mkoenig@suse.de +* Tue Dec 05 2006 mkoenig@suse.de - update to version 0.6.13: * Merged dbus error patch - provide rcivman symlink [#223757] -* Fri Nov 17 2006 - lnussel@suse.de +* Fri Nov 17 2006 lnussel@suse.de - add halmount manpage -* Thu Nov 16 2006 - lnussel@suse.de +* Thu Nov 16 2006 lnussel@suse.de - fix halmount exit code handling. it was sometimes printed rather than used as exit code (#221002) -* Thu Nov 16 2006 - lnussel@suse.de +* Thu Nov 16 2006 lnussel@suse.de - don't enable ivman init script by default (#221613) -* Wed Nov 15 2006 - lnussel@suse.de +* Wed Nov 15 2006 lnussel@suse.de - return an exit code on umount/eject (#221002) -* Mon Nov 06 2006 - mkoenig@suse.de +* Mon Nov 06 2006 mkoenig@suse.de - fix handling of dbus errors -* Thu Oct 05 2006 - mkoenig@suse.de +* Thu Oct 05 2006 mkoenig@suse.de - added eject functionality (from Carl-Daniel Hailfinger) -* Thu Sep 28 2006 - mkoenig@suse.de +* Thu Sep 28 2006 mkoenig@suse.de - provide init script [#204066] -* Tue Sep 12 2006 - lnussel@suse.de +* Tue Sep 12 2006 lnussel@suse.de - halmount.py: * volume.policy.mount_filesystem is gone, use volume.fstype instead -* Tue Jul 18 2006 - lnussel@suse.de +* Tue Jul 18 2006 lnussel@suse.de - halmount.py: * don't pass empty mount options list * add --listudi option -* Mon Jul 10 2006 - mskibbe@suse.de +* Mon Jul 10 2006 mskibbe@suse.de - update to version 0.6.12 which contains: o updated french translation o fix for minor memory leaks @@ -141,19 +145,19 @@ already attached to the system when Ivman is started. o Fixed a bug introduced in Ivman 0.6.11 which could cause a long delay when starting Ivman -* Thu Mar 16 2006 - lnussel@suse.de +* Thu Mar 16 2006 lnussel@suse.de - halmount.py: * don't use obsolete volume.policy.desired_mount_point (#158266) * quote unicode characters/catch exception if python doesn't like the string (#158266) -* Wed Feb 22 2006 - lnussel@suse.de +* Wed Feb 22 2006 lnussel@suse.de - halmount.py: * let hal choose the mountpoint if it says mountpoint invalid (#146306) * catch dbus errors upon connect to avoid ugly message if hal is not running/not ready yet - install symlink halmount -> halmount.py to match config file -* Mon Feb 13 2006 - ro@suse.de +* Mon Feb 13 2006 ro@suse.de - specfile cleanup -* Mon Feb 13 2006 - hvogel@suse.de +* Mon Feb 13 2006 hvogel@suse.de - Initial package, version 0.6.9 ++++++ ivman-0.6.14-daemonize_early.patch ++++++ Index: ivman-0.6.14/src/manager.c =================================================================== --- ivman-0.6.14.orig/src/manager.c +++ ivman-0.6.14/src/manager.c @@ -1424,6 +1424,16 @@ int main(int argc, char *argv[]) parseArguments(argc, argv); do_startup_configure(); + if ( cfg_base->fork ) { + // Daemonize + isdaemon = daemonize(); + + if ( !isdaemon ) { + DEBUG(_("Couldn't daemonize, exiting...")); + return 1; + } + } + if (!g_thread_supported ()) g_thread_init (NULL); dbus_g_thread_init (); @@ -1458,16 +1468,6 @@ int main(int argc, char *argv[]) } - if ( cfg_base->fork ) { - // Daemonize - isdaemon = daemonize(); - - if ( !isdaemon ) { - DEBUG(_("Couldn't daemonize, exiting...")); - return 1; - } - } - // Drop privileges. Must do this _after_ daemonizing! if ((geteuid() == 0) && (!dropPrivileges(cfg_base->user, cfg_base->group))) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org