aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2000-01-19 23:16:18 +0000
committerBill Nottingham <notting@redhat.com>2000-01-19 23:16:18 +0000
commit91e95ded220c0a5526690781214d087d0c2fa22a (patch)
tree1549f1c7db30aff95cb2780dff6d4966e987f14f
parentb7041a44b63521174fc0afaf16b00c303de86c5d (diff)
downloadinitscripts-91e95ded220c0a5526690781214d087d0c2fa22a.tar
initscripts-91e95ded220c0a5526690781214d087d0c2fa22a.tar.gz
initscripts-91e95ded220c0a5526690781214d087d0c2fa22a.tar.bz2
initscripts-91e95ded220c0a5526690781214d087d0c2fa22a.tar.xz
initscripts-91e95ded220c0a5526690781214d087d0c2fa22a.zip
*** empty log message ***r4-83
-rw-r--r--ChangeLog5
-rw-r--r--initscripts.spec5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6028c5ac..207d3b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-19 Bill Nottingham <notting@redhat.com>
+
+ * sysconfig/network-scripts/ifup-post:
+ don't munge resolv.conf if DNS1 is in there somewhere already
+
2000-01-17 Bill Nottingham <notting@redhat.com>
* rc.d/rc.sysinit:
diff --git a/initscripts.spec b/initscripts.spec
index 005e4534..44adb69d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/rc.d scripts.
Name: initscripts
-%define version 4.82
+%define version 4.83
Version: %{version}
Copyright: GPL
Group: System Environment/Base
@@ -227,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Wed Jan 19 2000 Bill Nottingham <notting@redhat.com>
+- fix ifup-ipx, don't munge resolv.conf if $DNS1 is already in it
+
* Thu Jan 13 2000 Bill Nottingham <notting@redhat.com>
- link popt statically