View | Details | Raw Unified | Return to bug 38146
Collapse All | Expand All

(-)/home/keremet/evms-2.5.5/plugins/dos/bsd.c (-1 / +6 lines)
Lines 205-221 Link Here
205
                }
205
                }
206
206
207
                if (rc) break;
207
                if (rc) break;
208
208
209
                ++ptable_index;
209
                ++ptable_index;
210
        }
210
        }
211
211
212
        if (rc) {
212
        if (rc) {
213
                LOG_ERROR("error, problems adding solaris partitions for disk %s.", ld->name );
213
                LOG_ERROR("error, problems adding bsd partitions for disk %s.", ld->name );
214
                DISKSEG *rm_seg;
215
                list_element_t iter;
216
                LIST_FOR_EACH( recovery_list, iter, rm_seg ) {
217
                        remove_diskseg_from_list( ld->parent_objects, rm_seg );
218
                }
214
                remove_embedded_partitions_from_disk( recovery_list );
219
                remove_embedded_partitions_from_disk( recovery_list );
215
                insert_diskseg_into_list( ld->parent_objects, seg);
220
                insert_diskseg_into_list( ld->parent_objects, seg);
216
                MESSAGE(_("Abandoning effort with embedded bsd partitions found in %s\n"), seg->name);
221
                MESSAGE(_("Abandoning effort with embedded bsd partitions found in %s\n"), seg->name);
217
                rc = 0;
222
                rc = 0;
218
        }
223
        }
219
        else {
224
        else {
220
225
221
                // if we produced -ANY- bsd segments ... then consume the container segment
226
                // if we produced -ANY- bsd segments ... then consume the container segment

Return to bug 38146