9.34-1 plus a patch

This commit is contained in:
Bill Nottingham 2011-10-25 15:36:39 -04:00
parent 870a56405c
commit c9173e1a0e
4 changed files with 11 additions and 27 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/initscripts-9.33.tar.bz2 /initscripts-9.33.tar.bz2
/initscripts-9.34.tar.bz2

View File

@ -1,25 +0,0 @@
commit 09bfb5033230e6846414bc6002aa12ce09c23687
Author: Bill Nottingham <notting@redhat.com>
Date: Mon Sep 19 17:45:17 2011 -0400
Only bother with consoletype if we're actually connected to something that's console-ish. (#657869)
If we're connected to a socket, or a pipe, or a file, or anything else - assume dumb mode.
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 79545b5..e313e35 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -54,10 +54,10 @@ systemctl_redirect () {
[ -z "${COLUMNS:-}" ] && COLUMNS=80
if [ -z "${CONSOLETYPE:-}" ]; then
- if [ -r "/dev/stderr" ]; then
+ if [ -c "/dev/stderr" ]; then
CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
else
- CONSOLETYPE="$(/sbin/consoletype 2>/dev/null)"
+ CONSOLETYPE="serial"
fi
fi

View File

@ -4,13 +4,14 @@
Summary: The inittab file and the /etc/init.d scripts Summary: The inittab file and the /etc/init.d scripts
Name: initscripts Name: initscripts
Version: 9.33 Version: 9.34
# ppp-watch is GPLv2+, everything else is GPLv2 # ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+ License: GPLv2 and GPLv2+
Group: System Environment/Base Group: System Environment/Base
Release: 1%{?dist} Release: 2%{?dist}
URL: http://fedorahosted.org/releases/i/n/initscripts/ URL: http://fedorahosted.org/releases/i/n/initscripts/
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
Patch: 807a7f3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: mingetty, /bin/awk, /bin/sed, mktemp
Requires: /sbin/sysctl Requires: /sbin/sysctl
@ -90,6 +91,7 @@ Currently, this consists of various memory checking code.
%prep %prep
%setup -q %setup -q
%patch -p1
%build %build
make make
@ -316,6 +318,11 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug* /etc/profile.d/debug*
%changelog %changelog
* Tue Oct 25 2011 Bill Nottingham <notting@redhat.com> - 9.34-2
- read locale.conf if it exists (#706756)
- ifdown: fix logic error with removing arp_ip_target (#745681)
- service: don't write to stderr that's not there (#746263)
* Wed Oct 12 2011 Bill Nottingham <notting@redhat.com> - 9.33-1 * Wed Oct 12 2011 Bill Nottingham <notting@redhat.com> - 9.33-1
- netconsole: only use the first ARP response (#744309, <doug.knight@karmix.org>) - netconsole: only use the first ARP response (#744309, <doug.knight@karmix.org>)
- udev/rules.d/88-clock.rules: drop this entirely, as it causes issues in conjunction with systemd - udev/rules.d/88-clock.rules: drop this entirely, as it causes issues in conjunction with systemd

View File

@ -1 +1,2 @@
02badee8515a3fddf853bd6316c16ced initscripts-9.33.tar.bz2 02badee8515a3fddf853bd6316c16ced initscripts-9.33.tar.bz2
b0c99414b92dc6d87bef7d9f762c567c initscripts-9.34.tar.bz2