WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] bring some fixes from unstable into testing

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] bring some fixes from unstable into testing
From: Xen patchbot -2.0-testing <patchbot-2.0-testing@xxxxxxxxxxxxxxxxxxx>
Date: Sat, 13 Aug 2005 06:30:15 -0400
Delivery-date: Sat, 13 Aug 2005 10:30:47 +0000
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User vh249@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 7c67e7c47434681f5ec1ca06d701e2bb43ca8db7
# Parent  03594514c5759a367efa054ed9a47c103cb069fd
bring some fixes from unstable into testing

Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>

diff -r 03594514c575 -r 7c67e7c47434 buildconfigs/Rules.mk
--- a/buildconfigs/Rules.mk     Wed Aug 10 12:59:10 2005
+++ b/buildconfigs/Rules.mk     Wed Aug 10 16:05:53 2005
@@ -96,7 +96,7 @@
        rm -rf tmp-$@
 
 %-mrproper: %-mrproper-extra
-       rm -rf pristine-$* ref-$* $*.tar.bz2
+       rm -rf pristine-$(*)* ref-$(*)* $*.tar.bz2
        rm -rf $*-xen.patch
 
 netbsd-%-mrproper-extra:
diff -r 03594514c575 -r 7c67e7c47434 
linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Wed Aug 10 12:59:10 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c     Wed Aug 10 16:05:53 2005
@@ -1,7 +1,4 @@
-
 #define __KERNEL_SYSCALLS__
-static int errno;
-#include <linux/errno.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -159,8 +156,8 @@
 {
     static char *envp[] = { "HOME=/", "TERM=linux", 
                             "PATH=/sbin:/usr/sbin:/bin:/usr/bin", NULL };
-    static char *restart_argv[]  = { "/sbin/shutdown", "-r", "now", NULL };
-    static char *poweroff_argv[] = { "/sbin/halt",     "-p",        NULL };
+    static char *restart_argv[]  = { "/sbin/reboot", NULL };
+    static char *poweroff_argv[] = { "/sbin/poweroff", NULL };
 
     extern asmlinkage long sys_reboot(int magic1, int magic2,
                                       unsigned int cmd, void *arg);
@@ -174,7 +171,7 @@
     switch ( shutting_down )
     {
     case CMSG_SHUTDOWN_POWEROFF:
-        if ( execve("/sbin/halt", poweroff_argv, envp) < 0 )
+        if ( execve("/sbin/poweroff", poweroff_argv, envp) < 0 )
         {
             sys_reboot(LINUX_REBOOT_MAGIC1,
                        LINUX_REBOOT_MAGIC2,
@@ -184,7 +181,7 @@
         break;
 
     case CMSG_SHUTDOWN_REBOOT:
-        if ( execve("/sbin/shutdown", restart_argv, envp) < 0 )
+        if ( execve("/sbin/reboot", restart_argv, envp) < 0 )
         {
             sys_reboot(LINUX_REBOOT_MAGIC1,
                        LINUX_REBOOT_MAGIC2,
diff -r 03594514c575 -r 7c67e7c47434 tools/libxc/Makefile
--- a/tools/libxc/Makefile      Wed Aug 10 12:59:10 2005
+++ b/tools/libxc/Makefile      Wed Aug 10 16:05:53 2005
@@ -56,7 +56,7 @@
        false; \
        fi
 
-LINUX_ROOT := $(wildcard $(XEN_ROOT)/linux-2.6.*-xen-sparse)
+LINUX_ROOT := $(XEN_ROOT)/linux-2.6-xen-sparse
 mk-symlinks:
        [ -e xen/linux ] || mkdir -p xen/linux
        [ -e xen/io ]    || mkdir -p xen/io

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] bring some fixes from unstable into testing, Xen patchbot -2 . 0-testing <=