Attachment 154140 Details for Bug 234595 – xen-xendomains-17chars.patch

[patch] xen-xendomains-17chars.patch

xen-xendomains-17chars.patch (text/plain), 2.19 KB, created by Mark McLoughlin on 2007-05-04 17:01:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark McLoughlin

Created: 2007-05-04 17:01:27 UTC

Size: 2.19 KB

patch

obsolete

>--- ./xendomains.17chars	2007-05-04 17:35:19.000000000 +0100
>+++ ./xendomains	2007-05-04 17:59:04.000000000 +0100
>@@ -182,25 +182,31 @@ rdnames()
> 
> parseln()
> {
>-    name=`echo "$1" | cut -c0-17`
>-    name=${name%% *}
>-    rest=`echo "$1" | cut -c18- `
>-    read id mem cpu vcpu state tm < <(echo "$rest")
>+    if [[ "$1" =~ "$domain" ]]; then
>+        name=;id=
>+    else if [[ "$1" =~ "\(name" ]]; then
>+        name=$(echo $1 | sed -e 's/^.*(name \(.*$)$/\1/')
>+    else if [[ "$1" =~ "$domid" ]]; then
>+        id=$(echo $1 | sed -e 's/^.*(domid \(.*$)$/\1/')
>+    fi; fi; fi
>+
>+    [ -n "$name" -a -n "$id" ] && return 0 || return 1
> }
> 
> is_running()
> {
>     rdname $1
>     RC=1
>+    name=;id=
>     while read LN; do
>-	parseln "$LN"
>+	parseln "$LN" || continue
> 	if test $id = 0; then continue; fi
> 	case $name in 
> 	    ($NM)
> 		RC=0
> 		;;
> 	esac
>-    done < <(xm list | grep -v '^Name')
>+    done < <(xm list -l | grep '($domain\|domid\|name$')
>     return $RC
> }
> 
>@@ -267,13 +273,14 @@ start() 
> 
> all_zombies()
> {
>+    name=;id=
>     while read LN; do
>-	parseln "$LN"
>+	parseln "$LN" || continue
> 	if test $id = 0; then continue; fi
> 	if test "$state" != "-b---d" -a "$state" != "-----d"; then
> 	    return 1;
> 	fi
>-    done < <(xm list | grep -v '^Name')
>+    done < <(xm list -l | grep '($domain\|domid\|name$')
>     return 0
> }
> 
>@@ -309,8 +316,9 @@ stop()
> 	rdnames
>     fi
>     echo -n "Shutting down Xen domains:"
>+    name=;id=
>     while read LN; do
>-	parseln "$LN"
>+	parseln "$LN" || continue
> 	if test $id = 0; then continue; fi
> 	echo -n " $name"
> 	if test "$XENDOMAINS_AUTO_ONLY" = "true"; then
>@@ -384,7 +392,7 @@ stop()
> 	    fi
> 	    kill $WDOG_PID >/dev/null 2>&1
> 	fi
>-    done < <(xm list | grep -v '^Name')
>+    done < <(xm list -l | grep '($domain\|domid\|name$')
> 
>     # NB. this shuts down ALL Xen domains (politely), not just the ones in
>     # AUTODIR/*
>@@ -409,15 +417,16 @@ stop()
> 
> check_domain_up()
> {
>+    name=;id=
>     while read LN; do
>-	parseln "$LN"
>+	parseln "$LN" || continue
> 	if test $id = 0; then continue; fi
> 	case $name in 
> 	    ($1)
> 		return 0
> 		;;
> 	esac
>-    done < <(xm list | grep -v "^Name")
>+    done < <(xm list -l | grep '($domain\|domid\|name$')
>     return 1
> }
>

Actions: View | Diff

Attachments on bug 234595: 154140