src/etc/daily - diff

Return to daily CVS log

Up to [local] / src / etc

Diff for /src/etc/daily between version 1.63 and 1.64

-version 1.63, 2009/05/21 01:27:52
+version 1.64, 2009/05/24 21:58:06
 Line 90
 Line 90
 Line 90
  # if filesystem named /altroot is type ffs, on /dev/* and mounted "xx",
  # use it as a backup root filesystem to be updated daily.
  next_part "Backing up root filesystem:"
- [ "X$ROOTBACKUP" = X1 ] && {
+ while [ "X$ROOTBACKUP" = X1 ]; do
-         rootdev=`df -n / | awk '/^\/dev\// { print substr($1, 6) }'`
          rootbak=`awk '$2 == "/altroot" && $1 ~ /^\/dev\// && $3 == "ffs" && \
              $4 ~ /xx/ \
                  { print substr($1, 6) }' < /etc/fstab`
-         [ X$rootdev != X -a X$rootbak != X -a X$rootdev != X$rootbak ] && \
+         if [ -z "$rootbak" ]; then
-             sysctl -n hw.disknames | grep -Fqw ${rootbak%[a-p]} && {
+                 echo "No xx ffs /altroot device found in the fstab(5)."
-                 next_part "Backing up root=/dev/r$rootdev to /dev/r$rootbak:"
+                 break
-                 sync
+         fi
-                 dd if=/dev/r$rootdev of=/dev/r$rootbak bs=16b seek=1 skip=1 \
+         bakdisk=${rootbak%[a-p]}
-                         conv=noerror
+         sysctl -n hw.disknames | grep -Fqw $bakdisk || break
-                 fsck -y /dev/r$rootbak
+         bakpart=${rootbak#$bakdisk}
-         }
+         baksize=`disklabel $bakdisk 2>/dev/null | \
- }
+                 awk -v "part=$bakpart:" '$1 == part { print $2 }'`
+         rootdev=`mount | awk '$3 == "/" && $1 ~ /^\/dev\// && $5 == "ffs" \
+                 { print substr($1, 6) }'`
+         if [ -z "$rootdev" ]; then
+                 echo "The root filesystem is not local or not ffs."
+                 break
+         fi
+         if [ X$rootdev = X$rootbak ]; then
+                 echo "The device $rootdev holds both root and /altroot."
+                 break
+         fi
+         rootdisk=${rootdev%[a-p]}
+         rootpart=${rootdev#$rootdisk}
+         rootsize=`disklabel $rootdisk 2>/dev/null | \
+                 awk -v "part=$rootpart:" '$1 == part { print $2 }'`
+         if [ $rootsize -gt $baksize ]; then
+                 echo "Root ($rootsize) is larger than /altroot ($baksize)."
+                 break
+         fi
+         next_part "Backing up root=/dev/r$rootdev to /dev/r$rootbak:"
+         sync
+         dd if=/dev/r$rootdev of=/dev/r$rootbak bs=16b seek=1 skip=1 \
+                 conv=noerror
+         fsck -y /dev/r$rootbak
+         break
+ done
  next_part "Checking subsystem status:"
  if [ "X$VERBOSESTATUS" != X0 ]; then