Module Name: src
Committed By: christos
Date: Mon Dec 27 03:38:53 UTC 2010
Modified Files:
src/etc: Makefile daily monthly security shrc weekly
src/etc/etc.sgimips: Makefile.inc
src/etc/root: dot.profile
Log Message:
`` -> $()
To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 src/etc/Makefile
cvs rdiff -u -r1.76 -r1.77 src/etc/daily
cvs rdiff -u -r1.11 -r1.12 src/etc/monthly
cvs rdiff -u -r1.108 -r1.109 src/etc/security
cvs rdiff -u -r1.6 -r1.7 src/etc/shrc
cvs rdiff -u -r1.23 -r1.24 src/etc/weekly
cvs rdiff -u -r1.20 -r1.21 src/etc/etc.sgimips/Makefile.inc
cvs rdiff -u -r1.23 -r1.24 src/etc/root/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.383 src/etc/Makefile:1.384
--- src/etc/Makefile:1.383 Wed Dec 8 18:56:01 2010
+++ src/etc/Makefile Sun Dec 26 22:38:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.383 2010/12/08 23:56:01 njoly Exp $
+# $NetBSD: Makefile,v 1.384 2010/12/27 03:38:52 christos Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -560,7 +560,7 @@
.for configfile in ${KERNEL_SETS} # {
build_kernelsets: kernset-${configfile}
kernset-${configfile}: .PHONY build_kernels snap_pre
- @ kernlist=`${GETKERNELAWK} ${KERNCONFDIR}/${configfile}`; \
+ @ kernlist=$$(${GETKERNELAWK} ${KERNCONFDIR}/${configfile}); \
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
@@ -594,7 +594,7 @@
.for configfile in ${KERNEL_SETS} ${EXTRA_KERNELS} # {
build_releasekernels: releasekern-${configfile}
releasekern-${configfile}: .PHONY build_kernels snap_pre
- @ kernlist=`${GETKERNELAWK} ${KERNCONFDIR}/${configfile:C/.*\///}`; \
+ @ kernlist=$$(${GETKERNELAWK} ${KERNCONFDIR}/${configfile:C/.*\///}); \
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
cd $${kerndir} && { \
Index: src/etc/daily
diff -u src/etc/daily:1.76 src/etc/daily:1.77
--- src/etc/daily:1.76 Fri Feb 5 11:29:02 2010
+++ src/etc/daily Sun Dec 26 22:38:52 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: daily,v 1.76 2010/02/05 16:29:02 jmmv Exp $
+# $NetBSD: daily,v 1.77 2010/12/27 03:38:52 christos Exp $
# @(#)daily 8.2 (Berkeley) 1/25/94
#
@@ -11,8 +11,8 @@
. /etc/daily.conf
fi
-host=`hostname`
-date=`date`
+host="$(hostname)"
+date="$(date)"
rcvar_manpage='daily.conf(5)'
echo "To: ${MAILTO:-root}"
@@ -37,7 +37,7 @@
fi
echo ""
-echo "Uptime: " `uptime`
+echo "Uptime: $(uptime)"
# Uncommenting any of the finds below would open up a race condition attack
# based on symlinks, potentially allowing removal of any file on the system.
@@ -86,9 +86,9 @@
if checkyesno find_core; then
# Turn "foo !bar bax" into "-fstype foo -o ! -fstype bar -o -fstype bax"
- ignfstypes=`echo $find_core_ignore_fstypes | \
+ ignfstypes="$(echo $find_core_ignore_fstypes | \
sed -e's/\(!*\)\([^[:space:]]\{1,\}\)/-o \1 -fstype \2/g' \
- -e's/^-o //'`
+ -e's/^-o //')"
find / \( $ignfstypes \) -prune -o \
-name 'lost+found' -prune -o \
\( -name '*.core' -o -name 'core' \) -type f -print > $TMP
@@ -176,7 +176,7 @@
fi
rm -f $TMP $TMP2
touch $TMP2
- for dev in `iostat -x | awk '/^raid/ { print $1 }'`; do
+ for dev in $(iostat -x | awk '/^raid/ { print $1 }'); do
raidctl -s $dev | awk '/^.*: failed$/ {print $0}' > $TMP
if [ -s $TMP ]; then
echo "$dev:" >> $TMP2
@@ -241,7 +241,7 @@
if checkyesno run_rdist && [ -f /etc/Distfile ]; then
echo "Running rdist:"
if [ -d /var/log/rdist ]; then
- logf=`date +%Y.%b.%d`
+ logf="$(date +%Y.%b.%d)"
rdist -f /etc/Distfile 2>&1 | tee /var/log/rdist/$logf
else
rdist -f /etc/Distfile
Index: src/etc/monthly
diff -u src/etc/monthly:1.11 src/etc/monthly:1.12
--- src/etc/monthly:1.11 Wed Jun 6 09:30:47 2007
+++ src/etc/monthly Sun Dec 26 22:38:52 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: monthly,v 1.11 2007/06/06 13:30:47 martti Exp $
+# $NetBSD: monthly,v 1.12 2010/12/27 03:38:52 christos Exp $
# from: @(#)monthly 8.1 (Berkeley) 6/9/93
#
@@ -11,8 +11,8 @@
. /etc/monthly.conf
fi
-host=`hostname`
-date=`date`
+host="$(hostname)"
+date="$(date)"
rcvar_manpage='monthly.conf(5)'
echo "To: ${MAILTO:-root}"
Index: src/etc/security
diff -u src/etc/security:1.108 src/etc/security:1.109
--- src/etc/security:1.108 Fri Feb 5 11:29:02 2010
+++ src/etc/security Sun Dec 26 22:38:52 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: security,v 1.108 2010/02/05 16:29:02 jmmv Exp $
+# $NetBSD: security,v 1.109 2010/12/27 03:38:52 christos Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@@ -408,8 +408,8 @@
unset PATH
/bin/sh << end-of-sh > /dev/null 2>&1
. $i
- list=\`echo \$PATH | /usr/bin/sed -e \
- 's/^:/.:/;s/:$/:./;s/::/:.:/g;s/:/ /g'\`
+ list=\$\(echo \$PATH | /usr/bin/sed -e \
+ 's/^:/.:/;s/:$/:./;s/::/:.:/g;s/:/ /g'\)
/bin/ls -ldgT \$list > $TMP1
end-of-sh
export PATH=$SAVE_PATH
@@ -441,7 +441,7 @@
# Root and uucp should both be in /etc/ftpusers.
#
if checkyesno check_ftpusers; then
- list="uucp "`awk '$2 == 0 { print $1 }' $MPBYUID`
+ list="uucp "$(awk '$2 == 0 { print $1 }' $MPBYUID)
for i in $list; do
if /usr/libexec/ftpd -C $i ; then
printf "\t$i is not denied\n"
@@ -481,7 +481,7 @@
sort -k2 |
while read uid homedir; do
if [ -f ${homedir}/.rhosts ] ; then
- rhost=`ls -ldgT ${homedir}/.rhosts`
+ rhost=$(ls -ldgT ${homedir}/.rhosts)
printf -- "$uid: $rhost\n"
fi
done > $OUTPUT
@@ -510,7 +510,7 @@
permit_usergroups=1 || permit_usergroups=0
while read uid homedir; do
if [ -d ${homedir}/ ] ; then
- file=`ls -ldgT ${homedir}`
+ file=$(ls -ldgT ${homedir})
printf -- "$uid $file\n"
fi
done < $MPBYPATH |
@@ -533,7 +533,7 @@
for f in $list ; do
file=${homedir}/${f}
if [ -f $file ] ; then
- printf -- "$uid $f `ls -ldgT $file`\n"
+ printf -- "$uid $f $(ls -ldgT $file)\n"
fi
done
done < $MPBYPATH |
@@ -562,7 +562,7 @@
for f in $list ; do
file=${homedir}/${f}
if [ -f $file ] ; then
- printf -- "$uid $f `ls -ldgT $file`\n"
+ printf -- "$uid $f $(ls -ldgT $file)\n"
fi
done
done < $MPBYPATH |
@@ -849,7 +849,7 @@
for file in /etc/mtree/*.secure; do
[ $file = '/etc/mtree/*.secure' ] && continue
- tree=`sed -n -e '3s/.* //p' -e 3q $file`
+ tree=$(sed -n -e '3s/.* //p' -e 3q $file)
mtree $check_mtree_flags -f $file -p $tree > $TMP1
if [ -s $TMP1 ]; then
printf "\nChecking $tree:\n"
@@ -866,8 +866,8 @@
#
if checkyesno check_disklabels; then
# migrate old disklabels
- for file in `ls -1d $backup_dir/$backup_dir/disklabel.* \
- $backup_dir/disklabel.* 2>/dev/null`; do
+ for file in $(ls -1d $backup_dir/$backup_dir/disklabel.* \
+ $backup_dir/disklabel.* 2>/dev/null); do
migrate_file "$file" "$work_dir/${file##*/}"
done
@@ -877,14 +877,14 @@
xargs rm < $LABELS
# generate disklabels of all disks excluding: cd dk fd md st
- disks=`iostat -x | awk 'NR > 1 && $1 !~ /^[cfm]d|dk|st|nfs/ { print $1; }'`
+ disks=$(iostat -x | awk 'NR > 1 && $1 !~ /^[cfm]d|dk|st|nfs/ { print $1; }')
for i in $disks; do
disklabel $i > "$work_dir/disklabel.$i" 2>/dev/null
done
# if fdisk is available, generate fdisks for: ed ld sd wd
if [ -x /sbin/fdisk ]; then
- disks=`iostat -x| awk 'NR > 1 && $1 ~ /^[elsw]d/ { print $1; }'`
+ disks=$(iostat -x | awk 'NR > 1 && $1 ~ /^[elsw]d/ { print $1; }')
for i in $disks; do
/sbin/fdisk $i > "$work_dir/fdisk.$i" 2>/dev/null
done
@@ -892,7 +892,7 @@
# if dkctl is available, generate dkctl listwedges for: ed ld sd wd cgd ofdisk ra rl raid
if [ -x /sbin/dkctl ]; then
- disks=`iostat -x| awk 'NR > 1 && $1 ~ /^[elsw]d|cgd|ofdisk|r[al]|raid/ { print $1; }'`
+ disks=$(iostat -x | awk 'NR > 1 && $1 ~ /^[elsw]d|cgd|ofdisk|r[al]|raid/ { print $1; }')
for i in $disks; do
/sbin/dkctl $i listwedges > "$work_dir/wedges.$i" 2>/dev/null
done
Index: src/etc/shrc
diff -u src/etc/shrc:1.6 src/etc/shrc:1.7
--- src/etc/shrc:1.6 Mon May 3 13:15:58 2010
+++ src/etc/shrc Sun Dec 26 22:38:52 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shrc,v 1.6 2010/05/03 17:15:58 hubertf Exp $
+# $NetBSD: shrc,v 1.7 2010/12/27 03:38:52 christos Exp $
#
# System-wide .shrc file for sh(1).
@@ -6,7 +6,7 @@
case "$-" in *i*)
if /bin/test -z "${HOST}"; then
- HOST=`hostname`
+ HOST="$(hostname)"
fi
PS1="${HOST%%.*}$PS1"
set -o emacs
Index: src/etc/weekly
diff -u src/etc/weekly:1.23 src/etc/weekly:1.24
--- src/etc/weekly:1.23 Wed Jun 6 09:30:48 2007
+++ src/etc/weekly Sun Dec 26 22:38:52 2010
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: weekly,v 1.23 2007/06/06 13:30:48 martti Exp $
+# $NetBSD: weekly,v 1.24 2010/12/27 03:38:52 christos Exp $
# from: @(#)weekly 8.2 (Berkeley) 1/2/94
#
@@ -11,8 +11,8 @@
. /etc/weekly.conf
fi
-host=`hostname`
-date=`date`
+host="$(hostname)"
+date="$(date)"
rcvar_manpage='weekly.conf(5)'
echo "To: ${MAILTO:-root}"
@@ -45,20 +45,20 @@
# before looking there for checked-out files
#if [ -d /usr/src -a \
-# -n "`find -f /usr/src ! -fstype local -prune -or -type d -print -prune`" ];
+# -n "$(find -f /usr/src ! -fstype local -prune -or -type d -print -prune)" ];
#then
# echo ""
# echo "Looking for checked out files:"
#
# TDIR=$(mktemp -d -t _checkout) || exit 1
# trap "/bin/rm -rf $TDIR ; exit 0" EXIT INT QUIT
-# for file in `find -f /usr/src ! -fstype local -prune -or \
-# -name 'p.*' -print | egrep 'SCCS/p\.'`; do
-# owner=`awk '{ print $3 }' $file`
+# for file in $(find -f /usr/src ! -fstype local -prune -or \
+# -name 'p.*' -print | egrep 'SCCS/p\.'); do
+# owner=$(awk '{ print $3 }' $file)
# echo "$owner $file"
# echo $file >> "$TDIR/$owner"
# done | sed -e 's,SCCS/p.,,'
-# if test -n "`ls $TDIR`"; then
+# if test -n "$(ls $TDIR)"; then
# for file in $TDIR/*; do
# sed -e 's,SCCS/p.,,' $file | \
# Mail -s 'checked out files' ${file##*/}
Index: src/etc/etc.sgimips/Makefile.inc
diff -u src/etc/etc.sgimips/Makefile.inc:1.20 src/etc/etc.sgimips/Makefile.inc:1.21
--- src/etc/etc.sgimips/Makefile.inc:1.20 Fri Aug 27 07:02:55 2010
+++ src/etc/etc.sgimips/Makefile.inc Sun Dec 26 22:38:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2010/08/27 11:02:55 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.21 2010/12/27 03:38:53 christos Exp $
#
# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
#
@@ -34,12 +34,12 @@
SGI.image= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-sgimips.img
iso-image-md-post:
- @SEEK=`${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
- ${DESTDIR}/usr/include/sys/bootblock.h` ; \
- EST=`ls -l ${CDROM.image} \
+ @SEEK=$$(${TOOL_AWK} '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
+ ${DESTDIR}/usr/include/sys/bootblock.h) ; \
+ EST=$$(ls -l ${CDROM.image} \
| ${TOOL_AWK} '{ s += $$5 } \
END { print int(('$${SEEK}'*512+s)/1024/1024/32+1)*32 \
- }'` ; \
+ }') ; \
echo "Estimated image size: $${EST} MB"; \
dd if=/dev/zero of=${SGI.image} bs=1024k count=$${EST}; \
${TOOLDIR}/bin/nbsgivol -f -i ${SGI.image}; \
Index: src/etc/root/dot.profile
diff -u src/etc/root/dot.profile:1.23 src/etc/root/dot.profile:1.24
--- src/etc/root/dot.profile:1.23 Wed Aug 26 07:15:25 2009
+++ src/etc/root/dot.profile Sun Dec 26 22:38:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.23 2009/08/26 11:15:25 tsutsui Exp $
+# $NetBSD: dot.profile,v 1.24 2010/12/27 03:38:53 christos Exp $
export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin
export PATH=${PATH}:/usr/X11R7/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin
@@ -13,7 +13,7 @@
export HOST="$(hostname)"
if [ -x /usr/bin/tset ]; then
- eval `tset -sQrm 'unknown:?unknown'`
+ eval $(tset -sQrm 'unknown:?unknown')
fi
umask 022
