Commit 9701299a authored by Christian Kastner's avatar Christian Kastner

d/patches: Refresh patches

parent 81cf0393
......@@ -3,10 +3,29 @@ Date: Thu, 19 Sep 2013 08:33:12 +0200
Subject: Updating cgroup directory
Last-Update: 2014-07-26
---
README | 2 +-
doc/man/cgconfig.conf.5 | 124 ++++++++++++++++++++++++------------------------
samples/cgconfig.conf | 4 +-
3 files changed, 65 insertions(+), 65 deletions(-)
diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.conf.5
--- libcgroup.orig/doc/man/cgconfig.conf.5
+++ libcgroup/doc/man/cgconfig.conf.5
diff --git a/README b/README
index 54e0f7b..d7b7bc0 100644
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ this file will be managed by root.
Basic idea is that to begin with provide facility to implement rules
based on uid and gid. So a hierarchy might look like as follows.
- /mnt/cgroup
+ /sys/fs/cgroup
| |
gid1 gid2
| |
diff --git a/doc/man/cgconfig.conf.5 b/doc/man/cgconfig.conf.5
index be80e4e..5ebd879 100644
--- a/doc/man/cgconfig.conf.5
+++ b/doc/man/cgconfig.conf.5
@@ -262,8 +262,8 @@ The configuration file:
.nf
mount {
......@@ -18,7 +37,7 @@ diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.co
.RE
}
.fi
@@ -274,8 +274,8 @@ inside. It corresponds to the following
@@ -274,8 +274,8 @@ inside. It corresponds to the following operations:
.LP
.RS
.nf
......@@ -74,7 +93,7 @@ diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.co
.RE
}
@@ -426,18 +426,18 @@ which are little bit trickier to emulate
@@ -426,18 +426,18 @@ which are little bit trickier to emulate via chmod):
.LP
.RS
.nf
......@@ -101,7 +120,7 @@ diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.co
# admin.dperm = 755:
# drwxr-xr-x. 2 root webmaster 0 Jun 16 11:51 .
#
@@ -456,13 +456,13 @@ echo 1000 > /mnt/cgroups/cpu/daemons/www
@@ -456,13 +456,13 @@ echo 1000 > /mnt/cgroups/cpu/daemons/www/cpu.shares
# -rw-rw----. 1 root webmaster 0 Jun 16 11:51 tasks
......@@ -131,7 +150,7 @@ diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.co
.RE
}
@@ -530,13 +530,13 @@ It corresponds to the following operatio
@@ -530,13 +530,13 @@ It corresponds to the following operations:
.LP
.RS
.nf
......@@ -162,7 +181,7 @@ diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.co
.RE
}
@@ -597,17 +597,17 @@ It corresponds to the following operatio
@@ -597,17 +597,17 @@ It corresponds to the following operations:
.LP
.RS
.nf
......@@ -202,7 +221,7 @@ diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.co
.RE
}
@@ -696,15 +696,15 @@ It corresponds to the following operatio
@@ -696,15 +696,15 @@ It corresponds to the following operations:
.LP
.RS
.nf
......@@ -247,21 +266,10 @@ diff -Naurp libcgroup.orig/doc/man/cgconfig.conf.5 libcgroup/doc/man/cgconfig.co
.fi
.RE
diff -Naurp libcgroup.orig/README libcgroup/README
--- libcgroup.orig/README
+++ libcgroup/README
@@ -16,7 +16,7 @@ this file will be managed by root.
Basic idea is that to begin with provide facility to implement rules
based on uid and gid. So a hierarchy might look like as follows.
- /mnt/cgroup
+ /sys/fs/cgroup
| |
gid1 gid2
| |
diff -Naurp libcgroup.orig/samples/cgconfig.conf libcgroup/samples/cgconfig.conf
--- libcgroup.orig/samples/cgconfig.conf
+++ libcgroup/samples/cgconfig.conf
diff --git a/samples/cgconfig.conf b/samples/cgconfig.conf
index de77e4b..5e668a8 100644
--- a/samples/cgconfig.conf
+++ b/samples/cgconfig.conf
@@ -43,6 +43,6 @@
#}
#
......
......@@ -3,10 +3,15 @@ Date: Thu, 19 Sep 2013 08:33:12 +0200
Subject: Correcting sanity checks in example initscripts (Closes: #704926).
Last-Update: 2014-07-26
---
scripts/init.d/cgconfig.in | 3 +++
scripts/init.d/cgred.in | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff -Naurp libcgroup.orig/scripts/init.d/cgconfig.in libcgroup/scripts/init.d/cgconfig.in
--- libcgroup.orig/scripts/init.d/cgconfig.in
+++ libcgroup/scripts/init.d/cgconfig.in
diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in
index f299d0f..d293c62 100644
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -36,6 +36,9 @@ CONFIG_FILE=/etc/cgconfig.conf
servicename=cgconfig
lockfile=/var/lock/subsys/$servicename
......@@ -17,9 +22,10 @@ diff -Naurp libcgroup.orig/scripts/init.d/cgconfig.in libcgroup/scripts/init.d/c
#
# Source LSB routines
#
diff -Naurp libcgroup.orig/scripts/init.d/cgred.in libcgroup/scripts/init.d/cgred.in
--- libcgroup.orig/scripts/init.d/cgred.in
+++ libcgroup/scripts/init.d/cgred.in
diff --git a/scripts/init.d/cgred.in b/scripts/init.d/cgred.in
index 247ec61..c13920d 100644
--- a/scripts/init.d/cgred.in
+++ b/scripts/init.d/cgred.in
@@ -37,7 +37,7 @@ CGRED_BIN=$sbindir/cgrulesengd
CGRED_CONF=/etc/cgrules.conf
......
......@@ -3,10 +3,14 @@ Date: Thu, 19 Sep 2013 08:33:12 +0200
Subject: Updating template documentation to match template code (Closes: #682748).
Last-Update: 2014-07-26
---
doc/man/cgrules.conf.5 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -Naurp libcgroup.orig/doc/man/cgrules.conf.5 libcgroup/doc/man/cgrules.conf.5
--- libcgroup.orig/doc/man/cgrules.conf.5
+++ libcgroup/doc/man/cgrules.conf.5
diff --git a/doc/man/cgrules.conf.5 b/doc/man/cgrules.conf.5
index 7a89fb5..29061b9 100644
--- a/doc/man/cgrules.conf.5
+++ b/doc/man/cgrules.conf.5
@@ -58,12 +58,12 @@ can be:
- path relative to the controller hierarchy (ex. pgrp1/gid1/uid1)
- following strings called "\fBtemplates\fR" and will get expanded
......
......@@ -3,10 +3,14 @@ Date: Mon, 21 Oct 2013 17:23:33 +0200
Subject: Make initscript exit if stop fails (Closes: #642946).
Last-Update: 2014-07-26
---
scripts/init.d/cgconfig.in | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -Naurp libcgroup.orig/scripts/init.d/cgconfig.in libcgroup/scripts/init.d/cgconfig.in
--- libcgroup.orig/scripts/init.d/cgconfig.in
+++ libcgroup/scripts/init.d/cgconfig.in
diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in
index d293c62..b5e6740 100644
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -135,10 +135,8 @@ start() {
stop() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment