Hello community,
here is the log from the commit of package zypper
checked in at Tue Oct 28 00:48:46 CET 2008.
--------
--- zypper/zypper.changes 2008-10-14 18:36:47.000000000 +0200
+++ /d/STABLE/zypper/zypper.changes 2008-10-27 19:03:03.000000000 +0100
@@ -1,0 +2,53 @@
+Mon Oct 27 18:23:15 CET 2008 - jkupec(a)suse.cz
+
+- translations update
+- r11515
+- 0.12.11
+
+-------------------------------------------------------------------
+Mon Oct 27 17:16:17 CET 2008 - jkupec(a)suse.cz
+
+- use /dev/tty for input, instead of stdin
+- do not return default value in prompts, if user input
+ is expected and EOF received (bnc #436963)
+- r11509
+
+-------------------------------------------------------------------
+Mon Oct 27 15:15:57 CET 2008 - jkupec(a)suse.cz
+
+- force installation by capability if name.arch is specified
+ (bnc #305445)
+- complain if installing by --name and arch is specified
+- r11506
+
+-------------------------------------------------------------------
+Mon Oct 27 14:07:00 CET 2008 - jkupec(a)suse.cz
+
+- --no-cd global option added to ignore CD/DVD repositories
+ (bnc #336211)
+- --no-remote global option added to ignore remote (downloading)
+ repositories
+- r11503
+
+-------------------------------------------------------------------
+Sun Oct 26 16:11:44 CET 2008 - jkupec(a)suse.cz
+
+- 'rm -t patch' now tells the user that patches can't get
+ uninstalled (bnc #402640). The same for patterns, untill pattern
+ removal is defined and implemented.
+- r11491
+
+-------------------------------------------------------------------
+Thu Oct 23 14:29:38 CEST 2008 - jkupec(a)suse.cz
+
+- more appropriate 'accept key' dialog (bnc #436794)
+- r11460
+
+-------------------------------------------------------------------
+Wed Oct 22 15:47:06 CEST 2008 - jkupec(a)suse.cz
+
+- fixed unexpected exception when checking if refresh is needed
+ after a failed rpm download (bnc #436299)
+- r11449
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
zypper-0.12.10.tar.bz2
New:
----
zypper-0.12.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper.spec ++++++
--- /var/tmp/diff_new_pack.tz1993/_old 2008-10-28 00:47:16.000000000 +0100
+++ /var/tmp/diff_new_pack.tz1993/_new 2008-10-28 00:47:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package zypper (Version 0.12.10)
+# spec file for package zypper (Version 0.12.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: zypper
-BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 5.15.0 readline-devel >= 5.1
+BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 5.17.0 readline-devel >= 5.1
BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1
Requires: procps
Recommends: logrotate cron
@@ -29,9 +29,9 @@
AutoReqProv: on
PreReq: permissions
Summary: Command Line Package Management Using Libzypp
-Version: 0.12.10
+Version: 0.12.11
Release: 1
-Source: zypper-0.12.10.tar.bz2
+Source: zypper-0.12.11.tar.bz2
Prefix: /usr
Url: http://en.opensuse.org/Zypper
Provides: y2pmsh
@@ -113,6 +113,38 @@
# it from being erased by rpm -e
%ghost %config(noreplace) %{_var}/log/zypper.log
%changelog
+* Mon Oct 27 2008 jkupec(a)suse.cz
+- translations update
+- r11515
+- 0.12.11
+* Mon Oct 27 2008 jkupec(a)suse.cz
+- use /dev/tty for input, instead of stdin
+- do not return default value in prompts, if user input
+ is expected and EOF received (bnc #436963)
+- r11509
+* Mon Oct 27 2008 jkupec(a)suse.cz
+- force installation by capability if name.arch is specified
+ (bnc #305445)
+- complain if installing by --name and arch is specified
+- r11506
+* Mon Oct 27 2008 jkupec(a)suse.cz
+- --no-cd global option added to ignore CD/DVD repositories
+ (bnc #336211)
+- --no-remote global option added to ignore remote (downloading)
+ repositories
+- r11503
+* Sun Oct 26 2008 jkupec(a)suse.cz
+- 'rm -t patch' now tells the user that patches can't get
+ uninstalled (bnc #402640). The same for patterns, untill pattern
+ removal is defined and implemented.
+- r11491
+* Thu Oct 23 2008 jkupec(a)suse.cz
+- more appropriate 'accept key' dialog (bnc #436794)
+- r11460
+* Wed Oct 22 2008 jkupec(a)suse.cz
+- fixed unexpected exception when checking if refresh is needed
+ after a failed rpm download (bnc #436299)
+- r11449
* Tue Oct 14 2008 jkupec(a)suse.cz
- catch exceptions from initialization of callbacks, show an error
message and return ZYPPER_EXIT_ERR_BUG (bnc #435198)
@@ -165,7 +197,7 @@
- proper error message if the repository type can't be determined
on refresh (bnc #389690)
- r11195
-* Mon Sep 29 2008 jkupec(a)suse.cz
+* Sun Sep 28 2008 jkupec(a)suse.cz
- 'update' and 'list-updates' now defaults to '-t package'
- patch/list-patches commands added to install/list patches
(bnc #395480)
@@ -187,7 +219,7 @@
* Sat Sep 20 2008 jkupec(a)suse.cz
- 'versioncmp' now uses zypp::Edition::compare() by default and
match() if --match option is used.
-* Sat Sep 20 2008 jkupec(a)suse.cz
+* Fri Sep 19 2008 jkupec(a)suse.cz
- 'licenses' command added (fate #303703)
- r11108
* Fri Sep 19 2008 jkupec(a)suse.cz
@@ -292,7 +324,7 @@
- If zypp is locked, the text provided by ZYppFactoryException. It
contains pid and name of the locking application. (bnc #280537)
- r10533
-* Thu Jul 10 2008 jkupec(a)suse.cz
+* Wed Jul 09 2008 jkupec(a)suse.cz
- fix setting of solver flags for dist-upgrade (bnc #406959)
- r10529
* Thu Jun 26 2008 jkupec(a)suse.cz
@@ -430,7 +462,7 @@
- abbreviate package summary in the search to fit screen width
- r9915
- 0.11.2
-* Wed Apr 30 2008 jkupec(a)suse.cz
+* Tue Apr 29 2008 jkupec(a)suse.cz
- basic cleanup upon SIGINT and SIGTERM (will remove
temporary repos) (bnc #340505)
- r9893
@@ -466,7 +498,7 @@
The vendor/arch change lists then contains packages from the
above.
- r9841
-* Sun Apr 27 2008 jkupec(a)suse.cz
+* Sat Apr 26 2008 jkupec(a)suse.cz
- added support for prompt help
- added help for Continue? [y/n/p/?] prompt (bnc #381137)
- r9837
@@ -576,7 +608,7 @@
- use --force-resolution and --no-force-resolution instead of
--force-resolution <on|off>
- r9627
-* Tue Apr 15 2008 jkupec(a)suse.cz
+* Mon Apr 14 2008 jkupec(a)suse.cz
- --no-recommends added to install, update, dist-upgrade and verify
to suppress installation of recommended packages
- r9623
@@ -635,7 +667,7 @@
* Fri Apr 04 2008 jreidinger(a)suse.cz
- fix escaping characters for shell and for local files
- r9381
-* Mon Mar 31 2008 jkupec(a)suse.cz
+* Sun Mar 30 2008 jkupec(a)suse.cz
- --priority option added to the modifyrepo command to set repository
priority (bnc #369827)
- r9311
@@ -1034,7 +1066,7 @@
* Tue Aug 21 2007 tgoettlicher(a)suse.de
- unification and clean up of XML output
- r6787
-* Tue Aug 21 2007 mls(a)suse.de
+* Mon Aug 20 2007 mls(a)suse.de
- fixed changelog ordering
* Mon Aug 20 2007 kkaempf(a)suse.de
- fix first column (i/v) of 'search' output
@@ -1326,7 +1358,7 @@
- switched building from autotools to cmake
- replaced zmart occurances with zypper
- r5711
-* Tue Jun 05 2007 jkupec(a)suse.cz
+* Mon Jun 04 2007 jkupec(a)suse.cz
- fixed changed log file path also in zypper.lr
- r5669
* Mon Jun 04 2007 jkupec(a)suse.cz
@@ -1448,7 +1480,7 @@
* Mon Nov 06 2006 mvidner(a)suse.cz
- Warn that we do not sync with ZMD (#217028).
- 0.6.1
-* Mon Nov 06 2006 mvidner(a)suse.cz
+* Sun Nov 05 2006 mvidner(a)suse.cz
- Implemented single package mode for update and list-updates,
made it the default in rug-compatible mode.
- Added logrotate support (#216911).
++++++ zypper-0.12.10.tar.bz2 -> zypper-0.12.11.tar.bz2 ++++++
++++ 36525 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package ulimit
checked in at Tue Oct 28 00:40:59 CET 2008.
--------
--- ulimit/ulimit.changes 2007-08-14 00:07:56.000000000 +0200
+++ /d/STABLE/ulimit/ulimit.changes 2008-10-27 17:48:57.932293000 +0100
@@ -1,0 +2,11 @@
+Mon Oct 27 17:35:08 CET 2008 - garloff(a)suse.de
+
+- ulimit-1.2:
+ * Allow unlimited limits (bnc 382908, bnc 375673)
+ * Allow absolute memory limits
+ * Refactor (shorten file significantly and clean up environment)
+ * Document changes in sysconfig.ulimit file
+ * Much more conservative locked memory defaults (still more than
+ the kernel default).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ulimit-1.1.tar.gz
ulimit-emptymeminfo.diff
ulimit-evalexec.diff
ulimit-kernel26.diff
ulimit-nolocklimit.diff
ulimit-stackcomment.diff
ulimit-sysconfig-typo.diff
New:
----
ulimit-1.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ulimit.spec ++++++
--- /var/tmp/diff_new_pack.W15735/_old 2008-10-28 00:40:26.000000000 +0100
+++ /var/tmp/diff_new_pack.W15735/_new 2008-10-28 00:40:26.000000000 +0100
@@ -1,39 +1,39 @@
#
-# spec file for package ulimit (Version 1.1)
+# spec file for package ulimit (Version 1.2)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: ulimit
License: Artistic License
Group: System/Base
-Autoreqprov: on
-Summary: Set per-process limits (ulimits)
-Version: 1.1
-Release: 199
+AutoReqProv: on
+Summary: Set system-wide per-process limits (rlimits)
+Version: 1.2
+Release: 1
Source: %{name}-%{version}.tar.gz
-Patch: ulimit-evalexec.diff
-Patch2: ulimit-kernel26.diff
-Patch3: ulimit-nolocklimit.diff
-Patch4: ulimit-stackcomment.diff
-Patch5: ulimit-emptymeminfo.diff
-Patch6: ulimit-sysconfig-typo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-%if %suse_version > 800
PreReq: %fillup_prereq
-%endif
%description
The file /etc/initscript is used by init to execute the commands in
/etc/inittab. As any process it started from init, it is a convenient
-place to adjust per process limits (ulimits).
+place to adjust per process limits (rlimits).
The script provided here does set limits on the memory usage per
process (amongst setting other limits) and thus prevents that a single
@@ -46,6 +46,12 @@
Configuration is done in file /etc/sysconfig/ulimit.
+Per user rlimit settings can be configured by filling in
+/etc/security/limits.conf and using the pam_limits.so functionality.
+
+More finegrained resource management (per process group), can be done
+via control groups (containers) with SLE11/openSUSE11.1 or newer.
+
Authors:
@@ -54,12 +60,6 @@
%prep
%setup -n ulimit
-%patch -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
# nothing to be done
@@ -83,37 +83,45 @@
rm -rf $RPM_BUILD_DIR/ulimit
%changelog
-* Tue Aug 14 2007 - garloff(a)suse.de
+* Mon Oct 27 2008 garloff(a)suse.de
+- ulimit-1.2:
+ * Allow unlimited limits (bnc 382908, bnc 375673)
+ * Allow absolute memory limits
+ * Refactor (shorten file significantly and clean up environment)
+ * Document changes in sysconfig.ulimit file
+ * Much more conservative locked memory defaults (still more than
+ the kernel default).
+* Tue Aug 14 2007 garloff(a)suse.de
- sysconfig Path missed a colon (299847)
-* Sat Jan 20 2007 - garloff(a)suse.de
+* Sat Jan 20 2007 garloff(a)suse.de
- Make robust against existing and empty /proc/meminfo (227742)
(and avoid forks for sed at the same time)
-* Wed Jan 25 2006 - mls(a)suse.de
+* Wed Jan 25 2006 mls(a)suse.de
- converted neededforbuild to BuildRequires
-* Mon Nov 28 2005 - garloff(a)suse.de
+* Mon Nov 28 2005 garloff(a)suse.de
- Fix comment for the stack limit (#132902).
-* Fri Apr 01 2005 - garloff(a)suse.de
+* Fri Apr 01 2005 garloff(a)suse.de
- Make script work with both pre- and post 2.6.8 kernels. (#74085)
-* Sat Mar 26 2005 - garloff(a)suse.de
+* Sat Mar 26 2005 garloff(a)suse.de
- Adapt order of applying soft vs hard limits to peculiar 2.6
requirements for all limits. (#74085, #49323, #60650)
-* Sat Mar 26 2005 - garloff(a)suse.de
+* Sat Mar 26 2005 garloff(a)suse.de
- Use eval exec "$4" to invoke binary (#74221, #60650).
-* Fri Sep 24 2004 - garloff(a)suse.de
+* Fri Sep 24 2004 garloff(a)suse.de
- Don't set a limit for locked mem by default. Triggers warning
with latest 2.6.9-rc kernels. (#SUSE45650)
- Document that the stack limit should not be set either, as
NPTL uses this a stack size for multithreade programs.
-* Sun Mar 28 2004 - garloff(a)suse.de
+* Sun Mar 28 2004 garloff(a)suse.de
- Kernel 2.6 needs the soft limits before the hard ones. (#SUSE34323)
-* Fri Feb 06 2004 - hmacht(a)suse.de
+* Fri Feb 06 2004 hmacht(a)suse.de
- building as non root (#norootforbuild)
-* Fri Aug 15 2003 - garloff(a)suse.de
+* Fri Aug 15 2003 garloff(a)suse.de
- Remove left-over debug output to /tmp
- Specify Command: killall mingetty to restart some service using
the new limits. (We miss sshd and xdm.)
-* Tue Aug 12 2003 - garloff(a)suse.de
+* Tue Aug 12 2003 garloff(a)suse.de
- Update to 1.1: Collect arguments first to reduce the number of
calls to ulimit. (Performance improvement.)
-* Fri Aug 08 2003 - garloff(a)suse.de
+* Sat Aug 09 2003 garloff(a)suse.de
- Creation of SuSE package.
++++++ ulimit-1.1.tar.gz -> ulimit-1.2.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ulimit/initscript new/ulimit/initscript
--- old/ulimit/initscript 2003-08-15 21:05:04.000000000 +0200
+++ new/ulimit/initscript 2008-10-27 17:49:10.000000000 +0100
@@ -5,86 +5,129 @@
# /bin/sh /etc/initscript <id> <level> <action> <process>
#
# Set ulimits from sysconfig
-# (c) garloff(a)suse.de, 1996, 2003
+# (c) garloff(a)suse.de, 1996, 2003, 2008
# License: Artistic
-# Set umask to safe level, and enable core dumps.
+# Set umask to safe level, and set ulimits
umask 022
PATH=/bin:/sbin:/usr/bin:/usr/sbin
export PATH
+unset HARGS SARGS SARGS2 RC
+
+# Call with OPTION LIMIT BASE
+# if BASE is not set, then LIMIT will be treated as absolute value,
+# otherwise as percentage of BASE.
+# Return value in RC
+calc_limit()
+{
+ local lim
+ unset RC
+ if test "$2" = "0" -o -z "$2"; then
+ return 1
+ else
+ if test "$2" = "unlimited" -o "${2:0:1}" = "@" -o -z "$3"; then
+ RC="-$1 ${2#@}"
+ else
+ lim=$((($3+99)/100*$2))
+ let lim-=$((lim%4))
+ RC="-$1 $lim"
+ fi
+ #echo "(\"$1\" \"$2\" \"$3\" -> \"$RC\""
+ return 0
+ fi
+}
+
+get_mem()
+{
+ TOT=0
+ if test -r /proc/meminfo; then
+ # Get memory & swap sizes to evaluate the percentages
+ MEMTOT=0; SWPTOT=0
+ while read tag num unit; do
+ case $tag in
+ MemTotal:)
+ MEMTOT=$num
+ ;;
+ SwapTotal:)
+ SWPTOT=$num
+ ;;
+ esac
+ done < /proc/meminfo
+ TOT=$(($MEMTOT+$SWPTOT))
+ fi
+}
+
+kern_ver()
+{
+ unset NEW268LOCKLIMIT
+ case $(uname -r) in
+ 2.[0-5].*|2.6.[0-7]|2.6.[0-7][.-]*)
+ ;;
+ *)
+ NEW268LOCKLIMIT=1
+ ;;
+ esac
+}
if test -r /etc/sysconfig/ulimit; then
. /etc/sysconfig/ulimit
- unset HARGS SARGS
# Max CPU time (not recommended)
- test -z "$HARDCPULIMIT" -o "$HARDCPULIMIT" = "0" ||
- HARGS="-Ht $HARDCPULIMIT"
- test -z "$SOFTCPULIMIT" -o "$SOFTCPULIMIT" = "0" ||
- SARGS="-St $SOFTCPULIMIT"
+ calc_limit "Ht" "$HARDCPULIMIT" && HARGS="$RC"
+ calc_limit "St" "$SOFTCPULIMIT" && SARGS="$RC"
# File descriptors
- test -z "$HARDFDLIMIT" -o "$HARDFDLIMIT" = "0" ||
- HARGS="$HARGS -Hn $HARDFDLIMIT"
- test -z "$SOFTFDLIMIT" -o "$SOFTFDLIMIT" = "0" ||
- SARGS="$SARGS -Sn $SOFTFDLIMIT"
+ calc_limit "Hn" "$HARDFDLIMIT" && HARGS="$HARGS $RC"
+ calc_limit "Sn" "$SOFTFDLIMIT" && SARGS="$SARGS $RC"
# Core files (0 makes sense here!)
- test -z "$HARDCORELIMIT" ||
- HARGS="$HARGS -Hc $HARDCORELIMIT"
- test -z "$SOFTCORELIMIT" ||
- SARGS="$SARGS -Sc $SOFTCORELIMIT"
+ test -z "$HARDCORELIMIT" || HARGS="$HARGS -Hc $HARDCORELIMIT"
+ test -z "$SOFTCORELIMIT" || SARGS="$SARGS -Sc $SOFTCORELIMIT"
# File sizes
- test -z "$HARDFILESZLIMIT" -o "$HARDFILESZLIMIT" = "0" ||
- HARGS="$HARGS -Hf $HARDFILESZLIMIT"
- test -z "$SOFTFILESZLIMIT" -o "$SOFTFILESZLIMIT" = "0" ||
- SARGS="$SARGS -Sf $SOFTFILESZLIMIT"
+ calc_limit "Hf" "$HARDFILESIZELIMIT" && HARGS="$HARGS $RC"
+ calc_limit "Sf" "$SOFTFILESIZELIMIT" && SARGS="$SARGS $RC"
# User processes
- test -z "$HARDPROCESSLIMIT" -o "$HARDPROCESSLIMIT" = "0" ||
- HARGS="$HARGS -Hu $HARDPROCESSLIMIT"
- test -z "$SOFTPROCESSLIMIT" -o "$SOFTPROCESSLIMIT" = "0" ||
- SARGS="$SARGS -Su $SOFTPROCESSLIMIT"
+ calc_limit "Hu" "$HARDPROCESSLIMIT" && HARGS="$HARGS $RC"
+ calc_limit "Su" "$SOFTPROCESSLIMIT" && SARGS="$SARGS $RC"
# Apply
- test -z "$HARGS" || ulimit $HARGS
- test -z "$SARGS" || ulimit $SARGS
-fi
-
-if test -r /proc/meminfo -a -r /etc/sysconfig/ulimit; then
- # Get memory & swap sizes to evaluate the percentages
- MEMTOT=$(sed -e '/^MemTotal:/!d;s/^MemTotal*:[ ]*\([0-9]*\) .*/\1/' /proc/meminfo)
- SWPTOT=$(sed -e '/^SwapTotal:/!d;s/^SwapTotal*:[ ]*\([0-9]*\) .*/\1/' /proc/meminfo)
- TOT=$(($MEMTOT+$SWPTOT))
-
- unset HARGS SARGS
- # SINGLE process limits to prevent a process from killing the machine
- # by making it go OOM
-
- # Maximum No more than VIRTUALLIMIT % of all virtual memory
- test -z "$HARDVIRTUALLIMIT" -o "$HARDVIRTUALLIMIT" = "0" ||
- HARGS="-Hv $((($TOT+99)/100*$HARDVIRTUALLIMIT))"
- test -z "$SOFTVIRTUALLIMIT" -o "$SOFTVIRTUALLIMIT" = "0" ||
- SARGS="-Sv $((($TOT+99)/100*$SOFTVIRTUALLIMIT))"
- # Maximum resident size is $RESIDENTLIMIT % of physical RAM
- test -z "$HARDRESIDENTLIMIT" -o "$HARDRESIDENTLIMIT" = "0" ||
- HARGS="$HARGS -Hm $((($MEMTOT+99)/100*$HARDRESIDENTLIMIT))"
- test -z "$SOFTRESIDENTLIMIT" -o "$SOFTRESIDENTLIMIT" = "0" ||
- SARGS="$SARGS -Sm $((($MEMTOT+99)/100*$SOFTRESIDENTLIMIT))"
- # Limit locked mem to $LOCKLIMIT % of phys RAM
- test -z "$HARDLOCKLIMIT" -o "$HARDLOCKLIMIT" = "0" ||
- HARGS="$HARGS -Hl $((($MEMTOT+99)/100*$HARDLOCKLIMIT))"
- test -z "$SOFTLOCKLIMIT" -o "$SOFTLOCKLIMIT" = "0" ||
- SARGS="$SARGS -Sl $((($MEMTOT+99)/100*$SOFTLOCKLIMIT))"
- # Optional: Limit stack and data segment sizes ($STACKLIMIT, $DATALIMIT)
- test -z "$HARDSTACKLIMIT" -o "$HARDSTACKLIMIT" = "0" ||
- HARGS="$HARGS -Hs $((($MEMTOT+99)/100*$HARDSTACKLIMIT))"
- test -z "$SOFTSTACKLIMIT" -o "$SOFTSTACKLIMIT" = "0" ||
- SARGS="$SARGS -Ss $((($MEMTOT+99)/100*$SOFTSTACKLIMIT))"
- test -z "$HARDDATALIMIT" -o "$HARDDATALIMIT" = "0" ||
- HARGS="$HARGS -Hd $((($MEMTOT+99)/100*$HARDDATALIMIT))"
- test -z "$SOFTDATALIMIT" -o "$SOFTDATALIMIT" = "0" ||
- SARGS="$SARGS -Sd $((($MEMTOT+99)/100*$SOFTDATALIMIT))"
- # Apply
- test -z "$HARGS" || ulimit $HARGS
- test -z "$SARGS" || ulimit $SARGS
+ test -z "$SARGS" || ulimit $SARGS
+ test -z "$HARGS" || ulimit $HARGS
+ #test -z "$SARGS2" || ulimit $SARGS2
+ unset HARGS SARGS RC
+
+ # Memory dependent limits
+ get_mem
+ if test $TOT != 0; then
+ kern_ver
+
+ # SINGLE process limits to prevent a process from killing the machine
+ # by making it go OOM
+
+ # Maximum No more than VIRTUALLIMIT % of all virtual memory
+ calc_limit "Hv" "$HARDVIRTUALLIMIT" "$TOT" && HARGS="$HARGS $RC"
+ calc_limit "Sv" "$SOFTVIRTUALLIMIT" "$TOT" && SARGS="$SARGS $RC"
+ # Maximum resident size is $RESIDENTLIMIT % of physical RAM
+ calc_limit "Hm" "$HARDRESIDENTLIMIT" "$MEMTOT" && HARGS="$HARGS $RC"
+ calc_limit "Sm" "$SOFTRESIDENTLIMIT" "$MEMTOT" && SARGS="$SARGS $RC"
+ # Limit locked mem to $LOCKLIMIT % of phys RAM
+ calc_limit "Hl" "$HARDLOCKLIMIT" "$MEMTOT" && HARGS="$HARGS $RC"
+ if test -z "$NEW268LOCKLIMIT"; then
+ calc_limit "Sl" "$SOFTLOCKLIMIT" "$MEMTOT" && SARGS="$SARGS $RC"
+ else
+ calc_limit "Sl" "$SOFTLOCKLIMIT" "$MEMTOT" && SARGS2="$SARGS2 $RC"
+ fi
+ # Optional: Limit stack and data segment sizes ($STACKLIMIT, $DATALIMIT)
+ calc_limit "Hs" "$HARDSTACKLIMIT" "$MEMTOT" && HARGS="$HARGS $RC"
+ calc_limit "Ss" "$SOFTSTACKLIMIT" "$MEMTOT" && SARGS="$SARGS $RC"
+ calc_limit "Hd" "$HARDDATALIMIT" "$MEMTOT" && HARGS="$HARGS $RC"
+ calc_limit "Sd" "$SOFTDATALIMIT" "$MEMTOT" && SARGS="$SARGS $RC"
+ # Apply
+ test -z "$SARGS" || ulimit $SARGS
+ test -z "$HARGS" || ulimit $HARGS
+ test -z "$SARGS2" || ulimit $SARGS2
+ unset SARGS HARGS SARGS2 RC NEW268LOCKLIMIT
+ fi
+ unset TOT MEMTOT SWPTOT
fi
+# cleanup environment
+unset calc_limit get_mem kern_ver
# Execute the program.
-exec $4
-
+eval exec "$4"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ulimit/sysconfig.ulimit new/ulimit/sysconfig.ulimit
--- old/ulimit/sysconfig.ulimit 2003-08-15 21:09:10.000000000 +0200
+++ new/ulimit/sysconfig.ulimit 2008-10-27 17:33:43.000000000 +0100
@@ -1,4 +1,4 @@
-## Path System/Limits
+## Path: System/Limits
## Description: Set single process limits (memory, CPU, core ...)
## Command: killall mingetty
#
@@ -10,39 +10,44 @@
# only partially effective: Memory limits are per process, not per
# user.
# A setting of 0 will skip the adjustment of the particular limit
-# (except for core file sizes), thus the default will remain in
-# place, which is "unlimited" for most limits. If a value is unset,
-# no adjustment will be made either.
+# (except for core file sizes), thus the default will remain in place,
+# which is "unlimited" for most (but not all) limits. If a value is
+# undefined, no adjustment will be made either.
# The memory sizes are percentages, the other values are absolute
-# numbers.
+# numbers. You can force absolute values for memory limits (in kB)
+# by prefixing the limit with @.
+# Additionally, the limits can be set to "unlimited" which will
+# set them to unlimited. (Soft limits only if the hard limit allows it.)
# Note that the limits only get effective after a session is
# restarted by init. Thus exiting mingetty (^D on console login)
# or changing runlevel to 3 and back to 5 for xdm is needed.
# Rebooting helps as well, of course.
#
-## Type: integer(0:99)
+## Type: string
## Default: 0
#
# Limit the amount of virtual memory a single process may allocate.
# Hard limit: Can not be increased by non-root.
# This value corresponds to ulimit -Hv
-# Parameter is in percent of virtual (phys+swap) memory, 0 means
-# no adjustment (unlimited).
+# Parameter is in percent of virtual (phys+swap) memory (unless you
+# prefix it by @, in which case it means kilobytes), 0 means
+# no adjustment.
#
-HARDVIRTUALLIMIT=0
+HARDVIRTUALLIMIT="0"
-## Type: integer(0:99)
+## Type: string
## Default: 80
#
# Limit the amount of virtual memory a single process may allocate.
# Soft limit: Can be increased by non-root up to the hard limit.
# This value corresponds to ulimit -Sv
-# Parameter is in percent of virtual (phys+swap) memory, 0 means
-# no adjustment (unlimited).
+# Parameter is in percent of virtual (phys+swap) memory (unless you
+# prefix it by @, in which case it means kilobytes), 0 means
+# no adjustment. "unlimited" will attempt to set this to umlimited.
#
-SOFTVIRTUALLIMIT=80
+SOFTVIRTUALLIMIT="80"
-## Type: integer(0:99)
+## Type: string
## Default: 0
#
# Limit the amount of resident memory a single process may occupy.
@@ -50,12 +55,12 @@
# it can not get more resident memory.
# Hard limit: Can not be increased by non-root.
# This value corresponds to ulimit -Hm
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment.
#
-HARDRESIDENTLIMIT=0
+HARDRESIDENTLIMIT="0"
-## Type: integer(0:99)
+## Type: string
## Default: 85
#
# Limit the amount of resident memory a single process may occupy.
@@ -63,106 +68,118 @@
# it can not get more resident memory.
# Soft limit: Can be increased by non-root up to the hard limit.
# This value corresponds to ulimit -Sm
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment.
+# "unlimited" will attempt to set this to unlimited.
#
-SOFTRESIDENTLIMIT=85
+SOFTRESIDENTLIMIT="85"
-## Type: integer(0:99)
+## Type: string
## Default: 0
#
# Limit the size of the stack that a single process may allocate.
# Normally, it should be enough to limit virtual and resident size.
+# Note that with NPTL, the stack limit determines the stack SIZE
+# of multithreaded programs and should thus better not be set.
# Hard limit: Can not be increased by non-root.
# This value corresponds to ulimit -Hs
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment
+# (the kernel default, arch-dependent, typically 8192kB).
#
-HARDSTACKLIMIT=0
+HARDSTACKLIMIT="0"
-## Type: integer(0:99)
+## Type: string
## Default: 0
#
# Limit the size of the stack that a single process may allocate.
# Normally, it should be enough to limit virtual and resident size.
+# Note that with NPTL, the stack limit determines the stack SIZE
+# of multithreaded programs and should thus better not be set.
# Soft limit: Can be increased by non-root up to the hard limit.
# This value corresponds to ulimit -Ss
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment
+# (the kernel default, arch-dependent, typically 8192kB).
+# "unlimited" will attempt to set this to unlimited.
#
-SOFTSTACKLIMIT=0
+SOFTSTACKLIMIT="0"
-## Type: integer(0:99)
+## Type: string
## Default: 0
#
# Limit the size of the data segment that a single process may allocate.
# Normally, it should be enough to limit virtual and resident size.
# Hard limit: Can not be increased by non-root.
# This value corresponds to ulimit -Hd
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment.
#
-HARDDATALIMIT=0
+HARDDATALIMIT="0"
-## Type: integer(0:99)
+## Type: string
## Default: 0
#
# Limit the size of the data segment that a single process may allocate.
# Normally, it should be enough to limit virtual and resident size.
# Soft limit: Can be increased by non-root up to the hard limit.
# This value corresponds to ulimit -Sd
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment.
+# "unlimited" will attempt to set this to unlimited.
#
-SOFTDATALIMIT=0
+SOFTDATALIMIT="0"
-## Type: integer(0:99)
-## Default: 42
+## Type: string
+## Default: 5
#
# Limit the size of the memory that a single process may lock in
# physical memory (thus preventing it to be swapped out).
# Hard limit: Can not be increased by non-root.
# This value corresponds to ulimit -Hl
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment.
#
-HARDLOCKLIMIT=42
+HARDLOCKLIMIT="@256"
-## Type: integer(0:99)
-## Default: 42
+## Type: string
+## Default: @128
#
# Limit the size of the memory that a single process may lock in
# physical memory (thus preventing it to be swapped out).
# Soft limit: Can be increased by non-root up to the hard limit.
# This value corresponds to ulimit -Sl
-# Parameter is in percent of physical memory, 0 means no adjustment
-# (unlimited).
+# Parameter is in percent of physical memory (unless you prefix
+# it by @, in which case it means kilobytes), 0 means no adjustment.
+# (Kernel default is architecture dependent, typically 32 or 64kB.)
+# "unlimited" will attempt to set this to unlimited -- not a good idea.
#
-SOFTLOCKLIMIT=42
+SOFTLOCKLIMIT="@64"
-## Type: integer
+## Type: string
## Default: 0
#
# Limit the amount of CPU time for a single process.
# Should not normally be set to non-zero values.
# Hard limit: Process will be killed.
# Corresponds to ulimit -Ht.
-# Parameter is in seconds, 0 means no adjustment (unlimited).
+# Parameter is in seconds, 0 means no adjustment.
#
-HARDCPULIMIT=0
+HARDCPULIMIT="unlimited"
-## Type: integer
+## Type: string
## Default: 0
#
# Limit the amount of CPU time for a single process.
# Should not normally be set to non-zero values.
# Soft limit: Process will be sent SIGXCPU.
# Corresponds to ulimit -St.
-# Parameter is in seconds, 0 means no adjustment (unlimited).
+# Parameter is in seconds, 0 means no adjustment.
+# "unlimited" will attempt to set this to unlimited.
#
-SOFTCPULIMIT=0
+SOFTCPULIMIT="0"
-## Type: integer
+## Type: string
## Default: 8192
#
# Limit the amount of file descriptors that a process
@@ -171,9 +188,9 @@
# Corresponds to ulimit -Hn.
# 0 means no adjustment (system default: 1024).
#
-HARDFDLIMIT=8192
+HARDFDLIMIT="8192"
-## Type: integer
+## Type: string
## Default: 1024
#
# Limit the amount of file descriptors that a process
@@ -182,7 +199,7 @@
# Corresponds to ulimit -Sn.
# 0 means no adjustment (system default: 1024).
#
-SOFTFDLIMIT=1024
+SOFTFDLIMIT="1024"
## Type: string
## Default: "unlimited"
@@ -200,7 +217,8 @@
# Limit the size of core dump files. 0 turns them off.
# Soft limit: Can be increased by non-root up to the hard limit.
# Corresponds to ulimit -Sc.
-# Parameter is in blocks (1k), 0 means turning core files off.
+# Parameter is in blocks (1k), 0 means turning core files off,
+# "unlimited" allows arbitrarily huge core files.
#
SOFTCORELIMIT="0"
@@ -210,7 +228,8 @@
# Limit the size of files a user may create.
# Hard limit: Can not be increased by non-root.
# Corresponds to ulimit -Hf.
-# Parameter is in blocks (1k), 0 means no adjustment (unlimited).
+# Parameter is in blocks (1k), 0 means no adjustment
+# "unlimited" will set this to unlimited.
#
HARDFILESZLIMIT="unlimited"
@@ -220,7 +239,8 @@
# Limit the size of files a user may create.
# Soft limit: Can be increased by non-root up to the hard limit.
# Corresponds to ulimit -Sf.
-# Parameter is in blocks (1k), 0 means no adjustment (unlimited).
+# Parameter is in blocks (1k), 0 means no adjustment.
+# "unlimited" will attempt to set this to unlimited.
#
SOFTFILESZLIMIT="unlimited"
@@ -245,6 +265,7 @@
# Corresponds to ulimit -Su.
# 0 means no adjustment (system default is a few thousands, exact
# value depends on the architecture).
+# "unlimited" will attempt to set this to unlimited.
#
SOFTPROCESSLIMIT="0"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package smartmontools
checked in at Tue Oct 28 00:39:53 CET 2008.
--------
--- smartmontools/smartmontools.changes 2008-09-02 15:08:08.000000000 +0200
+++ /d/STABLE/smartmontools/smartmontools.changes 2008-10-27 18:50:44.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Oct 24 18:12:18 CEST 2008 - sbrabec(a)suse.cz
+
+- Updated to the latest CVS snapshot:
+ * DEVICESCAN works again with SATA (bnc#436567)
+ * knowndrives updates, now using full regexps
+ * support for local drive database entries from optional file
+ * support for scheduled self tests
+ * smartd persistent state and delayed test scheduling support
+ * support for disks behind MegaRAID controllers
+ * Improve min/max temperature recording in conjunction with '-s'.
+ * new options to -l
+ * code cleanup and other fixes
+- Init script updated to support "unused" state (bnc#436567).
+- Added "rescan" to the init script to force rescanning of devices.
+- Enabled selinux support to create /dev/tw[ae] with correct
+ contexts.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sm5-20080818.tar.bz2
New:
----
sm5-20081027.tar.bz2
smartmontools-init-update.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smartmontools.spec ++++++
--- /var/tmp/diff_new_pack.K11040/_old 2008-10-28 00:39:15.000000000 +0100
+++ /var/tmp/diff_new_pack.K11040/_new 2008-10-28 00:39:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package smartmontools (Version 5.38.0.20080818)
+# spec file for package smartmontools (Version 5.38.0.20081027)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,15 +21,16 @@
Name: smartmontools
License: GPL v2 or later
Group: Hardware/Other
-Version: 5.38.0.20080818
-Release: 7
+Version: 5.38.0.20081027
+Release: 1
#Source: %{name}-%{version}.tar.bz2
-Source: sm5-20080818.tar.bz2
+Source: sm5-20081027.tar.bz2
Source1: README.SATA
Patch: smartmontools-powersave-notify.patch
Patch1: smartmontools-default-enabled.patch
Patch2: smartmontools-lsb-init-script.patch
Patch4: smartmontools-removable.patch
+Patch5: smartmontools-init-update.patch
PreReq: %insserv_prereq %fillup_prereq coreutils
%if %suse_version > 1000
%if %suse_version <= 1100
@@ -45,7 +46,7 @@
%endif
Url: http://smartmontools.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc-c++ libstdc++-devel
+BuildRequires: gcc-c++ libselinux-devel libstdc++-devel
Summary: Monitor for S.M.A.R.T. Disks and Devices
Obsoletes: smartctl smartd ucsc-smartsuite smartsuite
@@ -82,6 +83,7 @@
%patch
%endif
%endif
+%patch5
%build
./autogen.sh
@@ -94,8 +96,11 @@
export CPPFLAGS=-I/usr/src/linux/include
%endif
%configure\
- --with-docdir=%{_defaultdocdir}/%{name}
-make %{?jobs:-j%jobs}
+ --with-docdir=%{_defaultdocdir}/%{name}\
+ --enable-drivedb\
+ --enable-savestates\
+ --with-selinux
+make %{?jobs:-j%jobs} BUILD_INFO='"(openSUSE RPM)"'
%install
%makeinstall
@@ -115,11 +120,15 @@
%if %suse_version < 1010
cp README.SATA $RPM_BUILD_ROOT%{_datadir}/doc/packages/%{name}/
%endif
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/smartmontools
#remove installed files we don't want to package
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
+rm -r $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
%if %suse_version > 1020
ln -sf %{_datadir}/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
%endif
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/smart_drivedb.h <<EOF
+/* smart_drivedb.h: Custom drive database. See also %{_datadir}/smartmontools/drivedb.h. */
+EOF
%clean
rm -rf $RPM_BUILD_ROOT
@@ -156,7 +165,9 @@
%files
%defattr(-, root, root)
%doc %{_docdir}/%{name}
+%{_datadir}/smartmontools
%doc %{_mandir}/man*/*
+%{_localstatedir}/lib/smartmontools
%if %suse_version > 1000
%if %suse_version <= 1100
%{_prefix}/lib/smartmontools
@@ -165,9 +176,25 @@
%{_sbindir}/*
%config(noreplace) %{_sysconfdir}/default/*
%{_sysconfdir}/init.d/*
-%config(noreplace) %{_sysconfdir}/*.conf
+%config(noreplace) %{_sysconfdir}/smart_drivedb.h
+%config(noreplace) %{_sysconfdir}/smartd.conf
%changelog
+* Fri Oct 24 2008 sbrabec(a)suse.cz
+- Updated to the latest CVS snapshot:
+ * DEVICESCAN works again with SATA (bnc#436567)
+ * knowndrives updates, now using full regexps
+ * support for local drive database entries from optional file
+ * support for scheduled self tests
+ * smartd persistent state and delayed test scheduling support
+ * support for disks behind MegaRAID controllers
+ * Improve min/max temperature recording in conjunction with '-s'.
+ * new options to -l
+ * code cleanup and other fixes
+- Init script updated to support "unused" state (bnc#436567).
+- Added "rescan" to the init script to force rescanning of devices.
+- Enabled selinux support to create /dev/tw[ae] with correct
+ contexts.
* Tue Sep 02 2008 sbrabec(a)suse.cz
- Desktop neutral powersave-notify is no longer available.
Use "wall" to report expected disc failures.
++++++ sm5-20080818.tar.bz2 -> sm5-20081027.tar.bz2 ++++++
++++ 14805 lines of diff (skipped)
++++++ smartmontools-init-update.patch ++++++
--- smartd.initd.in
+++ smartd.initd.in
@@ -137,7 +137,7 @@
# SuSE
elif [ -f /etc/SuSE-release ] ; then
test -x $SMARTD_BIN || exit 5
-
+
# Existence of config file is optional
SMARTD_CONFIG=/etc/smartd.conf
@@ -147,48 +147,61 @@
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
- # rc_status -v ditto but be verbose in local rc status
- # rc_status -v -r ditto and clear the local rc status
+ # rc_status -v be verbose in local rc status and clear it afterwards
+ # rc_status -v -r ditto and clear both the local and overall rc status
+ # rc_status -s display "skipped" and exit with status 3
+ # rc_status -u display "unused" and exit with status 3
# rc_failed set local and overall rc status to failed
- # rc_reset clear local rc status (overall remains)
+ # rc_failed <num> set local and overall rc status to <num>
+ # rc_reset clear both the local and overall rc status
# rc_exit exit appropriate to overall rc status
+ # rc_active checks whether a service is activated by symlinks
. /etc/rc.status
-
- # First reset status of this service
+
+ # Reset status of this service
rc_reset
-
+
# Return values acc. to LSB for all commands but status:
- # 0 - success
- # 1 - misc error
- # 2 - invalid or excess args
- # 3 - unimplemented feature (e.g. reload)
- # 4 - insufficient privilege
- # 5 - program not installed
- # 6 - program not configured
+ # 0 - success
+ # 1 - generic or unspecified error
+ # 2 - invalid or excess argument(s)
+ # 3 - unimplemented feature (e.g. "reload")
+ # 4 - user had insufficient privileges
+ # 5 - program is not installed
+ # 6 - program is not configured
+ # 7 - program is not running
+ # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
- # with force-reload (in case signalling is not supported) are
+ # with force-reload (in case signaling is not supported) are
# considered a success.
+
case "$1" in
start)
echo -n "Starting smartd "
- ## Start daemon with startproc(8). If this fails
- ## the echo return value is set appropriate.
-
- # startproc should return 0, even if service is
- # already running to match LSB spec.
- startproc $SMARTD_BIN $smartd_opts
-
- # Remember status and be verbose
- rc_status -v
+ ## Start daemon with startproc(8). If this fails
+ ## the return value is set appropriately by startproc.
+
+ # We don't use startproc - we need to check for return code 17.
+ if ! /sbin/checkproc $SMARTD_BIN ; then
+ $SMARTD_BIN $smartd_opts
+ # Remember status and be verbose
+ if test $? -ne 17 ; then
+ rc_status -v
+ else
+ rc_status -u
+ fi
+ else
+ rc_reset
+ rc_status -v
+ fi
;;
stop)
echo -n "Shutting down smartd "
- killproc -TERM $SMARTD_BIN
-
- # Remember status and be verbose
- rc_status -v
+ /sbin/killproc -TERM $SMARTD_BIN
+ # Remember status and be verbose
+ rc_status -v
;;
try-restart|condrestart)
## Do a restart only if the service was active before.
@@ -199,51 +212,60 @@
fi
$0 status
if test $? = 0; then
- $0 restart
- else
+ $0 restart
+ else
rc_reset # Not running is not a failure.
fi
# Remember status and be quiet
rc_status
;;
- restart | force-reload)
+ restart)
$0 stop
$0 start
+ # Remember status and be quiet
+ rc_status
+ ;;
+ force-reload|reload)
+ echo -n "Reload service smartd "
+ /sbin/killproc -HUP $SMARTD_BIN
+ rc_status -v
;;
- reload)
- ## Like force-reload, but if daemon does not support
- ## signaling, do nothing (!)
- rc_failed 3
+ rescan)
+ ## Rescan devices to be monitored (smartd specific function)
+ echo -n "Rescanning devices for service smartd "
+ /sbin/killproc -USR1 $SMARTD_BIN
rc_status -v
;;
status)
- echo -n "Checking for service smartd "
- ## Check status with checkproc(8), if process is running
- ## checkproc will return with exit status 0.
-
- # Status has a slightly different for the status command:
- # 0 - service running
- # 1 - service dead, but /var/run/ pid file exists
- # 2 - service dead, but /var/lock/ lock file exists
- # 3 - service not running
-
- # NOTE: checkproc returns LSB compliant status values.
- checkproc $SMARTD_BIN
- rc_status -v
- ;;
- probe)
+ echo -n "Checking for service smartd "
+ ## Check status with checkproc(8), if process is running
+ ## checkproc will return with exit status 0.
+
+ # Return value is slightly different for the status command:
+ # 0 - service up and running
+ # 1 - service dead, but /var/run/ pid file exists
+ # 2 - service dead, but /var/lock/ lock file exists
+ # 3 - service not running (unused)
+ # 4 - service status unknown :-(
+ # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
+
+ # NOTE: checkproc returns LSB compliant status values.
+ /sbin/checkproc $SMARTD_BIN
+ rc_status -v
+ ;;
+ probe)
## Optional: Probe for the necessity of a reload, print out the
## argument to this init script which is required for a reload.
## Note: probe is not (yet) part of LSB (as of 1.2)
+ ## Note: probe is not (yet) part of LSB (as of 1.9)
test $SMARTD_CONFIG -nt /var/run/smartd.pid && echo reload
;;
- *)
- echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
+ *)
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|rescan|probe}"
exit 1
;;
esac
-
rc_exit
# Debian case
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
Hello community,
here is the log from the commit of package quilt
checked in at Tue Oct 28 00:35:28 CET 2008.
--------
--- quilt/quilt.changes 2008-08-21 15:29:07.000000000 +0200
+++ /d/STABLE/quilt/quilt.changes 2008-10-27 22:45:31.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Oct 27 22:36:14 CET 2008 - bwalle(a)suse.de
+
+- Only recommend 'procmail' (contains the 'formail' binary) instead
+ of requiring it. It's only needed for the 'mail' command.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
quilt-improve-formail-error.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ quilt.spec ++++++
--- /var/tmp/diff_new_pack.ZE3263/_old 2008-10-28 00:34:30.000000000 +0100
+++ /var/tmp/diff_new_pack.ZE3263/_new 2008-10-28 00:34:30.000000000 +0100
@@ -24,8 +24,9 @@
License: GPL v2 or later
Group: Productivity/Text/Utilities
Version: 0.47
-Release: 1
-Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat procmail
+Release: 12
+Requires: coreutils diffutils patch gzip bzip2 perl mktemp diffstat
+Recommends: procmail
AutoReqProv: off
Source: %{name}-%{version}.tar.bz2
Source1: suse-start-quilt-mode.el
@@ -33,7 +34,8 @@
Patch1: expand.diff
Patch2: docdir.diff
Patch3: patch-wrapper-rpm.diff
-Patch4: quilt-fix-completion.diff
+Patch4: %{name}-fix-completion.diff
+Patch5: %{name}-improve-formail-error.diff
Url: http://savannah.nongnu.org/projects/quilt
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -53,7 +55,7 @@
%prep
%setup -q
-%patch -p1 -P 1 -P 2 -P 3 -P 4
+%patch -p1 -P 1 -P 2 -P 3 -P 4 -P 5
%build
autoconf
@@ -117,6 +119,9 @@
%doc doc/quilt.pdf
%changelog
+* Mon Oct 27 2008 bwalle(a)suse.de
+- Only recommend 'procmail' (contains the 'formail' binary) instead
+ of requiring it. It's only needed for the 'mail' command.
* Thu Aug 21 2008 bwalle(a)suse.de
- update to 0.47
o quilt/scripts/patchfns.in (cat_series): Handle lines properly
@@ -373,7 +378,7 @@
- Re-add diffstat support to refresh command.
- Documentation update.
- Bump version to 0.35.
-* Fri Jun 11 2004 agruen(a)suse.de
+* Thu Jun 10 2004 agruen(a)suse.de
- Add meta-data version check/upgrade code from Martin Quinson and
me; new `quilt upgrade' command.
- Handle new/removed files correctly in generated patches: If the
@@ -416,7 +421,7 @@
of Holger Schurig's patcher tool,
http://www.holgerschurig.de/patcher.html.
- Update German translation.
-* Wed Jun 02 2004 agruen(a)suse.de
+* Tue Jun 01 2004 agruen(a)suse.de
- Fix from Dean Roehrich <roehrich(a)sgi.com>: Preserve file mode
of original file when creating backup files.
* Tue Jun 01 2004 mquinson(a)tuxfamily.org
++++++ quilt-improve-formail-error.diff ++++++
From: Bernhard Walle <bwalle(a)suse.de>
Subject: [PATCH] Check for 'formail' in 'quilt mail'
To allow using 'procmail' (which contains 'formail') as weak dependency in
package managers, explicitely check for the 'formail' binary when invoking
'quilt mail' so that the user gets a clear error message when 'formail'
is missing and knows what to do.
Signed-off-by: Bernhard Walle <bwalle(a)suse.de>
---
quilt/mail.in | 7 +++++++
1 file changed, 7 insertions(+)
--- a/quilt/mail.in
+++ b/quilt/mail.in
@@ -232,6 +232,13 @@ then
usage
fi
+# check if formail is installed before doing anything
+if ! which formail &> /dev/null
+then
+ echo "You have to install 'formail' to use 'quilt mail'" >&2
+ exit 1
+fi
+
if [ $# -ge 1 ]
then
if [ "$1" = - ]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
