From 6a4433a99fb086f48f66c6c07e61df9a0538085c Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 26 Aug 2015 14:59:01 +0200 Subject: init.d/functions: reload systemd if it can't see an initscript In good old times it was enough to drop initscript to /etc/rc.d/init.d and call service start. Now you need to reload systemd before. For compatibility purposes we should check if systemd knows about the initscript and if not call systemctl daemon-reload automatically. --- rc.d/init.d/functions | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 0ba07b08..8e5800b6 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -47,6 +47,10 @@ systemctl_redirect () { options="--ignore-dependencies" fi + if systemctl show -p LoadState "$prog.service" | grep -q 'not-found' ; then + action $"Reloading systemd: " /bin/systemctl daemon-reload + fi + action "$s" /bin/systemctl $options $command "$prog.service" } -- cgit v1.2.1 From a018641159b7d0a2938cc56baadc163e2775601e Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 11 Sep 2015 10:35:20 +0200 Subject: service: improve status and stop function for daemon with intscripts When daemon abnormally dies systemd leaves it in active state. This is due to support of initscripts like network. We can guess if it is a daemon or not. --- rc.d/init.d/functions | 9 ++++++++- service | 7 +++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 8e5800b6..558aaee0 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -390,7 +390,14 @@ status() { if [ "$_use_systemctl" = "1" ]; then systemctl status ${0##*/}.service - return $? + ret=$? + # LSB daemons that dies abnormally in systemd looks alive in systemd's eyes due to RemainAfterExit=yes + # lets adjust the reality a little bit + if systemctl show -p ActiveState ${0##*/}.service | grep -q '=active$' && \ + systemctl show -p SubState ${0##*/}.service | grep -q '=exited$' ; then + ret=3 + fi + return $ret fi # First try "pidof" diff --git a/service b/service index c8bf0a2b..79792fc5 100755 --- a/service +++ b/service @@ -71,6 +71,13 @@ while [ $# -gt 0 ]; do done if [ -f "${SERVICEDIR}/${SERVICE}" ]; then + # LSB daemons that dies abnormally in systemd looks alive in systemd's eyes due to RemainAfterExit=yes + # lets reap them before next start + if [ "${ACTION}" = "start" ] && \ + systemctl show -p ActiveState ${SERVICE}.service | grep -q '=active$' && \ + systemctl show -p SubState ${SERVICE}.service | grep -q '=exited$' ; then + /bin/systemctl stop ${SERVICE}.service + fi env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS} elif [ -x "${ACTIONDIR}/${SERVICE}/${ACTION}" -a -n "${ACTION}" ]; then env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${ACTIONDIR}/${SERVICE}/${ACTION}" ${OPTIONS} -- cgit v1.2.1 From 0ed79af945f2a12178c4b9280d11d5a571796c75 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 16 Sep 2015 13:49:12 +0200 Subject: ifup-eth: some bridge options are applied later --- sysconfig/network-scripts/ifup-eth | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index bae388c8..c44c2aee 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -62,7 +62,9 @@ if [ "${TYPE}" = "Bridge" ]; then for arg in $BRIDGING_OPTS ; do key=${arg%%=*}; value=${arg##*=}; - echo $value > /sys/class/net/${DEVICE}/bridge/$key + if [ "${key}" != "multicast_router" -a "${key}" != "hash_max" -a "${key}" != "multicast_snooping" ]; then + echo $value > /sys/class/net/${DEVICE}/bridge/$key + fi done # set LINKDELAY (used as timeout when calling check_link_down()) # to at least (${DELAY} * 2) + 7 if STP is enabled. This is the -- cgit v1.2.1 From be40a46a55b6e53a02c4824da68fd7d2f96c2fc6 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 15 Oct 2015 09:59:10 +0200 Subject: ifdown: clean ipv4 localhost addresses --- sysconfig/network-scripts/ifdown-eth | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 5ce3e1df..fb2d291c 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -111,15 +111,15 @@ retcode=0 # brought up. Flush all addresses associated with this # instance instead. if [ -d "/sys/class/net/${REALDEVICE}" ]; then - if [ "${REALDEVICE}" = "lo" ]; then - SCOPE="host" - else - SCOPE="global" - fi + LABEL= if [ "${REALDEVICE}" = "${DEVICE}" ]; then - ip addr flush dev ${REALDEVICE} scope ${SCOPE} 2>/dev/null + LABEL="label ${DEVICE}" + fi + if [ "${REALDEVICE}" = "lo" ]; then + ip addr flush dev ${REALDEVICE} ${LABEL} scope host 2>/dev/null else - ip addr flush dev ${REALDEVICE} label ${DEVICE} scope ${SCOPE} 2>/dev/null + ip addr flush dev ${REALDEVICE} ${LABEL} scope global 2>/dev/null + ip -4 addr flush dev ${REALDEVICE} ${LABEL} scope host 2>/dev/null fi if [ "${SLAVE}" = "yes" -a -n "${MASTER}" ]; then -- cgit v1.2.1 From 0f5fb4820a5173934a4d7c98d88037ccad21f3f1 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 16 Oct 2015 09:54:46 +0200 Subject: ifup-wireless: fix calling of phy_wireless_device --- sysconfig/network-scripts/ifup-wireless | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifup-wireless b/sysconfig/network-scripts/ifup-wireless index 0628860d..99651004 100755 --- a/sysconfig/network-scripts/ifup-wireless +++ b/sysconfig/network-scripts/ifup-wireless @@ -26,6 +26,9 @@ # Only meant to be called from ifup. +cd /etc/sysconfig/network-scripts +. ./network-functions + IW=${IW:-iw} [ "$KEY" ] && KEYS="key d:0:$KEY" @@ -54,6 +57,6 @@ monitor) esac if [ -n "$WOWLAN" ] ; then - PHYDEVICE=phy_wireless_device $DEVICE + PHYDEVICE=$(phy_wireless_device $DEVICE) iw phy $PHYDEVICE wowlan enable ${WOWLAN} fi -- cgit v1.2.1 From 6b3a75f3e5da0a23fc0dcd5facd81b7b8f2f687e Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 27 Oct 2015 10:12:19 +0100 Subject: network-scripts: DEVICE and HWADRR could be quoted by apostrophe --- sysconfig/network-scripts/ifdown-eth | 2 +- sysconfig/network-scripts/ifup-eth | 2 +- sysconfig/network-scripts/network-functions | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index fb2d291c..e163c8e5 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -57,7 +57,7 @@ fi fi if is_bonding_device ${DEVICE} ; then - for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do + for device in $(LANG=C grep -l "^[[:space:]]*MASTER=['\"]\?${DEVICE}['\"]\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do is_ignored_file "$device" && continue /sbin/ifdown ${device##*/} done diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index c44c2aee..88a4beba 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -138,7 +138,7 @@ fi if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then install_bonding_driver ${DEVICE} /sbin/ip link set dev ${DEVICE} up - for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do + for device in $(LANG=C grep -l "^[[:space:]]*MASTER=['\"]\?${DEVICE}['\"]\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do is_ignored_file "$device" && continue /sbin/ifup ${device##*/} || net_log "Unable to start slave device ${device##*/} for master ${DEVICE}." warning done diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 8a03134a..9715d8d1 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -22,14 +22,14 @@ get_hwaddr () get_config_by_device () { - LANG=C grep -l "^[[:space:]]*DEVICE=\"\?${1}\"\?\([[:space:]#]\|$\)" \ + LANG=C grep -l "^[[:space:]]*DEVICE=['\"]\?${1}['\"]\?\([[:space:]#]\|$\)" \ /etc/sysconfig/network-scripts/ifcfg-* \ | LC_ALL=C sed -e "$__sed_discard_ignored_files" } get_config_by_hwaddr () { - LANG=C grep -il "^[[:space:]]*HWADDR=\"\?${1}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-* \ + LANG=C grep -il "^[[:space:]]*HWADDR=['\"]\?${1}['\"]\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-* \ | LC_ALL=C sed -e "$__sed_discard_ignored_files" } -- cgit v1.2.1 From 4799b57c9888bb986f258b1552858b0b19f31087 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 9 Nov 2015 08:55:41 +0100 Subject: fedora-loadmodules: we don't have readahead anymore --- systemd/system/fedora-loadmodules.service | 1 - 1 file changed, 1 deletion(-) diff --git a/systemd/system/fedora-loadmodules.service b/systemd/system/fedora-loadmodules.service index cd2b4910..51285093 100644 --- a/systemd/system/fedora-loadmodules.service +++ b/systemd/system/fedora-loadmodules.service @@ -2,7 +2,6 @@ Description=Load legacy module configuration DefaultDependencies=no Conflicts=shutdown.target -After=systemd-readahead-collect.service systemd-readahead-replay.service Before=sysinit.target shutdown.target ConditionPathExists=|/etc/rc.modules ConditionDirectoryNotEmpty=|/etc/sysconfig/modules/ -- cgit v1.2.1 From a961884b1fcec1d6520624c5f3e25630fd9d09ab Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 9 Nov 2015 13:05:09 +0100 Subject: init.d/functions: end with 0 --- rc.d/init.d/functions | 1 + 1 file changed, 1 insertion(+) diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 558aaee0..70b6b942 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -608,4 +608,5 @@ if [ "$_use_systemctl" = "1" ]; then fi strstr "$(cat /proc/cmdline)" "rc.debug" && set -x +return 0 -- cgit v1.2.1 From 70953fb20c85da43140552075245d6110621a637 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 7 Dec 2015 14:17:16 +0100 Subject: 9.65-1 --- initscripts.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index c2f29a1e..e7e0fce3 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.64 +Version: 9.65 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -176,6 +176,16 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Mon Dec 07 2015 Lukáš Nykrýn - 9.65-1 +- init.d/functions: end with 0 +- fedora-loadmodules: we don't have readahead anymore +- network-scripts: DEVICE and HWADRR could be quoted by apostrophe +- ifup-wireless: fix calling of phy_wireless_device +- ifdown: clean ipv4 localhost addresses +- ifup-eth: some bridge options are applied later +- service: improve status and stop function for daemon with intscripts +- init.d/functions: reload systemd if it can't see an initscript + * Thu Aug 06 2015 Lukáš Nykrýn - 9.64-1 - network-functions: fix wireless detection - fedora-readonly: use --make-slave with --bind mounts -- cgit v1.2.1 From 18d3aae0b1a9e58d5a970602d756a9ecf7cd1515 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 25 Dec 2015 11:59:14 +0100 Subject: ifdown-eth: fix comparison --- sysconfig/network-scripts/ifdown-eth | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index e163c8e5..9808ed67 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -112,7 +112,7 @@ retcode=0 # instance instead. if [ -d "/sys/class/net/${REALDEVICE}" ]; then LABEL= - if [ "${REALDEVICE}" = "${DEVICE}" ]; then + if [ "${REALDEVICE}" != "${DEVICE}" ]; then LABEL="label ${DEVICE}" fi if [ "${REALDEVICE}" = "lo" ]; then -- cgit v1.2.1 From 3b4cc9f3ba2808c6b808d9795210aa4b00de0afd Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 6 Jan 2016 14:17:47 +0100 Subject: sysconfig.txt: document PPPOE_EXTRA and PPPD_EXTRA --- sysconfig.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysconfig.txt b/sysconfig.txt index e34ca1b9..08243f11 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -757,6 +757,8 @@ Files in /etc/sysconfig/network-scripts/ PPPOPTIONS= + PPPOE_EXTRA = any extra arguments to pass to pppoe + PPPD_EXTRA = any extra arguments to pass to pppd PAPNAME=<"name $PAPNAME" on pppd command line> (note that the "remotename" option is always specified as the logical ppp device name, like "ppp0" (which might perhaps be the -- cgit v1.2.1 From e2613d2ea352411f2ab1e5fca82807ea3d319118 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Mon, 1 Feb 2016 17:00:43 +0100 Subject: autorelabel: call dracut-initramfs-restore before forced reboot --- systemd/fedora-autorelabel | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index 7cb9b40c..924df8e3 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-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 } -- cgit v1.2.1 From 82c97b4ac121269ecb8296d74f0e5ee27d8d81b5 Mon Sep 17 00:00:00 2001 From: Rodrigo Freire Date: Sat, 5 Mar 2016 21:07:54 -0300 Subject: network: Treat other tunnel interfaces, fixes ifdown stage This patch is a complement of commit 5e9dd516e2e0 ("add bonding & xDSL to the list of devices brought up afterwards (#97030,#91399)"), ensuring that GRE and IPIP tunnels are brought up after base interfaces are up, and bring down before the underlying interface goes down. Signed-off-by: Rodrigo Freire --- rc.d/init.d/network | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 21b75344..91afaa64 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -109,7 +109,7 @@ case "$1" in bridgeinterfaces="$bridgeinterfaces $i" continue fi - if [ "$TYPE" = "IPSEC" ]; then + if [ "$TYPE" = "IPSEC" ] || [ "$TYPE" = "IPIP" ] || [ "$TYPE" = "GRE" ]; then vpninterfaces="$vpninterfaces $i" continue fi @@ -189,7 +189,7 @@ case "$1" in vpninterfaces="$vpninterfaces $i" continue fi - if [ "$TYPE" = "IPSEC" ]; then + if [ "$TYPE" = "IPSEC" ] || [ "$TYPE" = "IPIP" ] || [ "$TYPE" = "GRE" ]; then vpninterfaces="$vpninterfaces $i" continue fi -- cgit v1.2.1 From c2dbaeda955fa99f90b051b62e58e3269237aea0 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 14 Mar 2016 20:24:31 +0100 Subject: autorelabel: turn quota off before relabeling --- systemd/fedora-autorelabel | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel index 924df8e3..d87acd29 100755 --- a/systemd/fedora-autorelabel +++ b/systemd/fedora-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 -- cgit v1.2.1 From 189590c3af812c2d8f445a6800ad74f4ccf15e2e Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 25 Apr 2016 15:27:16 +0200 Subject: remove autorelabel stuff --- systemd/fedora-autorelabel | 43 -------------------------- systemd/system/fedora-autorelabel-mark.service | 15 --------- systemd/system/fedora-autorelabel.service | 17 ---------- 3 files changed, 75 deletions(-) delete mode 100755 systemd/fedora-autorelabel delete mode 100644 systemd/system/fedora-autorelabel-mark.service delete mode 100644 systemd/system/fedora-autorelabel.service diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel deleted file mode 100755 index d87acd29..00000000 --- a/systemd/fedora-autorelabel +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# -# Do automatic relabelling -# - -. /etc/init.d/functions - -relabel_selinux() { - # if /sbin/init is not labeled correctly this process is running in the - # wrong context, so a reboot will be required after relabel - AUTORELABEL= - . /etc/selinux/config - echo "0" > /sys/fs/selinux/enforce - [ -x /bin/plymouth ] && plymouth --hide-splash - - if [ "$AUTORELABEL" = "0" ]; then - echo - echo $"*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required. " - echo $"*** /etc/selinux/config indicates you want to manually fix labeling" - echo $"*** problems. Dropping you to a shell; the system will reboot" - echo $"*** when you leave the shell." - sulogin - - else - echo - echo $"*** Warning -- SELinux ${SELINUXTYPE} policy relabel is required." - echo $"*** Relabeling could take a very long time, depending on file" - 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 - /usr/lib/dracut/dracut-initramfs-restore - systemctl --force reboot -} - -# Check to see if a full relabel is needed -if [ "$READONLY" != "yes" ]; then - restorecon $(awk '!/^#/ && $4 !~ /noauto/ && $2 ~ /^\// { print $2 }' /etc/fstab) >/dev/null 2>&1 - relabel_selinux -fi diff --git a/systemd/system/fedora-autorelabel-mark.service b/systemd/system/fedora-autorelabel-mark.service deleted file mode 100644 index 33b5147b..00000000 --- a/systemd/system/fedora-autorelabel-mark.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Mark the need to relabel after reboot -DefaultDependencies=no -Requires=local-fs.target -Conflicts=shutdown.target -After=local-fs.target -Before=sysinit.target shutdown.target -ConditionSecurity=!selinux -ConditionPathIsDirectory=/etc/selinux -ConditionPathExists=!/.autorelabel - -[Service] -ExecStart=-/bin/touch /.autorelabel -Type=oneshot -RemainAfterExit=yes diff --git a/systemd/system/fedora-autorelabel.service b/systemd/system/fedora-autorelabel.service deleted file mode 100644 index c98a40ff..00000000 --- a/systemd/system/fedora-autorelabel.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Relabel all filesystems, if necessary -DefaultDependencies=no -Requires=local-fs.target -Conflicts=shutdown.target -After=local-fs.target -Before=sysinit.target shutdown.target -ConditionSecurity=selinux -ConditionKernelCommandLine=|autorelabel -ConditionPathExists=|/.autorelabel - -[Service] -ExecStart=/lib/systemd/fedora-autorelabel -Type=oneshot -TimeoutSec=0 -RemainAfterExit=yes -StandardInput=tty -- cgit v1.2.1 From 3a01f26785ca58a4c50648dbaccaf5ddbd61e028 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 25 Apr 2016 15:30:28 +0200 Subject: 9.66-1 --- initscripts.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index e7e0fce3..d7680a9c 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: Scripts to bring up network interfaces and legacy utilities Name: initscripts -Version: 9.65 +Version: 9.66 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -17,6 +17,7 @@ Requires: ipcalc Conflicts: systemd < 216-3 Conflicts: lvm2 < 2.02.98-3 Conflicts: dmraid < 1.0.0.rc16-18 +Conflicts: policycoreutils < 2.5-6 Requires: systemd Requires: iproute, /sbin/arping, findutils # Not strictly required, but nothing else requires it @@ -176,6 +177,14 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Mon Apr 25 2016 Lukáš Nykrýn - 9.66-1 +- remove autorelabel stuff +- autorelabel: turn quota off before relabeling +- network: Treat other tunnel interfaces, fixes ifdown stage +- autorelabel: call dracut-initramfs-restore before forced reboot +- sysconfig.txt: document PPPOE_EXTRA and PPPD_EXTRA +- ifdown-eth: fix comparison + * Mon Dec 07 2015 Lukáš Nykrýn - 9.65-1 - init.d/functions: end with 0 - fedora-loadmodules: we don't have readahead anymore -- cgit v1.2.1