Merged in r2821,2824,2827 from hvirt branch.

[invirt/packages/invirt-xen-config.git] / debian / invirt-xen-config.init

diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init
index 0613ff9..f5e29c3 100755 (executable)
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -12,9 +12,6 @@
 PACKAGE=invirt-xen-config
 NAME="$PACKAGE"
 DESC="Invirt Xen host"
 PACKAGE=invirt-xen-config
 NAME="$PACKAGE"
 DESC="Invirt Xen host"

-PARENTPACKAGE=xend
-SYSVM_FILES=(/etc/xen/sysvms/s_*)
-SYSVMS=("${SYSVM_FILES[@]/#\/etc\/xen\/sysvms\/}")

 GEN_FILES=(/etc/xen/xend-config.sxp.invirt)
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 GEN_FILES=(/etc/xen/xend-config.sxp.invirt)
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0

@@ -22,67 +19,19 @@ dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 . /lib/init/gen-files.sh
 . /lib/init/std-init.sh
 
 . /lib/init/gen-files.sh
 . /lib/init/std-init.sh
 

-start_sysvm() {
-    # Attempt to start a sysvm, but only if it's not running already
-    # somewhere on the cluster
-    
-    VM="$1"
-    LV="${VM}_hda"
-    DISK="/dev/xenvg/$LV"
-    
-    # Don't bother trying to start the VM if it's already running
-    if xm list "$VM" >/dev/null 2>&1; then
-        return 1
-    fi
-    
-    RET=1
-    # To keep multiple hosts from trying to start a VM at the same
-    # time, lock VM creation at startup-time with a lock LV, since LV
-    # creation is atomic
-    if lvcreate -L 1K -n "lock_${LV}" xenvg >/dev/null 2>&1; then
-        # If we can disable the LV, then the VM isn't already running
-        # somewhere else
-        if lvchange -a n "$DISK" >/dev/null 2>&1; then
-            lvchange -a y "$DISK" >/dev/null 2>&1
-            
-            [ "$VERBOSE" != no ] && log_daemon_msg "Starting sysvm $VM"
-            xm create "sysvms/$VM" >/dev/null
-            [ "$VERBOSE" != no ] && log_end_msg $?
-            RET=0
-        fi
-        
-        # Regardless of whether we could get the lock or not, the
-        # lvchange -a n probably disabled the LV somewhere; be sure we
-        # clean up
-        lvchange -a y "$DISK" >/dev/null 2>&1
-    
-        # Cleanup the lock, regardless of whether we started the LV
-        lvchange -a n "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
-        lvchange -a ey "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
-        lvremove -f "/dev/xenvg/lock_${LV}" >/dev/null 2>&1
-    fi
-    
-    return $RET
-}
-

 do_startup() {
     gen_files
     
 do_startup() {
     gen_files
     

-    for vm in "${SYSVMS[@]}"; do
-        start_sysvm "$vm"
-    done
-    

     echo 1 >/proc/sys/net/ipv4/ip_forward
     for i in all default; do
         echo 1 >/proc/sys/net/ipv4/conf/$i/rp_filter
         echo 1 >/proc/sys/net/ipv4/conf/$i/proxy_arp
     done
     echo 1 >/proc/sys/net/ipv4/ip_forward
     for i in all default; do
         echo 1 >/proc/sys/net/ipv4/conf/$i/rp_filter
         echo 1 >/proc/sys/net/ipv4/conf/$i/proxy_arp
     done

-    
-    invoke-rc.d "$PARENTPACKAGE" "$1"

 }
 
 do_start() {
     do_startup "start"
 }
 
 do_start() {
     do_startup "start"

+    xm sched-credit -d 0 -w 512

 }
 
 do_reload() {
 }
 
 do_reload() {

@@ -90,7 +39,7 @@ do_reload() {
 }
 
 do_stop() {
 }
 
 do_stop() {

-    invoke-rc.d "$PARENTPACKAGE" stop
+    :

 }
 
 std_init "$1"
 }
 
 std_init "$1"