diff options
| -rw-r--r-- | initscripts.spec | 9 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 4 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-post | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 | ||||
| -rw-r--r-- | sysconfig/readonly-root | 2 | ||||
| -rwxr-xr-x | systemd/fedora-import-state | 2 | ||||
| -rwxr-xr-x | systemd/fedora-readonly | 9 |
7 files changed, 21 insertions, 9 deletions
diff --git a/initscripts.spec b/initscripts.spec index 805b4c90..c2f29a1e 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.63 +Version: 9.64 License: GPLv2 Group: System Environment/Base Release: 1%{?dist} @@ -176,6 +176,13 @@ fi %{_sysconfdir}/profile.d/debug* %changelog +* Thu Aug 06 2015 Lukáš Nykrýn <lnykryn@redhat.com> - 9.64-1 +- network-functions: fix wireless detection +- fedora-readonly: use --make-slave with --bind mounts +- import-state: don't run restorecon when it does not exist +- network: modem type interfaces should explicitly start after and stop before common interfaces +- ifup-post: should be interpreted in bash + * Mon May 18 2015 Lukáš Nykrýn <lnykryn@redhat.com> - 9.63-1 - remove ipcalc, it has its own package now - network: tell NM to reload its configuration during start diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 4e0cd8b4..1bb9a167 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -124,7 +124,7 @@ case "$1" in vpninterfaces="$vpninterfaces $i" continue fi - if [ "$TYPE" = "xDSL" -o "$TYPE" = "ADSL" ]; then + if [ "$TYPE" = "xDSL" -o "$TYPE" = "ADSL" -o "$TYPE" = "Modem" ]; then xdslinterfaces="$xdslinterfaces $i" continue fi @@ -223,7 +223,7 @@ case "$1" in bridgeinterfaces="$bridgeinterfaces $i" continue fi - if [ "$TYPE" = "xDSL" -o "$TYPE" = "ADSL" ]; then + if [ "$TYPE" = "xDSL" -o "$TYPE" = "ADSL" -o "$TYPE" = "Modem" ]; then xdslinterfaces="$xdslinterfaces $i" continue fi diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post index afbd070e..8ef719e7 100755 --- a/sysconfig/network-scripts/ifup-post +++ b/sysconfig/network-scripts/ifup-post @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash cd /etc/sysconfig/network-scripts . ./network-functions diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 98a844b6..93593aba 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -465,7 +465,7 @@ add_default_route () is_wireless_device () { [ -x /usr/sbin/iw ] || return 1 - LC_ALL=C /usr/sbin/iw dev $1 info > /dev/null 2>&1 || return 0 + LC_ALL=C /usr/sbin/iw dev $1 info > /dev/null 2>&1 && return 0 return 1 } diff --git a/sysconfig/readonly-root b/sysconfig/readonly-root index 7259e89e..bd7c5b3b 100644 --- a/sysconfig/readonly-root +++ b/sysconfig/readonly-root @@ -17,3 +17,5 @@ STATE_MOUNT=/var/lib/stateless/state STATE_OPTIONS= # NFS server to use for persistent data? CLIENTSTATE= +# Use slave bind-mounts +SLAVE_MOUNTS=yes diff --git a/systemd/fedora-import-state b/systemd/fedora-import-state index 7809ca81..07fd5cad 100755 --- a/systemd/fedora-import-state +++ b/systemd/fedora-import-state @@ -6,6 +6,6 @@ cd /run/initramfs/state find . -mindepth 1 -maxdepth 1 -exec cp -av -t / {} \; # run restorecon on the copied files -if [ -e /sys/fs/selinux/enforce ]; then +if [ -e /sys/fs/selinux/enforce -a -x /usr/sbin/restorecon ]; then find . -mindepth 1 -print0 | { cd / && xargs --null restorecon -i; } fi diff --git a/systemd/fedora-readonly b/systemd/fedora-readonly index f33eef48..50e5ed97 100755 --- a/systemd/fedora-readonly +++ b/systemd/fedora-readonly @@ -75,6 +75,9 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then # Scan partitions for local scratch storage rw_mount_dev=$(blkid -t LABEL="$RW_LABEL" -l -o device) + bindmountopts= + [ "$SLAVE_MOUNTS" = "yes" ] && bindmountopts="--make-slave" + # First try to mount scratch storage from /etc/fstab, then any # partition with the proper label. If either succeeds, be sure # to wipe the scratch storage clean. If both fail, then mount @@ -117,7 +120,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then done [[ $prefix -eq 1 ]] && continue - mount -n --bind "$RW_MOUNT$m" "$m" + mount -n --bind $bindmountopts "$RW_MOUNT$m" "$m" selinux_fixup "$m" done @@ -165,7 +168,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then mount_state() { if [ -e "$1" ]; then [ ! -e "$STATE_MOUNT$1" ] && cp -a --parents "$1" "$STATE_MOUNT" - mount -n --bind "$STATE_MOUNT$1" "$1" + mount -n --bind $bindmountopts "$STATE_MOUNT$1" "$1" fi } @@ -174,7 +177,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then [ ! -f "$file" ] && continue if [ -f "$STATE_MOUNT/$file" ] ; then - mount -n --bind "$STATE_MOUNT/$file" "$file" + mount -n --bind $bindmountopts "$STATE_MOUNT/$file" "$file" fi for path in $(grep -v "^#" "$file" 2>/dev/null); do |