- resolves: #705888
the man page for proc is missing an explanation for /proc/[pid]/cgroup
This commit is contained in:
parent
da6afecbac
commit
d3164db577
@ -1,7 +1,7 @@
|
|||||||
diff -up man-pages-3.23/man5/proc.5.pom man-pages-3.23/man5/proc.5
|
diff -up man-pages-3.32/man5/proc.5.orig man-pages-3.32/man5/proc.5
|
||||||
--- man-pages-3.23/man5/proc.5.pom 2009-09-30 03:36:58.000000000 +0200
|
--- man-pages-3.32/man5/proc.5.orig 2010-12-03 08:02:02.000000000 +0100
|
||||||
+++ man-pages-3.23/man5/proc.5 2009-10-05 15:38:31.000000000 +0200
|
+++ man-pages-3.32/man5/proc.5 2011-05-27 10:07:56.000000000 +0200
|
||||||
@@ -1805,6 +1805,10 @@ For further details, see
|
@@ -1795,6 +1795,10 @@ For further details, see
|
||||||
.I /proc/sys/fs/file-max
|
.I /proc/sys/fs/file-max
|
||||||
This file defines
|
This file defines
|
||||||
a system-wide limit on the number of open files for all processes.
|
a system-wide limit on the number of open files for all processes.
|
||||||
|
45
man-pages-3.23-proc_cgroups.patch
Normal file
45
man-pages-3.23-proc_cgroups.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
diff -up man-pages-3.32/man5/proc.5.pom man-pages-3.32/man5/proc.5
|
||||||
|
--- man-pages-3.32/man5/proc.5.pom 2011-05-27 10:11:52.000000000 +0200
|
||||||
|
+++ man-pages-3.32/man5/proc.5 2011-05-27 09:17:37.000000000 +0200
|
||||||
|
@@ -94,12 +94,35 @@ to the process at exec time.
|
||||||
|
The format is one \fIunsigned long\fP ID
|
||||||
|
plus one \fIunsigned long\fP value for each entry.
|
||||||
|
The last entry contains two zeros.
|
||||||
|
-.\" FIXME Describe /proc/[pid]/cgroup and
|
||||||
|
-.\" /proc/[pid]/task/[tid]/cgroup
|
||||||
|
-.\" Info in Documentation/cgroups.txt
|
||||||
|
-.\" Added in 2.6.24
|
||||||
|
-.\" CONFIG_CGROUPS
|
||||||
|
-.\"
|
||||||
|
+.TP
|
||||||
|
+.I /proc/[pid]/cgroup " (since Linux 2.6.24)"
|
||||||
|
+This file describes control groups to which the process/task
|
||||||
|
+belongs. For each cgroup hierarchy there is one entry of the form
|
||||||
|
+.nf
|
||||||
|
+.ft CW
|
||||||
|
+
|
||||||
|
+ 5:cpuacct,cpu,cpuset:/daemons
|
||||||
|
+(1) (2) (3)
|
||||||
|
+.ft
|
||||||
|
+.fi
|
||||||
|
+.IP
|
||||||
|
+The numbers in parentheses are labels for the descriptions below:
|
||||||
|
+.RS 7
|
||||||
|
+.TP 5
|
||||||
|
+(1)
|
||||||
|
+hierarchy id number
|
||||||
|
+.TP
|
||||||
|
+(2)
|
||||||
|
+set of subsystems bound to the hierarchy
|
||||||
|
+.TP
|
||||||
|
+(3)
|
||||||
|
+control group in the hierarchy to which the process belongs
|
||||||
|
+.RE
|
||||||
|
+.IP
|
||||||
|
+
|
||||||
|
+This file is only present if the
|
||||||
|
+.B CONFIG_CGROUPS
|
||||||
|
+kernel configuration option is enabled.
|
||||||
|
.\" FIXME Describe /proc/[pid]/clear_refs
|
||||||
|
.\" Added in 2.6.22
|
||||||
|
.\" "Clears page referenced bits shown in smaps output"
|
@ -4,7 +4,7 @@
|
|||||||
Summary: Man (manual) pages from the Linux Documentation Project
|
Summary: Man (manual) pages from the Linux Documentation Project
|
||||||
Name: man-pages
|
Name: man-pages
|
||||||
Version: 3.32
|
Version: 3.32
|
||||||
Release: 13%{?dist}
|
Release: 14%{?dist}
|
||||||
License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
|
License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
URL: http://www.kernel.org/pub/linux/docs/manpages/
|
URL: http://www.kernel.org/pub/linux/docs/manpages/
|
||||||
@ -48,6 +48,8 @@ Patch80: man-pages-3.32-snprintf.patch
|
|||||||
Patch81: man-pages-3.32-fallocate.patch
|
Patch81: man-pages-3.32-fallocate.patch
|
||||||
#resolves: #698149
|
#resolves: #698149
|
||||||
Patch82: man-pages-3.32-host.patch
|
Patch82: man-pages-3.32-host.patch
|
||||||
|
#resolves: #705888
|
||||||
|
Patch83: man-pages-3.23-proc_cgroups.patch
|
||||||
#Resolves: #655961
|
#Resolves: #655961
|
||||||
Conflicts: quota < 3.17-14
|
Conflicts: quota < 3.17-14
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -90,6 +92,7 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
|
|||||||
%patch80 -p1
|
%patch80 -p1
|
||||||
%patch81 -p1
|
%patch81 -p1
|
||||||
%patch82 -p1
|
%patch82 -p1
|
||||||
|
%patch83 -p1
|
||||||
|
|
||||||
### And now remove those we are not going to use:
|
### And now remove those we are not going to use:
|
||||||
|
|
||||||
@ -145,6 +148,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%lang(en) %{_mandir}/en/man*/*
|
%lang(en) %{_mandir}/en/man*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 27 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 3.32-14
|
||||||
|
- resolves: #705888
|
||||||
|
the man page for proc is missing an explanation for /proc/[pid]/cgroup
|
||||||
|
|
||||||
* Fri Apr 22 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 3.32-13
|
* Fri Apr 22 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 3.32-13
|
||||||
- resolves: #698149
|
- resolves: #698149
|
||||||
Remove documentation for "order" keyword in /etc/host.conf manpage
|
Remove documentation for "order" keyword in /etc/host.conf manpage
|
||||||
|
Loading…
Reference in New Issue
Block a user