Author: baggins Date: Fri Nov 25 16:11:56 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- more fixes
---- Files affected:
SOURCES:
util-vserver-cpuset.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/util-vserver-cpuset.patch
diff -u SOURCES/util-vserver-cpuset.patch:1.5
SOURCES/util-vserver-cpuset.patch:1.6
--- SOURCES/util-vserver-cpuset.patch:1.5 Fri Nov 25 16:57:32 2005
+++ SOURCES/util-vserver-cpuset.patch Fri Nov 25 17:11:51 2005
@@ -80,7 +80,7 @@
diff -ur util-vserver-0.30.209/scripts/vserver.functions
util-vserver-0.30.209.cpuset/scripts/vserver.functions
--- util-vserver-0.30.209/scripts/vserver.functions 2005-11-25
14:30:27.665999880 +0100
+++ util-vserver-0.30.209.cpuset/scripts/vserver.functions 2005-11-25
15:11:04.593027880 +0100
-@@ -687,6 +687,54 @@
+@@ -687,6 +687,53 @@
fi
}
@@ -90,29 +90,28 @@
+ local cpuset
+ local f="$vdir"/cpuset
+ local i
-+ local v
++ local configured=0
+
+ test -d "$f" || return 0
+ test -e "$f"/name || return 0
+
+ read cpuset < "$f"/name
+ test -e "$f"/nocreate || {
-+ test -d /dev/cpuset/"$cpuset" || mkdir /dev/cpuset/"$cpuset"
++ test -d /dev/cpuset/"$cpuset" || mkdir /dev/cpuset/"$cpuset" ||
configured=1
+ for i in cpus mems cpu_exclusive mem_exclusive; do
+ if test -e "$f"/"$i"; then
-+ read v < "$f"/"$i"
-+ echo $v >/dev/cpuset/"$cpuset"/"$i" || {
-+ rmdir /dev/cpuset/"$cpuset"
++ cat "$f"/"$i" >/dev/cpuset/"$cpuset"/"$i" 2>/dev/null || {
++ configured=1
+ break
+ }
+ done
+ }
+
-+ if [ -e /dev/cpuset/"$cpuset"/tasks ] ; then
-+ echo $$ >/dev/cpuset/"$cpuset"/tasks
-+ else
++ echo $$ >/dev/cpuset/"$cpuset"/tasks || configured=1
++ if [ "$configured" -ne 0 ]; then
+ warning $"\
+WARNING: Failed to create or CPUSET \"$cpuset\" does not exist! Not using
it!" >&2
++ rmdir /dev/cpuset/"$cpuset" 2>/dev/null || :
+ return 0
+ fi
+}
@@ -128,7 +127,7 @@
+
+ read cpuset < "$f"/name
+ test -e "$f"/nocreate || {
-+ rmdir /dev/cpuset/"$cpuset"
++ rmdir /dev/cpuset/"$cpuset" 2>/dev/null || :
+ }
+}
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/util-vserver-cpuset.patch?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
