← Back to branch summary

~mdz/ubuntu/lucid/mountall/bug-557177

« back to all changes in this revision

Viewing changes to src/mountall.c

  • Committer: Scott James Remnant
  • Date: 2010-03-31 16:10:23 UTC
  • Revision ID: scott@netsplit.com-20100331161023-m9cqfapl6myt1bsn
Only skip boredom when plymouth isn't available

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mountall.c
2788
2788
                NIH_LIST_FOREACH (mounts, iter) {
2789
2789
                        Mount *mnt = (Mount *)iter;
2790
2790
 
2791
 
                        if (mnt->error != ERROR_NONE) {
 
2791
                        if (mnt->error == ERROR_BORED) {
 
2792
                                nih_error (_("Skipping mounting %s since Plymouth is not available"),
 
2793
                                           MOUNT_NAME (mnt));
 
2794
 
 
2795
                                skip_mount (mnt);
 
2796
 
 
2797
                                mnt->error = ERROR_NONE;
 
2798
                        } else if (mnt->error != ERROR_NONE) {
2792
2799
                                nih_error (_("Spawning maintenance shell since Plymouth is not available"));
2793
2800
 
2794
2801
                                if ((mnt->error != ERROR_MOUNT_FAILED)