← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mountall/lucid-proposed

« back to all changes in this revision

Viewing changes to src/mountall.c

  • Committer: Scott James Remnant
  • Date: 2010-04-26 06:09:32 UTC
  • Revision ID: scott@netsplit.com-20100426060932-8cfeyn801d3a7p52
mnt->error can never be 'fsck in progress'

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mountall.c
3039
3039
        case 'F':
3040
3040
                if (mnt->error != ERROR_FSCK_FAILED)
3041
3041
                        break;
 
3042
                if (plymouth_error == ERROR_FSCK_IN_PROGRESS)
 
3043
                        break;
3042
3044
 
3043
3045
                mnt->error = ERROR_NONE;
3044
3046
                plymouth_update (FALSE);
3054
3056
                if ((mnt->error != ERROR_FSCK_FAILED)
3055
3057
                    && (mnt->error != ERROR_FSCK_FAILED_HARD))
3056
3058
                        break;
 
3059
                if (plymouth_error == ERROR_FSCK_IN_PROGRESS)
 
3060
                        break;
3057
3061
 
3058
3062
                mnt->error = ERROR_NONE;
3059
3063
                plymouth_update (FALSE);
3066
3070
                break;
3067
3071
        case 's':
3068
3072
        case 'S':
3069
 
                if (mnt->error == ERROR_FSCK_IN_PROGRESS)
 
3073
                if (plymouth_error == ERROR_FSCK_IN_PROGRESS)
3070
3074
                        break;
3071
3075
 
3072
3076
                mnt->error = ERROR_NONE;
3079
3083
                break;
3080
3084
        case 'm':
3081
3085
        case 'M':
3082
 
                if (mnt->error == ERROR_FSCK_IN_PROGRESS)
 
3086
                if (plymouth_error == ERROR_FSCK_IN_PROGRESS)
3083
3087
                        break;
3084
3088
 
3085
3089
                mnt->error = ERROR_NONE;
3113
3117
                        if ((mnt->fsck_pid > 0)
3114
3118
                            && (mnt->fsck_progress >= 0))
3115
3119
                                kill (mnt->fsck_pid, SIGTERM);
3116
 
                        if (mnt->error == ERROR_FSCK_IN_PROGRESS)
3117
 
                                mnt->error = ERROR_NONE;
3118
3120
                }
3119
3121
                break;
3120
3122
        default: