From b272b3fd83fd1321f96821f31da4379fd424b9d5e00361f76f731499b323a5e3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 8 Feb 2008 19:30:21 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/procps?expand=0&rev=9 --- procps.changes | 5 +++++ procps.spec | 10 ++++++---- sysctl.conf | 3 +++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/procps.changes b/procps.changes index 6bac6d1..4ac8171 100644 --- a/procps.changes +++ b/procps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 6 16:54:05 CET 2008 - werner@suse.de + +- Do not delete secondary IPs on deleting primary IP (bnc#212053) + ------------------------------------------------------------------- Thu Jan 17 19:08:42 CET 2008 - werner@suse.de diff --git a/procps.spec b/procps.spec index df6e8d9..28a61a5 100644 --- a/procps.spec +++ b/procps.spec @@ -18,7 +18,7 @@ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.7 -Release: 84 +Release: 91 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -158,6 +158,8 @@ rm -rf $RPM_BUILD_ROOT %_mandir/man8/sysctl.8.gz %changelog +* Wed Feb 06 2008 werner@suse.de +- Do not delete secondary IPs on deleting primary IP (bnc#212053) * Thu Jan 17 2008 werner@suse.de - Use ASCII quote instead of acute accent (bug #354407) * Wed Dec 12 2007 werner@suse.de @@ -425,7 +427,7 @@ rm -rf $RPM_BUILD_ROOT - port all required patches to 2.0.10 - Update psmisc to 21.2 - port all required patches to 21.2 -* Tue Sep 10 2002 adrian@suse.de +* Wed Sep 11 2002 adrian@suse.de - fix split alias -Obsoletes: ps:/usr/X11R6/bin/xcpustate +Provides: ps:/usr/X11R6/bin/xcpustate @@ -433,7 +435,7 @@ rm -rf $RPM_BUILD_ROOT - fix PreRequires. * Fri Aug 16 2002 werner@suse.de - Add PreReq (bug #17963) -* Thu Aug 15 2002 ro@suse.de +* Fri Aug 16 2002 ro@suse.de - modify required-start in boot.sysctl: boot.setup is gone * Tue Aug 06 2002 werner@suse.de - Statistics of cpu usage: no negative averages (bug #17449) @@ -589,7 +591,7 @@ rm -rf $RPM_BUILD_ROOT - add procinfo 0.11 * Tue May 20 1997 florian@suse.de - update to version 1.11.6 -* Sun Apr 13 1997 florian@suse.de +* Mon Apr 14 1997 florian@suse.de - update to new version 1.11.3 - update to psmisc 12a * Wed Jan 22 1997 florian@suse.de diff --git a/sysctl.conf b/sysctl.conf index 39678e4..e75e741 100644 --- a/sysctl.conf +++ b/sysctl.conf @@ -7,3 +7,6 @@ net.ipv4.conf.all.rp_filter = 1 #net.ipv6.conf.all.forwarding = 1 # increase the number of possible inotify(7) watches fs.inotify.max_user_watches = 65536 +# avoid deleting secondary IPs on deleting the primary IP +net.ipv4.conf.default.promote_secondaries = 1 +net.ipv4.conf.all.promote_secondaries = 1