Handle limits.conf upgrade.

diff --git a/files/etc/security/limits.conf.expect b/files/etc/security/limits.conf.expect
new file mode 100644 (file)
index 0000000..070b19a
--- /dev/null
+++ b/files/etc/security/limits.conf.expect
@@ -0,0 +1,55 @@
+# /etc/security/limits.conf
+#
+#Each line describes a limit for a user in the form:
+#
+#<domain>        <type>  <item>  <value>
+#
+#Where:
+#<domain> can be:
+#        - an user name
+#        - a group name, with @group syntax
+#        - the wildcard *, for default entry
+#        - the wildcard %, can be also used with %group syntax,
+#                 for maxlogin limit
+#
+#<type> can have the two values:
+#        - "soft" for enforcing the soft limits
+#        - "hard" for enforcing hard limits
+#
+#<item> can be one of the following:
+#        - core - limits the core file size (KB)
+#        - data - max data size (KB)
+#        - fsize - maximum filesize (KB)
+#        - memlock - max locked-in-memory address space (KB)
+#        - nofile - max number of open files
+#        - rss - max resident set size (KB)
+#        - stack - max stack size (KB)
+#        - cpu - max CPU time (MIN)
+#        - nproc - max number of processes
+#        - as - address space limit
+#        - maxlogins - max number of logins for this user
+#        - maxsyslogins - max number of logins on the system
+#        - priority - the priority to run user process with
+#        - locks - max number of file locks the user can hold
+#        - sigpending - max number of pending signals
+#        - msgqueue - max memory used by POSIX message queues (bytes)
+#        - nice - max nice priority allowed to raise to
+#        - rtprio - max realtime priority
+#
+#<domain>      <type>  <item>         <value>
+#
+
+#*               soft    core            0
+#*               hard    rss             10000
+#@student        hard    nproc           20
+#@faculty        soft    nproc           20
+#@faculty        hard    nproc           50
+#ftp             hard    nproc           0
+#@student        -       maxlogins       4
+
+# End of file
+# Begin update by CARNet package kernel-2.6-cn -- DO NOT DELETE THIS LINE!
+*               soft    core            0
+*              hard    nofile          4096
+*              soft    nofile          4096
+# End update by CARNet package kernel-2.6-cn -- DO NOT DELETE THIS LINE!

diff --git a/files/etc/security/limits.conf b/files/etc/security/limits.conf.restore
similarity index 84%
rename from files/etc/security/limits.conf
rename to files/etc/security/limits.conf.restore
index ccb4e10..c52778b 100644 (file)
--- a/files/etc/security/limits.conf
+++ b/files/etc/security/limits.conf.restore
@@ -28,8 +28,13 @@
 #        - nproc - max number of processes
 #        - as - address space limit
 #        - maxlogins - max number of logins for this user
+#        - maxsyslogins - max number of logins on the system
 #        - priority - the priority to run user process with
 #        - locks - max number of file locks the user can hold
+#        - sigpending - max number of pending signals
+#        - msgqueue - max memory used by POSIX message queues (bytes)
+#        - nice - max nice priority allowed to raise to
+#        - rtprio - max realtime priority
 #
 #<domain>      <type>  <item>         <value>
 #