system/xen: Minor adjustments including updated dom0 scripts.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

8 files changed, 25 insertions, 21 deletions

diff --git a/system/xen/README.SLACKWARE b/system/xen/README.SLACKWARE
index a9bea1dd8cea..2335ee4a88f7 100644
--- a/system/xen/README.SLACKWARE
+++ b/system/xen/README.SLACKWARE
@@ -5,22 +5,26 @@ The rc.xend service must be started before Xen can be used.
 You may wish to add these lines to /etc/rc.d/rc.local to start this service
 after booting from your xen kernel.
 
-  if [[ $(uname -r) = *xen ]]; then
+  if [ -d /proc/xen ]; then
     if [ -x /etc/rc.d/rc.xend ]; then
+      echo "Starting XEN daemon:  /etc/rc.d/rc.xend"
       /etc/rc.d/rc.xend start
     fi
     if [ -x /etc/rc.d/rc.xendomains ]; then
+      echo "Starting XEN domains:  /etc/rc.d/rc.xendomains"
       /etc/rc.d/rc.xendomains start
     fi
   fi
 
 You may also add these lines to /etc/rc.d/rc.local_shutdown
 
-  if [[ $(uname -r) = *xen ]]; then
+  if [ -d /proc/xen ]; then
     if [ -x /etc/rc.d/rc.xendomains ]; then
+      echo "Stopping XEN domains:  /etc/rc.d/rc.xendomains"
       /etc/rc.d/rc.xendomains stop
     fi
     if [ -x /etc/rc.d/rc.xend ]; then
+      echo "Stopping XEN daemon:  /etc/rc.d/rc.xend"
       /etc/rc.d/rc.xend stop
     fi
   fi
diff --git a/system/xen/dom0/README.dom0 b/system/xen/dom0/README.dom0
index c2f8c7227061..4a5e99369652 100644
--- a/system/xen/dom0/README.dom0
+++ b/system/xen/dom0/README.dom0
@@ -4,14 +4,14 @@ This script patches and builds the Linux Kernel for the Xen Hypervisor.
 
 To run this scipt you will need the Xen kernel patches in this directory.
 The patches may be downloaded from:
-http://gentoo-xen-kernel.googlecode.com/files/xen-patches-2.6.34-4.tar.bz2
-(md5sum: 25ba07cf0702130af26c045fd6227f2f)
+http://gentoo-xen-kernel.googlecode.com/files/xen-patches-2.6.34-6.tar.bz2
+(md5sum: afb08178200fa34fd24c4d9d03174102)
 
-Note on kernel: You will need to get kernel version 2.6.34.4 because patches
+Note on kernel: You will need to get kernel version 2.6.34.7 because patches
 based on Slackware stock kernel tree (2.6.33.4) do not work as expected.
 Anyway, you can get it from:
-http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.33.4.tar.bz2
-(md5sum: f75d21e5c60f18adf0e99d61c243f964)
+http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.34.7.tar.bz2
+(md5sum: 8964e26120e84844998a673464a980ea)
 
 The included configuration files are based on Slackware's kernel. For
 Slackware32, the SMP kernels were used as the non-smp kernels would not compile
@@ -27,8 +27,8 @@ by passing the "KERNEL=generic" variable to the script. In this case, you
 will need to make an ad-hoc initrd after installing this package.
 For example:
 
-depmod 2.6.34.4-xen
-mkinitrd -c -k 2.6.34.4-xen -f ext4 -r /dev/sda1 -m ext4 -o /boot/initrd-xen.gz
+depmod 2.6.34.7-xen
+mkinitrd -c -k 2.6.34.7-xen -f ext4 -r /dev/sda1 -m ext4 -o /boot/initrd-xen.gz
 
 For details on initrd, read /boot/README.initrd, run
 /usr/share/mkinitrd/mkinitrd_command_generator.sh for hints and read the Xen
@@ -42,7 +42,7 @@ This is an example how to do it with LILO, mbootpack and initrd:
 cd /boot
 gzip -d -c /boot/xen-4.0.1.gz > /boot/xen-4.0.1
 gzip -d -c /boot/initrd-xen.gz > /boot/initrd-xen
-mbootpack -o /boot/vmlinuz-2.6.34.4-xen -m /usr/src/linux-2.6.34.4-xen/vmlinux \
+mbootpack -o /boot/vmlinuz-2.6.34.7-xen -m /usr/src/linux-2.6.34.7-xen/vmlinux \
   -m /boot/initrd-xen /boot/xen-4.0.1
 
 After new kernel image is created, add something like the folowing to lilo.conf:
diff --git a/system/xen/dom0/config-generic-i486-2.6.34.4-xen b/system/xen/dom0/config-generic-i486-2.6.34.7-xen
index ccc94d2ae906..d62a19545754 100644
--- a/system/xen/dom0/config-generic-i486-2.6.34.4-xen
+++ b/system/xen/dom0/config-generic-i486-2.6.34.7-xen
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34.4
-# Fri Sep 10 14:56:22 2010
+# Linux kernel version: 2.6.34.7
+# Sat Oct 30 16:25:29 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/system/xen/dom0/config-generic-x86_64-2.6.34.4-xen b/system/xen/dom0/config-generic-x86_64-2.6.34.7-xen
index d45ddbc4268f..d70bba7780db 100644
--- a/system/xen/dom0/config-generic-x86_64-2.6.34.4-xen
+++ b/system/xen/dom0/config-generic-x86_64-2.6.34.7-xen
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34.4
-# Fri Sep 10 15:00:54 2010
+# Linux kernel version: 2.6.34.7
+# Sat Oct 30 16:25:29 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
diff --git a/system/xen/dom0/config-huge-i486-2.6.34.4-xen b/system/xen/dom0/config-huge-i486-2.6.34.7-xen
index 51f1f613b4aa..2f8ba0eb3080 100644
--- a/system/xen/dom0/config-huge-i486-2.6.34.4-xen
+++ b/system/xen/dom0/config-huge-i486-2.6.34.7-xen
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34.4
-# Fri Sep 10 14:57:16 2010
+# Linux kernel version: 2.6.34.7
+# Sat Oct 30 16:25:29 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/system/xen/dom0/config-huge-x86_64-2.6.34.4-xen b/system/xen/dom0/config-huge-x86_64-2.6.34.7-xen
index 62106d1a78a4..9b9e554bd821 100644
--- a/system/xen/dom0/config-huge-x86_64-2.6.34.4-xen
+++ b/system/xen/dom0/config-huge-x86_64-2.6.34.7-xen
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34.4
-# Fri Sep 10 15:01:27 2010
+# Linux kernel version: 2.6.34.7
+# Sat Oct 30 16:25:29 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
diff --git a/system/xen/dom0/kernel-xen.sh b/system/xen/dom0/kernel-xen.sh
index 735995740ec0..283de871802d 100644
--- a/system/xen/dom0/kernel-xen.sh
+++ b/system/xen/dom0/kernel-xen.sh
@@ -8,10 +8,10 @@
 # 20100904
 
 KERNEL=${KERNEL:-huge}
-VERSION=${VERSION:-2.6.34.4}
+VERSION=${VERSION:-2.6.34.7}
 
 # Rebased patches version
-SVERSION=${SVERSION:-2.6.34-4}
+SVERSION=${SVERSION:-2.6.34-6}
 
 # Xen version
 XVERSION=${XVERSION:-4.0.1}
diff --git a/system/xen/xen.info b/system/xen/xen.info
index c0e62c174939..af2586f38b09 100644
--- a/system/xen/xen.info
+++ b/system/xen/xen.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="mario"
 EMAIL="mario@slackverse.org"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"