diff --git a/.gitignore b/.gitignore index a9db077..5e6829e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initscripts-9.49.30.tar.bz2 +SOURCES/initscripts-9.49.37.tar.bz2 diff --git a/.initscripts.metadata b/.initscripts.metadata index a5f95d8..32e7e20 100644 --- a/.initscripts.metadata +++ b/.initscripts.metadata @@ -1 +1 @@ -4cfe60d99337691c343168fc4fc3cadac7e51d17 SOURCES/initscripts-9.49.30.tar.bz2 +13c791c3da04f1a7f0aed0c90a573a8fe7c44ca8 SOURCES/initscripts-9.49.37.tar.bz2 diff --git a/SOURCES/0001-autorelabel-call-dracut-initramfs-restore-before-for.patch b/SOURCES/0001-autorelabel-call-dracut-initramfs-restore-before-for.patch deleted file mode 100644 index 978d9cf..0000000 --- a/SOURCES/0001-autorelabel-call-dracut-initramfs-restore-before-for.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46f5c65d242efafcc27c5da23d0f0d8387ba7250 Mon Sep 17 00:00:00 2001 -From: Michal Sekletar -Date: Mon, 1 Feb 2016 17:00:43 +0100 -Subject: [PATCH] autorelabel: call dracut-initramfs-restore before forced - reboot - ---- - systemd/rhel-autorelabel | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/systemd/rhel-autorelabel b/systemd/rhel-autorelabel -index 7cb9b40..924df8e 100755 ---- a/systemd/rhel-autorelabel -+++ b/systemd/rhel-autorelabel -@@ -31,6 +31,7 @@ relabel_selinux() { - /sbin/fixfiles $FORCE restore > /dev/null 2>&1 - fi - rm -f /.autorelabel -+ /usr/lib/dracut/dracut-initramfs-restore - systemctl --force reboot - } - --- -2.4.3 - diff --git a/SOURCES/0001-autorelabel-turn-quota-off-before-relabeling.patch b/SOURCES/0001-autorelabel-turn-quota-off-before-relabeling.patch deleted file mode 100644 index ae599f3..0000000 --- a/SOURCES/0001-autorelabel-turn-quota-off-before-relabeling.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b399247905d9d4a9d12bb3f17b6d085dfbd674c8 Mon Sep 17 00:00:00 2001 -From: Lukas Nykryn -Date: Mon, 14 Mar 2016 20:24:31 +0100 -Subject: [PATCH] autorelabel: turn quota off before relabeling - ---- - systemd/rhel-autorelabel | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/systemd/rhel-autorelabel b/systemd/rhel-autorelabel -index 924df8e..d87acd2 100755 ---- a/systemd/rhel-autorelabel -+++ b/systemd/rhel-autorelabel -@@ -28,6 +28,7 @@ relabel_selinux() { - echo $"*** system size and speed of hard drives." - - FORCE=`cat /.autorelabel` -+ [ -x "/usr/sbin/quotaoff" ] && /usr/sbin/quotaoff -aug - /sbin/fixfiles $FORCE restore > /dev/null 2>&1 - fi - rm -f /.autorelabel --- -2.4.3 - diff --git a/SOURCES/0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch b/SOURCES/0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch deleted file mode 100644 index f20df5b..0000000 --- a/SOURCES/0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a4eefc6bdfb1e6872ef83428b833a0cc6474e8e2 Mon Sep 17 00:00:00 2001 -From: Thomas Haller -Date: Mon, 13 Jun 2016 16:40:46 +0200 -Subject: [PATCH] source_config: tell NetworkManger to load ifcfg file even for - NM_CONTROLLED=no - -Cherry-picked from: 61fb1cb -Resolves: #1345919 ---- - sysconfig/network-scripts/network-functions | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 61a851f..db729cc 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -170,10 +170,12 @@ source_config () - else - ISALIAS=no - fi -- if ! is_false $NM_CONTROLLED && is_nm_running; then -- nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" -- UUID=$(get_uuid_by_config $CONFIG) -- [ -n "$UUID" ] && _use_nm=true -+ if is_nm_running; then -+ nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" -+ if ! is_false $NM_CONTROLLED; then -+ UUID=$(get_uuid_by_config $CONFIG) -+ [ -n "$UUID" ] && _use_nm=true -+ fi - fi - } - --- -2.8.3 - diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index 19e2102..14e8071 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.30 +Version: 9.49.37 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.3 +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,10 +35,6 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service -Patch1: 0001-autorelabel-call-dracut-initramfs-restore-before-for.patch -Patch2: 0001-autorelabel-turn-quota-off-before-relabeling.patch -Patch3: 0001-source_config-tell-NetworkManger-to-load-ifcfg-file-.patch - %description The initscripts package contains basic system scripts used during a boot of the system. It also contains scripts which @@ -57,9 +53,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build make @@ -216,6 +209,8 @@ rm -rf $RPM_BUILD_ROOT /usr/lib/tmpfiles.d/initscripts.conf %dir /usr/libexec/initscripts %dir /usr/libexec/initscripts/legacy-actions +%ghost %{_localstatedir}/log/dmesg +%ghost %{_localstatedir}/log/dmesg.old %files -n debugmode %defattr(-,root,root) @@ -223,13 +218,41 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Thu Jun 16 2016 Lukáš Nykrýn - 9.49.30-1.3 -- source_config: tell NetworkManger to load ifcfg file even for NM_CONTROLLED=no +* Mon Sep 12 2016 Lukáš Nykrýn - 9.49.37-1 +- rhel-import-state: fix broken order of parameters -* Tue Mar 15 2016 Lukáš Nykrýn - 9.49.30-1.2 -- autorelabel: turn quota off before relabeling +* Fri Sep 09 2016 Lukáš Nykrýn - 9.49.36-1 +- import-state: copy just some attributes + +* Tue Aug 02 2016 Lukáš Nykrýn - 9.49.35-1 +- functions: systemctl show now returns an error when unit does not exist + +* Fri Jul 15 2016 Lukáš Nykrýn - 9.49.34-1 +- import-state: restore also sensitivity part of SELinux context -* Tue Feb 02 2016 Lukáš Nykrýn - 9.49.30-1.1 +* Thu Jul 14 2016 Lukáš Nykrýn - 9.49.33-1 +- network: run after network-pre.target + +* Thu Jun 23 2016 Lukáš Nykrýn - 9.49.32-1 +- ifup-eth: fix setting preferred_lft and valid_lft + +* Mon Jun 13 2016 Lukáš Nykrýn - 9.49.31-1 +- ipv6: wait for all global IPv6 addresses to leave the "tentative" state +- source_config: tell NetworkManger to load ifcfg file even for NM_CONTROLLED=no +- ifup-aliases: inherit ARPCHECK from parent device +- rhel-dmesg: don't start in containers +- ifup-eth: fix typo in error message (#1038776) +- sysctl.conf: steal comments about /usr,/etc,... from fedora's sysctl.conf +- rwtab: /var/lib/nfs needs to copy the files +- functions: improve killing loops +- ipcalc: detect invalid mask +- ifup: set valid_lft and preferred_lft to forever for static ip +- service: use systemd mangle for given service +- ifup-post: check resolve.conf also with DNS2 +- ifdown-post: remove resolv.conf only in specific cases +- spec: ghost /var/log/dmesg +- network-functions: is_available_wait should wait even in the case that is_available returns 2 +- autorelabel: turn quota off before relabeling - autorelabel: call dracut-initramfs-restore before forced reboot * Wed Sep 16 2015 Lukáš Nykrýn - 9.49.30-1