Changeset 3741


Ignore:
Timestamp:
Nov 18, 2019, 2:48:58 AM (9 months ago)
Author:
Bruno Cornec
Message:

Call the btrfs subvol functions after mounting the base FS

Location:
branches/3.3/mondo/src/mondorestore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/mondo/src/mondorestore/mondo-prep.c

    r3739 r3741  
    795795log_to_screen(tmp);
    796796mr_free(tmp);
    797 
    798 /*  BR#852: we need to create BTRFS subvols now */
    799 if ((! res) && (strcmp(format, "btrfs") == 0)) {
    800     /*  Creating potential btrfs subvolumes */
    801     if (does_file_exist("/tmp/create-btrfs-subvol")) {
    802         run_program_and_log_output("/tmp/create-btrfs-subvol",3);
    803     }
    804     /*  Mounting potential btrfs subvolumes */
    805     if (does_file_exist("/tmp/mount-btrfs-subvol")) {
    806         run_program_and_log_output("/tmp/mount-btrfs-subvol",3);
    807     }
    808 }
    809797
    810798/*  BR#836: we need to do it a second time if -m wasn't working in that version for XFS */
  • branches/3.3/mondo/src/mondorestore/mondorestore.c

    r3658 r3741  
    19741974        goto end_of_func;
    19751975    }
     1976    /*  BR#852: we need to create BTRFS subvols now */
     1977    /*  Creating potential btrfs subvolumes */
     1978    if (does_file_exist("/tmp/create-btrfs-subvol")) {
     1979        run_program_and_log_output("/tmp/create-btrfs-subvol",3);
     1980    }
     1981    /*  Mounting potential btrfs subvolumes */
     1982    if (does_file_exist("/tmp/mount-btrfs-subvol")) {
     1983        run_program_and_log_output("/tmp/mount-btrfs-subvol",3);
     1984    }
     1985
    19761986    /* restore */
    19771987    if ((restore_all = ask_me_yes_or_no("Do you want me to restore all of your data?"))) {
Note: See TracChangeset for help on using the changeset viewer.