bug fix for SIGTRAP issue caused by uxlaunch(part of TZIVI-216)

xterm.desktop is overwritten wrongly which causes gkeyfile load failed
and crashes uxlaunch
udevadm's location is changed to /usr/bin in current udev package instead of /sbin

Signed-Off-By Quanxian Wang <quanxian.wang@intel.com>

diff --git a/packaging/uxlaunch.changes b/packaging/uxlaunch.changes
index 087cbbd..f5461fe 100644 (file)
--- a/packaging/uxlaunch.changes
+++ b/packaging/uxlaunch.changes
@@ -1,3 +1,7 @@
+* Wed Jul 11 2012 Quanxian Wang <quanxian.wang@intel.com> - 0.64
+- bug fix for SIGTRAP issue caused by uxlaunch(part of TZIVI-216)
+  udevadm is changed to /usr/bin instead of original /sbin
+
 * Mon Jul  2 17:55:35 UTC 2012 - tracy.graydon@intel.com
 - update service untis to be installed in /usr/lib vs /lib 
 

diff --git a/packaging/uxlaunch.spec b/packaging/uxlaunch.spec
index 57c12de..0c8633d 100644 (file)
--- a/packaging/uxlaunch.spec
+++ b/packaging/uxlaunch.spec
@@ -48,7 +48,7 @@ ln -s ../uxlaunch.service %{buildroot}/usr/lib/systemd/system/graphical.target.w
 install -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/sysconfig/uxlaunch
 
-install -D -p -m 0644 %{SOURCE1} \
+install -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_datadir}/xsessions/xterm.desktop
 
 %preun

diff --git a/src/uxlaunch.c b/src/uxlaunch.c
index 5fd37b8..6a6ad35 100644 (file)
--- a/src/uxlaunch.c
+++ b/src/uxlaunch.c
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
         * device probing to complete, which may be a long time
         */
        dprintf("Waiting for udev to settle for 10 seconds max...");
-       if (system("/sbin/udevadm settle --timeout 10") != EXIT_SUCCESS)
+       if (system("/usr/bin/udevadm settle --timeout 10") != EXIT_SUCCESS)
                lprintf("udevadm settle bash returned an error");
 
        start_X_server();