diff --git a/.gitignore b/.gitignore index 6e18a8a..1111e53 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initscripts-9.49.17.tar.bz2 +SOURCES/initscripts-9.49.24.tar.bz2 diff --git a/.initscripts.metadata b/.initscripts.metadata index 9dd3d1e..59a8fde 100644 --- a/.initscripts.metadata +++ b/.initscripts.metadata @@ -1 +1 @@ -27d7b9cf0671777304828c42bc8d1ff1126bb280 SOURCES/initscripts-9.49.17.tar.bz2 +4eb026a895d12d5c4e016a5ba96f3c634447ec4c SOURCES/initscripts-9.49.24.tar.bz2 diff --git a/SOURCES/0001-fedora-readonly-fix-prefix-detection-1059749.patch b/SOURCES/0001-fedora-readonly-fix-prefix-detection-1059749.patch deleted file mode 100644 index 51fe164..0000000 --- a/SOURCES/0001-fedora-readonly-fix-prefix-detection-1059749.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bdfa5a5d4e959937fe9f525d8ce39cec410dbe08 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= -Date: Wed, 16 Apr 2014 13:47:53 +0200 -Subject: [PATCH] fedora-readonly: fix prefix detection (#1059749) - ---- - systemd/rhel-readonly | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/systemd/rhel-readonly b/systemd/rhel-readonly -index 190de26..f33eef4 100755 ---- a/systemd/rhel-readonly -+++ b/systemd/rhel-readonly -@@ -42,7 +42,8 @@ MOUNTS=() - if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then - - add_mount() { -- MOUNTS=("${MOUNTS[@]}" "$1") -+ mnt=${1%/} -+ MOUNTS=("${MOUNTS[@]}" "$mnt") - } - - cp_empty() { -@@ -109,7 +110,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then - prefix=0 - for mount_point in "${MOUNTS[@]}"; do - [[ $m = $mount_point ]] && continue -- if [[ $m =~ ^$mount_point.* ]] ; then -+ if [[ $m =~ ^$mount_point/.* ]] ; then - prefix=1 - break - fi --- -1.8.3.1 - diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index c87e075..4b47b70 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -1,10 +1,10 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.49.17 +Version: 9.49.24 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist} 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 @@ -35,8 +35,6 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service -Patch0: 0001-fedora-readonly-fix-prefix-detection-1059749.patch - %description The initscripts package contains basic system scripts used during a boot of the system. It also contains scripts which @@ -55,7 +53,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch0 -p1 %build make @@ -201,6 +198,7 @@ rm -rf $RPM_BUILD_ROOT %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/00-netreport %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING +%doc examples /var/lib/stateless %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp @@ -218,8 +216,51 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Thu Aug 14 2014 Lukáš Nykrýn - 9.49.17-1.1 -- fedora-readonly: fix prefix detection +* Thu Jan 15 2015 Lukáš Nykrýn - 9.49.24-1 +- rhel-import-state.service: run a little bit later + +* Tue Dec 16 2014 Lukáš Nykrýn - 9.49.23-1 +- ifdown-ipv6: reset addrgenmode to eui64 for device +- ifup: fix typo + +* Wed Nov 12 2014 Lukáš Nykrýn - 9.49.22-1 +- adjust LINKDELAY when STP is on + +* Fri Oct 24 2014 Lukáš Nykrýn - 9.49.21-1 +- ifup,vlan: fix typo + +* Thu Oct 09 2014 Lukáš Nykrýn - 9.49.20-1 +- rhel-import-state: do not clobber / + +* Tue Sep 23 2014 Lukáš Nykrýn - 9.49.19-1 +- minor fixes + +* Wed Sep 17 2014 Lukáš Nykrýn - 9.49.18-1 +- is_available_wait: properly propage return value from is_available +- man: update sys-unconfig.8 +- rename_devices: comments need to have a blank before them +- add example ifcfg files +- network-functions: improve bonding_masters grep +- ifup: if we were unable to determine DEVICE always call nmcli up +- ifup-tunnel: call ifup-ipv6 in the end +- ifup: also set multicast_snooping after the bridge is up +- ifup-eth: some options for bridge can be applied after the bridge is up +- custom naming for VLAN devices +- ifup-wireless: add support for wowlan +- vi.po: fix parentheses +- network-functions: ETHTOOL_DELAY introduction patch +- ipcalc: -c allow netmask +- ipcalc: parse prefix more safely +- use pie and relro by default +- sys-unconfig: use poweroff instead of halt +- ifup-aliases: improve duplicate address detection +- network-functions: handle BONDING_OPTS better +- fedora-readonly: fix prefix detection (#1059749) +- network: tell nm to wake the slaves +- bridging: add possibility to set prio and ageing +- network: add support for team devices +- inittab: fix path and mention set-default +- fedora-domainname: DefaultDependencies=no * Wed Apr 02 2014 Lukáš Nykrýn - 9.49.17-1 - add configurable DEVTIMEOUT