8.83-1
This commit is contained in:
Bill Nottingham
parent
4582be35f1
commit
c0124b73ca
@ -1 +1 @@
|
||||
initscripts-8.82.tar.bz2
|
||||
initscripts-8.83.tar.bz2
|
||||
|
||||
186
initscripts.spec
186
initscripts.spec
@ -2,13 +2,14 @@
|
||||
|
||||
Summary: The inittab file and the /etc/init.d scripts
|
||||
Name: initscripts
|
||||
Version: 8.82
|
||||
Version: 8.83
|
||||
# ppp-watch is GPLv2+, everything else is GPLv2
|
||||
License: GPLv2 and GPLv2+
|
||||
Group: System Environment/Base
|
||||
Release: 1
|
||||
Source: initscripts-%{version}.tar.bz2
|
||||
BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
URL: http://fedorahosted.org/releases/i/n/initscripts/
|
||||
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
|
||||
Requires: /sbin/sysctl, syslog
|
||||
Requires: /sbin/fuser, /bin/grep
|
||||
@ -18,7 +19,6 @@ Requires: util-linux >= 2.10s-11, mount >= 2.11l
|
||||
Requires: bash >= 3.0
|
||||
%if with_upstart
|
||||
Requires: upstart
|
||||
Obsoletes: event-compat-sysv
|
||||
%else
|
||||
Requires: SysVinit >= 2.85-38
|
||||
%endif
|
||||
@ -36,9 +36,10 @@ Conflicts: xorg-x11, glib2 < 2.11.1-2
|
||||
Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7
|
||||
# http://bugzilla.redhat.com/show_bug.cgi?id=252973
|
||||
Conflicts: nut < 2.2.0
|
||||
Obsoletes: rhsound sapinit
|
||||
Obsoletes: hotplug
|
||||
Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires(post): /sbin/chkconfig, coreutils
|
||||
Requires(preun): /sbin/chkconfig
|
||||
BuildRequires: glib2-devel popt-devel gettext pkgconfig
|
||||
|
||||
%description
|
||||
@ -84,7 +85,7 @@ rm -f $RPM_BUILD_ROOT/etc/inittab.*
|
||||
rm -f \
|
||||
$RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
|
||||
$RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-iucv \
|
||||
$RPM_BUILD_ROOT/etc/udev/rules.d/55-ccw.rules \
|
||||
$RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
|
||||
$RPM_BUILD_ROOT/lib/udev/ccw_init
|
||||
%else
|
||||
rm -f \
|
||||
@ -105,11 +106,6 @@ chmod 600 /var/log/btmp
|
||||
/sbin/chkconfig --add network
|
||||
/sbin/chkconfig --add netconsole
|
||||
|
||||
# Handle converting prefdm back to respawn
|
||||
if fgrep -q "x:5:once:/etc/X11/prefdm -nodaemon" /etc/inittab ; then
|
||||
sed --in-place=.rpmsave 's|^x:5:once:/etc/X11/prefdm -nodaemon|x:5:respawn:/etc/X11/prefdm -nodaemon|g' /etc/inittab
|
||||
fi
|
||||
|
||||
%preun
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/chkconfig --del netfs
|
||||
@ -134,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%config(noreplace) /etc/sysconfig/readonly-root
|
||||
/etc/sysconfig/network-scripts/ifdown
|
||||
/sbin/ifdown
|
||||
%config /etc/sysconfig/network-scripts/ifdown-post
|
||||
/etc/sysconfig/network-scripts/ifdown-post
|
||||
/etc/sysconfig/network-scripts/ifup
|
||||
/sbin/ifup
|
||||
%dir /etc/sysconfig/console
|
||||
@ -143,42 +139,42 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir /etc/sysconfig/networking/devices
|
||||
%dir /etc/sysconfig/networking/profiles
|
||||
%dir /etc/sysconfig/networking/profiles/default
|
||||
%config /etc/sysconfig/network-scripts/network-functions
|
||||
%config /etc/sysconfig/network-scripts/network-functions-ipv6
|
||||
%config /etc/sysconfig/network-scripts/init.ipv6-global
|
||||
%config /etc/sysconfig/network-scripts/ifcfg-lo
|
||||
%config /etc/sysconfig/network-scripts/ifup-ipx
|
||||
%config /etc/sysconfig/network-scripts/ifup-post
|
||||
%config /etc/sysconfig/network-scripts/ifdown-ppp
|
||||
%config /etc/sysconfig/network-scripts/ifdown-sl
|
||||
%config /etc/sysconfig/network-scripts/ifup-ppp
|
||||
%config /etc/sysconfig/network-scripts/ifup-sl
|
||||
%config /etc/sysconfig/network-scripts/ifup-routes
|
||||
%config /etc/sysconfig/network-scripts/ifdown-routes
|
||||
%config /etc/sysconfig/network-scripts/ifup-plip
|
||||
%config /etc/sysconfig/network-scripts/ifup-plusb
|
||||
%config /etc/sysconfig/network-scripts/ifup-bnep
|
||||
%config /etc/sysconfig/network-scripts/ifdown-bnep
|
||||
%config /etc/sysconfig/network-scripts/ifup-eth
|
||||
%config /etc/sysconfig/network-scripts/ifdown-eth
|
||||
%config /etc/sysconfig/network-scripts/ifup-ipv6
|
||||
%config /etc/sysconfig/network-scripts/ifdown-ipv6
|
||||
%config /etc/sysconfig/network-scripts/ifup-ipsec
|
||||
%config /etc/sysconfig/network-scripts/ifdown-ipsec
|
||||
%config /etc/sysconfig/network-scripts/ifup-sit
|
||||
%config /etc/sysconfig/network-scripts/ifdown-sit
|
||||
%config /etc/sysconfig/network-scripts/ifup-tunnel
|
||||
%config /etc/sysconfig/network-scripts/ifdown-tunnel
|
||||
%config /etc/sysconfig/network-scripts/ifup-aliases
|
||||
%config /etc/sysconfig/network-scripts/ifup-ippp
|
||||
%config /etc/sysconfig/network-scripts/ifdown-ippp
|
||||
%config /etc/sysconfig/network-scripts/ifup-wireless
|
||||
/etc/sysconfig/network-scripts/network-functions
|
||||
/etc/sysconfig/network-scripts/network-functions-ipv6
|
||||
/etc/sysconfig/network-scripts/init.ipv6-global
|
||||
/etc/sysconfig/network-scripts/ifcfg-lo
|
||||
/etc/sysconfig/network-scripts/ifup-ipx
|
||||
/etc/sysconfig/network-scripts/ifup-post
|
||||
/etc/sysconfig/network-scripts/ifdown-ppp
|
||||
/etc/sysconfig/network-scripts/ifdown-sl
|
||||
/etc/sysconfig/network-scripts/ifup-ppp
|
||||
/etc/sysconfig/network-scripts/ifup-sl
|
||||
/etc/sysconfig/network-scripts/ifup-routes
|
||||
/etc/sysconfig/network-scripts/ifdown-routes
|
||||
/etc/sysconfig/network-scripts/ifup-plip
|
||||
/etc/sysconfig/network-scripts/ifup-plusb
|
||||
/etc/sysconfig/network-scripts/ifup-bnep
|
||||
/etc/sysconfig/network-scripts/ifdown-bnep
|
||||
/etc/sysconfig/network-scripts/ifup-eth
|
||||
/etc/sysconfig/network-scripts/ifdown-eth
|
||||
/etc/sysconfig/network-scripts/ifup-ipv6
|
||||
/etc/sysconfig/network-scripts/ifdown-ipv6
|
||||
/etc/sysconfig/network-scripts/ifup-ipsec
|
||||
/etc/sysconfig/network-scripts/ifdown-ipsec
|
||||
/etc/sysconfig/network-scripts/ifup-sit
|
||||
/etc/sysconfig/network-scripts/ifdown-sit
|
||||
/etc/sysconfig/network-scripts/ifup-tunnel
|
||||
/etc/sysconfig/network-scripts/ifdown-tunnel
|
||||
/etc/sysconfig/network-scripts/ifup-aliases
|
||||
/etc/sysconfig/network-scripts/ifup-ippp
|
||||
/etc/sysconfig/network-scripts/ifdown-ippp
|
||||
/etc/sysconfig/network-scripts/ifup-wireless
|
||||
/etc/sysconfig/network-scripts/ifup-isdn
|
||||
/etc/sysconfig/network-scripts/ifdown-isdn
|
||||
/etc/sysconfig/network-scripts/net.hotplug
|
||||
%ifarch s390 s390x
|
||||
%config /etc/sysconfig/network-scripts/ifup-ctc
|
||||
%config /etc/sysconfig/network-scripts/ifup-iucv
|
||||
/etc/sysconfig/network-scripts/ifup-ctc
|
||||
/etc/sysconfig/network-scripts/ifup-iucv
|
||||
%endif
|
||||
%config(noreplace) /etc/networks
|
||||
/etc/rwtab
|
||||
@ -188,7 +184,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%if with_upstart
|
||||
%config(noreplace) /etc/event.d/*
|
||||
%endif
|
||||
/etc/udev/rules.d/*
|
||||
%config /etc/X11/prefdm
|
||||
%config(noreplace) /etc/inittab
|
||||
%dir /etc/rc.d
|
||||
@ -199,10 +194,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir /etc/rc.d/init.d
|
||||
/etc/rc.local
|
||||
/etc/rc.sysinit
|
||||
%config /etc/rc.d/init.d/*
|
||||
%config /etc/rc.d/rc
|
||||
/etc/rc.d/init.d/*
|
||||
/etc/rc.d/rc
|
||||
%config(noreplace) /etc/rc.d/rc.local
|
||||
%config /etc/rc.d/rc.sysinit
|
||||
/etc/rc.d/rc.sysinit
|
||||
%config(noreplace) /etc/sysctl.conf
|
||||
%exclude /etc/profile.d/debug*
|
||||
%config /etc/profile.d/*
|
||||
@ -219,6 +214,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/sbin/securetty
|
||||
%attr(2755,root,root) /sbin/netreport
|
||||
/sbin/initlog
|
||||
/lib/udev/rules.d/*
|
||||
/lib/udev/rename_device
|
||||
/lib/udev/console_init
|
||||
/lib/udev/console_check
|
||||
@ -231,13 +227,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir %attr(775,root,root) /var/run/netreport
|
||||
%dir /etc/ppp
|
||||
%dir /etc/ppp/peers
|
||||
%config /etc/ppp/ip-up
|
||||
%config /etc/ppp/ip-down
|
||||
%config /etc/ppp/ip-up.ipv6to4
|
||||
%config /etc/ppp/ip-down.ipv6to4
|
||||
%config /etc/ppp/ipv6-up
|
||||
%config /etc/ppp/ipv6-down
|
||||
%config /etc/initlog.conf
|
||||
/etc/ppp/ip-up
|
||||
/etc/ppp/ip-down
|
||||
/etc/ppp/ip-up.ipv6to4
|
||||
/etc/ppp/ip-down.ipv6to4
|
||||
/etc/ppp/ipv6-up
|
||||
/etc/ppp/ipv6-down
|
||||
%config(noreplace) /etc/initlog.conf
|
||||
%dir /etc/NetworkManager
|
||||
%dir /etc/NetworkManager/dispatcher.d
|
||||
/etc/NetworkManager/dispatcher.d/00-netreport
|
||||
@ -249,10 +245,28 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%ghost %attr(0664,root,utmp) /var/run/utmp
|
||||
|
||||
%files -n debugmode
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) /etc/sysconfig/debug
|
||||
%config /etc/profile.d/debug*
|
||||
|
||||
%changelog
|
||||
* Tue Sep 30 2008 Bill Nottingham <notting@redhat.com> - 8.83-1
|
||||
- various merge review fixes (#225900)
|
||||
Notably: init scripts/network scripts are no longer %config
|
||||
- remove some extraneous device-mapper initialization
|
||||
- use pidfile in status before calling pidof (#463205)
|
||||
- use plymouth directly, not the rhgb-client wrapper
|
||||
- move bridging after bonding (#449950, <djuran@redhat.com>)
|
||||
- use alsactl to save sound settings. (#462677, <jkysela@redhat.com>)
|
||||
- quit plymouth differently (<rstrode@redhat.com>)
|
||||
- make sure we don't try and spawn a repair shell when there's no
|
||||
tty (#463161)
|
||||
- move udev rules to /lib
|
||||
- stateless updates (#433702, <harald@redhat.com>)
|
||||
- call logger with a full path (#447928, <harald@redhat.com>)
|
||||
- translation updates: as, bn_IN, ca, cz, de, es, fi, fr, gu, it, ja,
|
||||
lv, mr, nl, or, pa, pl, pt_BR, ru, te, zh_TW
|
||||
|
||||
* Wed Sep 10 2008 Bill Nottingham <notting@redhat.com> - 8.82-1
|
||||
- refresh translation strings
|
||||
- plymouth updates. (#460702, <rstrode@redhat.com>)
|
||||
@ -620,7 +634,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- ipsec: various fixes & new features (#150682, #168972, <mitr@redhat.com>, <alex@milivojevic.org>)
|
||||
- ipsec: add check for IKE_METHOD (#197576, <john_smyth@mail.ru>)
|
||||
- rename_device: ignore alias devices, fix race (#186355)
|
||||
- ifup/ifdown: don't mark as %config
|
||||
- ifup/ifdown: don't mark as %%config
|
||||
- rwtab: some additions/cleanup
|
||||
|
||||
* Mon Jun 12 2006 Bill Nottingham <notting@redhat.com> 8.35-1
|
||||
@ -849,7 +863,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- rc.sysinit: fix restorecon invocation (#153100)
|
||||
- initlog: free some of the more egregious memory leaks (#85935)
|
||||
- initlog: fix potential memory overread (#153685, <in-redhat@baka.org>)
|
||||
- remove some conflicts, %post scripts, etc. that were only relelvant
|
||||
- remove some conflicts, %%post scripts, etc. that were only relelvant
|
||||
for upgrades from pre-7.0
|
||||
- other minor fixes, see ChangeLog
|
||||
|
||||
@ -952,15 +966,15 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Sun Oct 31 2004 Florian La Roche <laroche@redhat.com>
|
||||
- /etc/rc.d/rc: use "LC_ALL=C grep" for small speedup
|
||||
- /etc/rc.d/rc.sysinit:
|
||||
- do not read udev.conf, this seems to be all in the start_udev script
|
||||
- fix detection of "nomodules" kernel command line option
|
||||
- read /proc/cmdline earlier and convert rhgb to use that, too
|
||||
- load_module(): change redirection to /dev/null
|
||||
- some checks for RHGB_STARTED="" looked strange
|
||||
- do not read udev.conf, this seems to be all in the start_udev script
|
||||
- fix detection of "nomodules" kernel command line option
|
||||
- read /proc/cmdline earlier and convert rhgb to use that, too
|
||||
- load_module(): change redirection to /dev/null
|
||||
- some checks for RHGB_STARTED="" looked strange
|
||||
- /etc/sysconfig/network-scripts/ifup-ppp:
|
||||
- remove a call to basename with shell builtins
|
||||
- remove a call to basename with shell builtins
|
||||
- /etc/sysconfig/network-scripts/network-functions:
|
||||
- remove some calls to basename/sed with shell builtins
|
||||
- remove some calls to basename/sed with shell builtins
|
||||
|
||||
* Wed Oct 27 2004 Bill Nottingham <notting@redhat.com> 7.93.2-1
|
||||
- fix prefdm fallback to installed display managers (#137274)
|
||||
@ -1372,17 +1386,17 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- rc.d/init.d/functions: make strstr() even shorter, remove old
|
||||
"case" version that has been already commented out
|
||||
- rc.d/rc.sysinit:
|
||||
- no need to set NETWORKING=no, it is not used/exported
|
||||
- do not export BOOTUP
|
||||
- delete two "sleep 1" calls that wants to add time to go
|
||||
into confirmation mode. There is enough time to press a
|
||||
key anyway or use "confirm" in /proc/cmdline.
|
||||
- read /proc/cmdline into a variable
|
||||
- use strstr() to search in /proc/cmdline
|
||||
- add "forcefsck" as possible option in /proc/cmdline
|
||||
- while removing lock files, no need to call `basename`
|
||||
- add unamer=`uname -r` and reduce number of forks
|
||||
- do not fork new bash to create /var/log/ksyms.0
|
||||
- no need to set NETWORKING=no, it is not used/exported
|
||||
- do not export BOOTUP
|
||||
- delete two "sleep 1" calls that wants to add time to go
|
||||
into confirmation mode. There is enough time to press a
|
||||
key anyway or use "confirm" in /proc/cmdline.
|
||||
- read /proc/cmdline into a variable
|
||||
- use strstr() to search in /proc/cmdline
|
||||
- add "forcefsck" as possible option in /proc/cmdline
|
||||
- while removing lock files, no need to call `basename`
|
||||
- add unamer=`uname -r` and reduce number of forks
|
||||
- do not fork new bash to create /var/log/ksyms.0
|
||||
|
||||
* Thu Apr 03 2003 Karsten Hopp <karsten@redhat.de> 7.15-1
|
||||
- Mainframe has no /dev/ttyX devices and no mingetty, don't
|
||||
@ -1540,8 +1554,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
* Thu Jul 11 2002 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||
- /etc/init.d/functions:
|
||||
daemon(): avoid starting another bash
|
||||
killproc(): avoid starting another bash for the default case
|
||||
daemon(): avoid starting another bash
|
||||
killproc(): avoid starting another bash for the default case
|
||||
- do not call "insmod -p" before loading the "st" module
|
||||
|
||||
* Tue Jul 09 2002 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||
@ -1884,8 +1898,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
* Wed Apr 25 2001 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||
- add further s390 changes:
|
||||
- ifup-iucv
|
||||
- mkkerneldoth.s390
|
||||
- ifup-iucv
|
||||
- mkkerneldoth.s390
|
||||
|
||||
* Tue Apr 24 2001 Than Ngo <than@redhat.com>
|
||||
- add shutdown UPS into halt (bug #34312)
|
||||
@ -2114,22 +2128,22 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
* Thu Jul 13 2000 Bill Nottingham <notting@redhat.com>
|
||||
- fix == tests in rc.sysinit
|
||||
- more %pretrans tweaks
|
||||
- more %%pretrans tweaks
|
||||
|
||||
* Thu Jul 13 2000 Jeff Johnson <jbj@redhat.com>
|
||||
- test if /etc/rc.d is a symlink already in pre-transaction syscalls.
|
||||
|
||||
* Tue Jul 11 2000 Bill Nottingham <notting@redhat.com>
|
||||
- implement the %pre with RPM Magic(tm)
|
||||
- implement the %%pre with RPM Magic(tm)
|
||||
|
||||
* Sat Jul 8 2000 Bill Nottingham <notting@redhat.com>
|
||||
- fix it to not follow /etc/rc.d
|
||||
|
||||
* Fri Jul 7 2000 Bill Nottingham <notting@redhat.com>
|
||||
- fix %pre, again
|
||||
- fix %%pre, again
|
||||
|
||||
* Thu Jul 6 2000 Bill Nottingham <notting@redhat.com>
|
||||
- tweak %pre back to a mv (rpm is fun!)
|
||||
- tweak %%pre back to a mv (rpm is fun!)
|
||||
- do USB initialization before fsck, so keyboard works if it fails
|
||||
|
||||
* Mon Jul 3 2000 Bill Nottingham <notting@redhat.com>
|
||||
@ -2377,7 +2391,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- fix swapoff silliness
|
||||
|
||||
* Fri Sep 10 1999 Bill Nottingham <notting@redhat.com>
|
||||
- chkconfig --del in %preun, not %postun
|
||||
- chkconfig --del in %%preun, not %%postun
|
||||
- use killall5 in halt
|
||||
- swapoff non-/etc/fstab swap
|
||||
|
||||
@ -2719,7 +2733,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- Added network-functions to spec file.
|
||||
- Added report functionality to usernetctl.
|
||||
- Fixed bugs I introduced into usernetctl while adding clone device support.
|
||||
- Clean up entire RPM_BUILD_ROOT directory in %clean.
|
||||
- Clean up entire RPM_BUILD_ROOT directory in %%clean.
|
||||
|
||||
* Mon Sep 29 1997 Michael K. Johnson <johnsonm@redhat.com>
|
||||
- Clone device support in network scripts, rc scripts, and usernetctl.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user