From fd85a905ec4b0e4810adf053d9bdcd6c22d23f98 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 14 Jan 2011 12:44:51 +0100 Subject: [PATCH] use $() instead of backquotes --- initscripts/pl_boot | 12 ++++++------ initscripts/pl_netinit | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/initscripts/pl_boot b/initscripts/pl_boot index 16b7fa2..6541dec 100755 --- a/initscripts/pl_boot +++ b/initscripts/pl_boot @@ -20,11 +20,11 @@ ATTEMPTS_BEFORE_BACKUP=3 BOOT_DIR=/usr/boot/ # get the server we are going to be contacting -BOOT_SERVER=`cat $BOOT_DIR/boot_server` -BOOT_SERVER_PORT=`cat $BOOT_DIR/boot_server_port` +BOOT_SERVER=$(cat $BOOT_DIR/boot_server) +BOOT_SERVER_PORT=$(cat $BOOT_DIR/boot_server_port) # the file to request from the boot server -BOOT_SERVER_PATH=`cat $BOOT_DIR/boot_server_path` +BOOT_SERVER_PATH=$(cat $BOOT_DIR/boot_server_path) # location of the cacert for this boot server BOOT_SERVER_CACERT=$BOOT_DIR/cacert.pem @@ -33,11 +33,11 @@ BOOT_SERVER_CACERT=$BOOT_DIR/cacert.pem BOOT_SERVER_GPG_KEYRING=$BOOT_DIR/pubring.gpg # get the backup server we are going to be contacting -BACKUP_BOOT_SERVER=`cat $BOOT_DIR/backup/boot_server` -BACKUP_BOOT_SERVER_PORT=`cat $BOOT_DIR/backup/boot_server_port` +BACKUP_BOOT_SERVER=$(cat $BOOT_DIR/backup/boot_server) +BACKUP_BOOT_SERVER_PORT=$(cat $BOOT_DIR/backup/boot_server_port) # the file to request from the backup boot server -BACKUP_BOOT_SERVER_PATH=`cat $BOOT_DIR/backup/boot_server_path` +BACKUP_BOOT_SERVER_PATH=$(cat $BOOT_DIR/backup/boot_server_path) # location of the cacert for the backup boot server BACKUP_BOOT_SERVER_CACERT=$BOOT_DIR/backup/cacert.pem diff --git a/initscripts/pl_netinit b/initscripts/pl_netinit index a53e3cd..4e6b770 100755 --- a/initscripts/pl_netinit +++ b/initscripts/pl_netinit @@ -129,12 +129,12 @@ find_node_config() shopt -s nullglob for device in /sys/block/[hs]d*; do - removable=`cat $device/removable` + removable=$(cat $device/removable) if [[ $removable -ne 1 ]]; then continue fi - partitions=$(/bin/awk "\$4 ~ /`basename $device`[0-9]*/ { print \$4 }" /proc/partitions) + partitions=$(/bin/awk "\$4 ~ /$(basename $device)[0-9]*/ { print \$4 }" /proc/partitions) for partition in $partitions ; do check_dev=/dev/$partition @@ -256,7 +256,7 @@ if [[ -n "$NET_DEVICE" ]]; then pushd /sys/class/net for device in *; do - dev_address=`cat $device/address | tr A-Z a-z` + dev_address=$(cat $device/address | tr A-Z a-z) if [ "$device" == "$NET_DEVICE" -o "$dev_address" == "$NET_DEVICE" ]; then ETH_DEVICE=$device echo $(date "+%H:%M:%S") " pl_netinit: found device $ETH_DEVICE with mac address $dev_address" -- 2.43.0