commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20090404


From: Samuel Thibault
Subject: [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20090404.1-1-86-gb891c96
Date: Sun, 01 Aug 2010 22:32:13 +0000

The following commit has been merged in the master branch:
commit b891c9664eaf625746f6764425d11fbf433e1ff9
Author: Samuel Thibault <address@hidden>
Date:   Mon Aug 2 00:31:54 2010 +0200

    init_fix.patch: New upstream patch to fix halt/reboot.

diff --git a/debian/changelog b/debian/changelog
index 3d60d26..2011b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,7 @@ hurd (20100701-1) unstable; urgency=low
   * debian/rules: Remove debian/ChangeLog on clean.
   * debian/local/runsystem: Pass -g option to the console to maximize glyph
     usage for chinese.
+  * debian/patches/init_fix.patch: New upstream patch to fix halt/reboot.
 
   [ Guillem Jover ]
   * Update make-new-tarball.sh to exclude git instead of CVS paths.
diff --git a/debian/patches/init_fix.patch b/debian/patches/init_fix.patch
new file mode 100644
index 0000000..8a7f27d
--- /dev/null
+++ b/debian/patches/init_fix.patch
@@ -0,0 +1,50 @@
+commit a6bb3e62109c72ec912d264418c5e9b95c780dbf
+Author: Samuel Thibault <address@hidden>
+Date:   Mon Aug 2 00:29:57 2010 +0200
+
+    Partially revert 8451b436 to fix halt/reboot
+    
+    init/init.c (S_msg_sig_post_untraced): Ignore result of
+    msg_sig_post_untraced_reply.
+    (S_msg_sig_post): Likewise.
+
+diff --git a/init/init.c b/init/init.c
+index 4645729..d66bee0 100644
+--- a/init/init.c
++++ b/init/init.c
+@@ -1353,16 +1353,12 @@ S_msg_sig_post_untraced (mach_port_t msgport,
+                        mach_port_t reply, mach_msg_type_name_t reply_type,
+                        int signo, natural_t sigcode, mach_port_t refport)
+ {
+-  kern_return_t err;
+-
+   if (refport != mach_task_self ())
+     return EPERM;
+   mach_port_deallocate (mach_task_self (), refport);
+ 
+   /* Reply immediately */
+-  err = msg_sig_post_untraced_reply (reply, reply_type, 0);
+-  if (err)
+-    return err;
++  msg_sig_post_untraced_reply (reply, reply_type, 0);
+ 
+   process_signal (signo);
+   return MIG_NO_REPLY;
+@@ -1373,16 +1369,12 @@ S_msg_sig_post (mach_port_t msgport,
+               mach_port_t reply, mach_msg_type_name_t reply_type,
+               int signo, natural_t sigcode, mach_port_t refport)
+ {
+-  kern_return_t err;
+-
+   if (refport != mach_task_self ())
+     return EPERM;
+   mach_port_deallocate (mach_task_self (), refport);
+ 
+   /* Reply immediately */
+-  err = msg_sig_post_reply (reply, reply_type, 0);
+-  if (err)
+-    return err;
++  msg_sig_post_reply (reply, reply_type, 0);
+ 
+   process_signal (signo);
+   return MIG_NO_REPLY;

-- 
Debian GNU Hurd packaging



reply via email to

[Prev in Thread] Current Thread [Next in Thread]