diff options
| -rwxr-xr-x | rc.d/rc.sysinit | 23 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 33 |
3 files changed, 8 insertions, 50 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 3f97da5e..61eb18d8 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -141,6 +141,8 @@ init_crypto() { elif [ "${src/^\/dev\/disk\/by-uuid\/}" != "$src" ]; then src=$(__readlink $src) fi + [ -z "$src" ] && continue + [ -b "$src" ] || continue # Parse the options field, convert to cryptsetup parameters # and contruct the command line while [ -n "$opt" ]; do @@ -196,9 +198,9 @@ init_crypto() { echo "$dst: options are invalid for LUKS partitions," \ "ignoring them" fi - /sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1 + /sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1 && success || failure else - /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1 2>/dev/null + /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1 2>/dev/null && success || failure fi rc=$? if [ $rc -ne 0 ]; then @@ -314,10 +316,7 @@ mknod /dev/mapper/control c \ [ -n "$SELINUX_STATE" ] && restorecon /dev/mapper /dev/mapper/control >/dev/null 2>&1 if [ -f /etc/crypttab ]; then - s=$"Starting disk encryption:" - echo "$s" - init_crypto 0 && success "$s" || failure "$s" - echo + init_crypto 0 fi if [ -c /dev/mapper/control ]; then @@ -326,7 +325,7 @@ if [ -c /dev/mapper/control ]; then modprobe dm-multipath > /dev/null 2>&1 /sbin/multipath.static -v 0 if [ -x /sbin/kpartx ]; then - /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null fi fi @@ -348,10 +347,7 @@ if [ -c /dev/mapper/control ]; then fi if [ -f /etc/crypttab ]; then - s=$"Starting disk encryption:" - echo "$s" - init_crypto 0 && success "$s" || failure "$s" - echo + init_crypto 0 fi if [ -f /fastboot ] || strstr "$cmdline" fastboot ; then @@ -669,10 +665,7 @@ fi #[ -x /sbin/rngd -a -c /dev/hw_random ] && rngd if [ -f /etc/crypttab ]; then - s=$"Starting disk encryption using the RNG:" - echo "$s" - init_crypto 1 && success "$s" || failure "$s" - echo + init_crypto 1 fi # Configure machine if necessary. diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index c5d03576..bf3ab9ea 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -48,10 +48,8 @@ if [ -n "${HWADDR}" ]; then if [ "${FOUNDMACADDR}" != "${HWADDR}" -a "${FOUNDMACADDR}" != "${MACADDR}" ]; then curdev=`get_device_by_hwaddr ${HWADDR}` if [ -n "$curdev" ]; then - rename_device "${REALDEVICE}" "${HWADDR}" "${curdev}" || { echo $"Device ${DEVICE} has different MAC address than expected, ignoring." exit 1 - } fi fi fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 1a170418..a5aa378e 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -181,39 +181,6 @@ do_netreport () ) } -# rename_device() - Rename a network device to something else -# $1 - desired name -# $2 - hardware address to name (no longer used) -# $3 - '/' separated list of devices that are already in use -# (for general calls, use the current device you're trying to -# change to $1) - -rename_device() -{ - local target=${3##*/} - - /sbin/ip link set "$target" name "$1" 2>/dev/null || { - local hw2=`get_hwaddr ${1}` - local nconfig=`get_config_by_hwaddr ${hw2}` - local curdev=`get_device_by_hwaddr ${hw2}` - local dev= - [ -z "${hw2}" ] && return - if [ -n "$nconfig" ]; then - dev=$(. $nconfig ; echo $DEVICE) - oldifs=$IFS - IFS=/ - for device in $3 ; do - [ "$dev" = "$device" ] && unset dev - done - IFS=$oldifs - fi - [ -z "$dev" ] && dev=dev$RANDOM - - rename_device $dev $hw2 "$3/$curdev" - /sbin/ip link set "$target" name $1 2>/dev/null - } -} - # Sets $alias to the device module if $? != 0 is_available () { |