--- rpms/initscripts/sme9/initscripts.spec 2013/03/19 14:21:59 1.4 +++ rpms/initscripts/sme9/initscripts.spec 2014/03/17 06:04:27 1.7 @@ -2,16 +2,15 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.03.38 +Version: 9.03.40 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 2.2%{?dist} URL: http://fedorahosted.org/releases/i/n/initscripts/ Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 -Patch1: 0001-Fix-greps-to-correctly-handle-comments-and-quotation.patch -Patch1000: centos-initscripts.patch Patch2000: initscripts-9.03.31-runlevel7.patch +Patch2001: initscripts-9.03.40-dmesg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: mingetty, /bin/awk, /bin/sed, mktemp Requires: /sbin/sysctl @@ -50,9 +49,11 @@ Requires(post): /sbin/chkconfig, coreuti Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig +Patch0: 0001-remove-duplicit-then.patch + %description The initscripts package contains the basic system scripts used to boot -your CentOS system, change runlevels, and shut the system down +your SME Server system, change runlevels, and shut the system down cleanly. Initscripts also contains the scripts that activate and deactivate most network interfaces. @@ -69,9 +70,9 @@ Currently, this consists of various memo %prep %setup -q -%patch1 -p1 -%patch1000 -p1 +%patch0 -p1 %patch2000 -p1 +%patch2001 -p1 %build make @@ -222,6 +223,7 @@ rm -rf $RPM_BUILD_ROOT /lib/udev/rename_device /lib/udev/console_init /lib/udev/console_check +/lib/udev/udev-kvm-check /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -243,6 +245,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp +%ghost %attr(0644,root,root) /etc/sysconfig/kvm %files -n debugmode %defattr(-,root,root) @@ -250,14 +253,43 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Tue Mar 19 2013 Shad L. Lords - 9.03.38-1.1.sme -- Add hack for running rc7.d script during runlevel 4 [SME: 7217] +* Sun Mar 16 2014 Ian Wells - 9.03.40-2.2.sme +- Add -n 1 to the dmesg line in rc.sysinit to prevent unwanted + messages appearing on the console [SME: 8277] + +* Sun Mar 16 2014 Ian Wells - 9.03.40-2.1.sme +- Correct offest in runlevel7 patch to avoid .orig file [SME: 8277] +- Remove CentOS Branding patch -* Mon Mar 18 2013 Johnny Hughes - 9.03.38-1.1.el6.centos +* Sat Dec 14 2013 Ian Wells - 9.03.40-2.sme +- Add hack for running rc7.d script during runlevel 4 [SME: 7217] - Roll in CentOS Branding -* Thu Mar 07 2013 Lukáš Nykrýn - 9.03.38-1.1 -- fix greps to correctly handle comments and quotation (#919086) +* Thu Oct 10 2013 Lukas Nykryn - 9.03.40-2 +- fix duplicit then (#1015065) + +* Thu Oct 10 2013 Lukas Nykryn - 9.03.40-1 +- sync disks before halt (#1006294) +- provide KVM guest count and limit info message (#1014731) +- add ability to disable LVM activation on boot (#1015065) + +* Fri Aug 09 2013 Lukáš Nykrýn - 9.03.39-1 +- remount /proc to set attributes from fstab #984003 +- print something when arping is detecting colliding ip addresses +- try dhcpv6 after v4 failed +- Allow dhclient configuration files for DHCPv6 as well. (#815676) +- ifdown: don't call nmcli on interface that is alread down +- call flush addresses with scope global +- init: inform users about .override files in .conf files +- netfs: do not force NFS exports to be mounted before _netdev mounts +- set net.ipv6.conf..autoconf in ifup-ipv6 +- mention rule6 files +- securetty: check if the device is in the file before attempting to write to it +- Process rule6-* for sit devices (#840009) +- Killproc -d should parse same values as sleep +- Make killproc more granular when delay is passed. (#428029, ) +- bonding: set master up before slaves +- Fix greps to correctly handle comments and quotation (#915659) * Wed Jan 09 2013 Lukáš Nykrýn - 9.03.38-1 - call ip link up on master after slaves are up (#893395)