[BACK]Return to security CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / etc

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/etc/security between version 1.100.2.2 and 1.100.2.3

version 1.100.2.2, 2007/06/06 14:58:14 version 1.100.2.3, 2007/08/24 16:32:01
Line 849  if checkyesno check_disklabels; then
Line 849  if checkyesno check_disklabels; then
                 migrate_file "$file" "$work_dir/${file##*/}"                  migrate_file "$file" "$work_dir/${file##*/}"
         done          done
   
                 # generate list of old disklabels & fdisks and remove them                  # generate list of old disklabels, fdisks & wedges and remove them
         ls -1d $work_dir/disklabel.* $work_dir/fdisk.* 2>/dev/null |          ls -1d $work_dir/disklabel.* $work_dir/fdisk.* $work_dir/wedges.* 2>/dev/null |
             egrep -v '\.(backup|current)(,v)?$' > $LABELS              egrep -v '\.(backup|current)(,v)?$' > $LABELS
         xargs rm < $LABELS          xargs rm < $LABELS
   
                 # generate disklabels of all disks excluding:   cd fd md st                  # generate disklabels of all disks excluding:   cd dk fd md st
         disks=`iostat -x | awk 'NR > 1 && $1 !~ /^[cfm]d|st|nfs/ { print $1; }'`          disks=`iostat -x | awk 'NR > 1 && $1 !~ /^[cfm]d|dk|st|nfs/ { print $1; }'`
         for i in $disks; do          for i in $disks; do
                 disklabel $i > "$work_dir/disklabel.$i" 2>/dev/null                  disklabel $i > "$work_dir/disklabel.$i" 2>/dev/null
         done          done
Line 868  if checkyesno check_disklabels; then
Line 868  if checkyesno check_disklabels; then
                 done                  done
         fi          fi
   
                 # append list of new disklabels and fdisks                  # if dkctl is available, generate dkctl listwedges for: ed ld sd wd cgd ofdisk ra rl raid
         ls -1d $work_dir/disklabel.* $work_dir/fdisk.* 2>/dev/null |          if [ -x /sbin/dkctl ]; then
                   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
           fi
   
                   # append list of new disklabels, fdisks and wedges
           ls -1d $work_dir/disklabel.* $work_dir/fdisk.* $work_dir/wedges.* 2>/dev/null |
             egrep -v '\.(backup|current)(,v)?$' >> $LABELS              egrep -v '\.(backup|current)(,v)?$' >> $LABELS
         CHANGELIST="$LABELS $CHANGELIST"          CHANGELIST="$LABELS $CHANGELIST"
 fi  fi

Legend:
Removed from v.1.100.2.2  
changed lines
  Added in v.1.100.2.3

CVSweb <webmaster@jp.NetBSD.org>