diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-13 16:12:16 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-13 16:12:16 +0100 |
| commit | b92a0c9480d044e22946d7a92bb21ea9dcd426f6 (patch) | |
| tree | 2796a6ccc0b6f7e148943c5e6b577e88d810e2e5 | |
| parent | 4c68fee9372ff56ce70b26ca107d98fe4f7ce5d3 (diff) | |
output phases good this time
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 35828a0..87a2d2f 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -385,7 +385,7 @@ process_filesystems () # re-order list so that we umount in the correct order. eg first umount /a/b/c, then /a/b. we sort alphabetically, which has the side-effect of sorting by stringlength, hence by vfs dependencies. # TODO: this is not entirely correct: what if something is mounted in a previous run that is now not anymore in $TMP_BLOCKDEVICES ? that needs to be cleaned up too. - infofy "Phase 1: Umounting all needed mountpoints" + infofy "Phase 1: Umounting all needed mountpoints" disks sort -t \ -k 6 $TMP_FILESYSTEMS | tac | while read part part_type part_label fs_type fs_create fs_mountpoint fs_mount fs_opts fs_label fs_params do if [ "$fs_type" = swap ] @@ -436,7 +436,7 @@ process_filesystems () # Approach 2 : iterate over all targets in $TMP_BLOCKDEVICES as much as needed, until a certain limit, and in each loop check what can be cleared by looking at the real, live usage of / dependencies on the partition. # the advantage of approach 2 over 1 is that 1) it's easier. 2) it's better, because the live environment can be different then what's described in $TMP_BLOCKDEVICES anyway. - infofy "Phase 2: destructing blockdevices" + infofy "Phase 2: destructing blockdevices" disks for i in `seq 1 10` do open_items=0 @@ -516,7 +516,7 @@ process_filesystems () # phase 3: create all blockdevices and filesystems in the correct order (for each fs, the underlying block/lvm/devicemapper device must be available so dependencies must be resolved. for lvm:first pv's, then vg's, then lv's etc) # don't let them mount yet. we take care of all that ourselves in the next phase - infofy "Phase 3: Creating blockdevices" + infofy "Phase 3: Creating blockdevices" disks done_filesystems= for i in `seq 1 10` do @@ -561,7 +561,7 @@ process_filesystems () # phase 4: mount all filesystems in the vfs in the correct order. (also swapon where appropriate) - infofy "Phase 4: Mounting filesystems" + infofy "Phase 4: Mounting filesystems" disks sort -t \ -k 6 $TMP_FILESYSTEMS | while read part part_type part_label fs_type fs_create fs_mountpoint fs_mount fs_opts fs_label fs_params do if [ "$fs_mountpoint" != no_mountpoint ] |