This commit is contained in:
Bill Nottingham 2012-03-09 11:35:36 -05:00
parent c6fdeed320
commit 0d1e704f9c
3 changed files with 33 additions and 15 deletions

3
.gitignore vendored
View File

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

View File

@ -4,14 +4,13 @@
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.34 Version: 9.35
# 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: 3%{?dist} Release: 1%{?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, coreutils Requires: mingetty, /bin/awk, /bin/sed, coreutils
Requires: /sbin/sysctl Requires: /sbin/sysctl
@ -91,7 +90,6 @@ Currently, this consists of various memory checking code.
%prep %prep
%setup -q %setup -q
%patch -p1
%build %build
make make
@ -144,7 +142,6 @@ chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
chmod 664 /var/log/wtmp /var/run/utmp chmod 664 /var/log/wtmp /var/run/utmp
chmod 600 /var/log/btmp chmod 600 /var/log/btmp
/sbin/chkconfig --add netfs
/sbin/chkconfig --add network /sbin/chkconfig --add network
/sbin/chkconfig --add netconsole /sbin/chkconfig --add netconsole
%if %{_with_systemd} %if %{_with_systemd}
@ -160,6 +157,14 @@ if [ $1 = 0 ]; then
/sbin/chkconfig --del netconsole /sbin/chkconfig --del netconsole
fi fi
%post legacy
/sbin/chkconfig --add netfs
%preun legacy
if [ $1 = 0 ; then
/sbin/chkconfig --del netfs
fi
%triggerun -- initscripts < 7.62 %triggerun -- initscripts < 7.62
/sbin/chkconfig --del random /sbin/chkconfig --del random
/sbin/chkconfig --del rawdevices /sbin/chkconfig --del rawdevices
@ -247,6 +252,7 @@ rm -rf $RPM_BUILD_ROOT
/etc/rc[0-9].d /etc/rc[0-9].d
%dir /etc/rc.d/init.d %dir /etc/rc.d/init.d
/etc/rc.d/init.d/* /etc/rc.d/init.d/*
%exclude /etc/rc.d/init.d/netfs
%exclude /etc/rc.d/init.d/halt %exclude /etc/rc.d/init.d/halt
%exclude /etc/rc.d/init.d/killall %exclude /etc/rc.d/init.d/killall
%exclude /etc/rc.d/init.d/reboot %exclude /etc/rc.d/init.d/reboot
@ -264,7 +270,6 @@ rm -rf $RPM_BUILD_ROOT
/sbin/fstab-decode /sbin/fstab-decode
/sbin/genhostid /sbin/genhostid
/sbin/getkey /sbin/getkey
/sbin/securetty
/sbin/sushell /sbin/sushell
%attr(2755,root,root) /sbin/netreport %attr(2755,root,root) /sbin/netreport
/lib/udev/rules.d/* /lib/udev/rules.d/*
@ -273,6 +278,7 @@ rm -rf $RPM_BUILD_ROOT
/sbin/service /sbin/service
/sbin/ppp-watch /sbin/ppp-watch
%{_mandir}/man*/* %{_mandir}/man*/*
%exclude %{_mandir}/man*/securetty*
%dir %attr(775,root,root) /var/run/netreport %dir %attr(775,root,root) /var/run/netreport
%dir /etc/ppp %dir /etc/ppp
%dir /etc/ppp/peers %dir /etc/ppp/peers
@ -285,7 +291,6 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/NetworkManager %dir /etc/NetworkManager
%dir /etc/NetworkManager/dispatcher.d %dir /etc/NetworkManager/dispatcher.d
/etc/NetworkManager/dispatcher.d/00-netreport /etc/NetworkManager/dispatcher.d/00-netreport
/etc/NetworkManager/dispatcher.d/05-netfs
%doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING README-init
/var/lib/stateless /var/lib/stateless
%ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0600,root,utmp) /var/log/btmp
@ -298,6 +303,7 @@ rm -rf $RPM_BUILD_ROOT
%files legacy %files legacy
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) /etc/inittab %config(noreplace) /etc/inittab
/etc/NetworkManager/dispatcher.d/05-netfs
%dir /etc/rc.d %dir /etc/rc.d
%dir /etc/rc.d/rc[0-9].d %dir /etc/rc.d/rc[0-9].d
%config(missingok) /etc/rc.d/rc[0-9].d/* %config(missingok) /etc/rc.d/rc[0-9].d/*
@ -311,6 +317,8 @@ rm -rf $RPM_BUILD_ROOT
/lib/udev/rules.d/* /lib/udev/rules.d/*
/lib/udev/console_init /lib/udev/console_init
/lib/udev/console_check /lib/udev/console_check
/sbin/securetty
%{_mandir}/man*/securetty*
%files -n debugmode %files -n debugmode
%defattr(-,root,root) %defattr(-,root,root)
@ -318,13 +326,25 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug* /etc/profile.d/debug*
%changelog %changelog
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.34-3 * Fri Mar 9 2012 Bill Nottingham <notting@redhat.com> - 9.35-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - use the same DHCP lease file names as NetworkManager, where appropriate
- copy network state from initramfs with a systemd service, not inline (<wwoods@redhat.com>)
- sysconfig.txt: clean up section on disabling IPv6
- ifup: allow for ifup-$TYPE/ifdown-$TYPE
- fedora-readonly.service: drop StandardInput=tty (#785662)
- sysconfig.txt: document additional ETHTOOL_OPTS enhancements (<raghusiddarth@gmail.com>)
- port assorted ancient ifup-XYZ scripts away from ifconfig
- don't use ifconfig in ifup-aliases (#721010, 588993, based on <tgummels@redhat.com>)
- fedora-storage-init: handle dmraid sets with spaces (#728795, <lnykryn@redhat.com>)
- fedora-readonly: don't exit with an error if SEinux isn't active. (#768628)
- init.d/network: fix checks for network filesystems (#760018)
- fedora-wait-storage: drop stdin/stdout/stderr (#735867)
- netfs: move to legacy package
- translation updates
* Tue Oct 25 2011 Bill Nottingham <notting@redhat.com> - 9.34-2 * Tue Oct 25 2011 Bill Nottingham <notting@redhat.com> - 9.34-1
- read locale.conf if it exists (#706756) - read locale.conf if it exists (#706756)
- ifdown: fix logic error with removing arp_ip_target (#745681) - 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>)

View File

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