Changeset 1158 in MondoRescue for branches/stable/mondo/src


Ignore:
Timestamp:
Feb 14, 2007, 2:32:50 AM (19 years ago)
Author:
Bruno Cornec
Message:

WARNING: Interface change for mondo-restore.cfg: the delimiter between the variable name and its value is now a = (was a ' ')
This change will allow the introduction of the new mr_conf functions

Location:
branches/stable/mondo/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mondo/src/common/libmondo-archive.c

    r1155 r1158  
    794794    mr_fprintf(fd, "mindi_use_own_kernel=yes\n");
    795795
    796     mr_fprintf(fd1, "files-in-filelist %ld\n", lines_in_filelist);
    797     mr_fprintf(fd1, "internal-tape-block-size %ld\n", bkpinfo->internal_tape_block_size);
    798     mr_fprintf(fd1, "total-slices %ld\n", estimated_total_noof_slices);
    799     mr_fprintf(fd1, "excluded-devs %s\n", devs_to_exclude);
    800     mr_fprintf(fd1, "image-devs %s\n", bkpinfo->image_devs);
    801     mr_fprintf(fd1, "last-filelist-number %s\n", last_filelist_number);
    802     mr_fprintf(fd1, "bootloader.name %s\n", bootldr_str);
    803     mr_fprintf(fd1, "bootloader.device %s\n", bkpinfo->boot_device);
     796    mr_fprintf(fd1, "files-in-filelist=%ld\n", lines_in_filelist);
     797    mr_fprintf(fd1, "internal-tape-block-size=%ld\n", bkpinfo->internal_tape_block_size);
     798    mr_fprintf(fd1, "total-slices=%ld\n", estimated_total_noof_slices);
     799    mr_fprintf(fd1, "excluded-devs=%s\n", devs_to_exclude);
     800    mr_fprintf(fd1, "image-devs=%s\n", bkpinfo->image_devs);
     801    mr_fprintf(fd1, "last-filelist-number=%s\n", last_filelist_number);
     802    mr_fprintf(fd1, "bootloader.name=%s\n", bootldr_str);
     803    mr_fprintf(fd1, "bootloader.device=%s\n", bkpinfo->boot_device);
    804804
    805805    switch (bkpinfo->backup_media_type) {
    806806    case cdr:
    807         mr_fprintf(fd1, "backup-media-type cdr\n");
     807        mr_fprintf(fd1, "backup-media-type=cdr\n");
    808808        break;
    809809    case cdrw:
    810         mr_fprintf(fd1, "backup-media-type cdrw\n");
     810        mr_fprintf(fd1, "backup-media-type=cdrw\n");
    811811        break;
    812812    case cdstream:
    813         mr_fprintf(fd1, "backup-media-type cdstream\n");
     813        mr_fprintf(fd1, "backup-media-type=cdstream\n");
    814814        break;
    815815    case tape:
    816         mr_fprintf(fd1, "backup-media-type tape\n");
     816        mr_fprintf(fd1, "backup-media-type=tape\n");
    817817        break;
    818818    case udev:
    819         mr_fprintf(fd1, "backup-media-type udev\n");
     819        mr_fprintf(fd1, "backup-media-type=udev\n");
    820820        break;
    821821    case iso:
    822         mr_fprintf(fd1, "backup-media-type iso\n");
     822        mr_fprintf(fd1, "backup-media-type=iso\n");
    823823        break;
    824824    case nfs:
    825         mr_fprintf(fd1, "backup-media-type nfs\n");
     825        mr_fprintf(fd1, "backup-media-type=nfs\n");
    826826        break;
    827827    case dvd:
    828         mr_fprintf(fd1, "backup-media-type dvd\n");
     828        mr_fprintf(fd1, "backup-media-type=dvd\n");
    829829        break;
    830830    case usb:
    831         mr_fprintf(fd1, "backup-media-type usb\n");
     831        mr_fprintf(fd1, "backup-media-type=usb\n");
    832832        break;
    833833    default:
    … …  
    842842        mr_fprintf(fd, "mindi_write_tape=yes\n");
    843843        mr_fprintf(fd, "mindi_tape_device=%s\n", bkpinfo->media_device);
    844         mr_fprintf(fd1, "media-dev %s\n", bkpinfo->media_device);
    845         mr_fprintf(fd1, "media-size %ld\n", bkpinfo->media_size[1]);
     844        mr_fprintf(fd1, "media-dev=%s\n", bkpinfo->media_device);
     845        mr_fprintf(fd1, "media-size=%ld\n", bkpinfo->media_size[1]);
    846846    }
    847847    if (bkpinfo->compression_level > 0) {
    848         mr_fprintf(fd1, "use-comp yes\n");
    849     } else {
    850         mr_fprintf(fd1, "use-comp no\n");
     848        mr_fprintf(fd1, "use-comp=yes\n");
     849    } else {
     850        mr_fprintf(fd1, "use-comp=no\n");
    851851    }
    852852    if (bkpinfo->use_gzip) {
    853         mr_fprintf(fd1, "use-gzip yes\n");
    854     } else {
    855         mr_fprintf(fd1, "use-gzip no\n");
     853        mr_fprintf(fd1, "use-gzip=yes\n");
     854    } else {
     855        mr_fprintf(fd1, "use-gzip=no\n");
    856856    }
    857857    if (bkpinfo->use_lzo) {
    858         mr_fprintf(fd1, "use-lzo yes\n");
    859     } else {
    860         mr_fprintf(fd1, "use-lzo no\n");
     858        mr_fprintf(fd1, "use-lzo=yes\n");
     859    } else {
     860        mr_fprintf(fd1, "use-lzo=no\n");
    861861    }
    862862    if (bkpinfo->use_star) {
    863         mr_fprintf(fd1, "use-star yes\n");
    864     } else {
    865         mr_fprintf(fd1, "use-star no\n");
     863        mr_fprintf(fd1, "use-star=yes\n");
     864    } else {
     865        mr_fprintf(fd1, "use-star=no\n");
    866866    }
    867867    if (g_getfattr) {
    868         mr_fprintf(fd1, "xattr yes\n");
    869     } else {
    870         mr_fprintf(fd1, "xattr no\n");
     868        mr_fprintf(fd1, "xattr=yes\n");
     869    } else {
     870        mr_fprintf(fd1, "xattr=no\n");
    871871    }
    872872    if (g_getfacl) {
    873         mr_fprintf(fd1, "acl yes\n");
    874     } else {
    875         mr_fprintf(fd1, "acl no\n");
     873        mr_fprintf(fd1, "acl=yes\n");
     874    } else {
     875        mr_fprintf(fd1, "acl=no\n");
    876876    }
    877877
    878878    if (g_cd_recovery) {
    879         mr_fprintf(fd1, "use-cdrecovery yes\n");
    880     } else {
    881         mr_fprintf(fd1, "use-cdrecovery no\n");
     879        mr_fprintf(fd1, "use-cdrecovery=yes\n");
     880    } else {
     881        mr_fprintf(fd1, "use-cdrecovery=no\n");
    882882    }
    883883
    884884    if (bkpinfo->make_cd_use_lilo) {
    885         mr_fprintf(fd1, "use-lilo yes\n");
    886     } else {
    887         mr_fprintf(fd1, "use-lilo no\n");
     885        mr_fprintf(fd1, "use-lilo=yes\n");
     886    } else {
     887        mr_fprintf(fd1, "use-lilo=no\n");
    888888    }
    889889    if (bkpinfo->nonbootable_backup) {
    890         mr_fprintf(fd1, "non-bootable yes\n");
    891     } else {
    892         mr_fprintf(fd1, "non-bootable no\n");
     890        mr_fprintf(fd1, "non-bootable=yes\n");
     891    } else {
     892        mr_fprintf(fd1, "non-bootable=no\n");
    893893    }
    894894    if (bkpinfo->differential) {
    895         mr_fprintf(fd1, "differential 1\n");
    896     } else {
    897         mr_fprintf(fd1, "differential 0\n");
     895        mr_fprintf(fd1, "differential=1\n");
     896    } else {
     897        mr_fprintf(fd1, "differential=0\n");
    898898    }
    899899
    900900    mr_fclose(fd);
    901     mr_fprintf(fd1, "datestamp %s\n", mr_date());
     901    mr_fprintf(fd1, "datestamp=%s\n", mr_date());
    902902    mr_fclose(fd1);
    903903
    … …  
    39173917
    39183918    if ((p = getenv("PATH")) == NULL) {
    3919         mr_asprintf(&p,path_min);
    3920     }
    3921     mr_asprintf(&tmp, "%s:%s",p, path_min);
    3922     mr_free(p);
     3919        mr_asprintf(&tmp, path_min);
     3920    } else {
     3921        mr_asprintf(&tmp, "%s:%s",p, path_min);
     3922    }
    39233923    mr_setenv("PATH",tmp);
    39243924    mr_free(tmp);

  • branches/stable/mondo/src/common/libmondo-files.c

    r1153 r1158  
    11641164
    11651165    fd1 = mr_fopen(MONDORESTORECFG, "a");
    1166     mr_fprintf(fd1, "nfs-dev %s\n", nfs_dev);
    1167     mr_fprintf(fd1, "nfs-client-ipaddr %s\n", nfs_client_ipaddr);
    1168     mr_fprintf(fd1, "nfs-client-netmask %s\n", nfs_client_netmask);
    1169     mr_fprintf(fd1, "nfs-client-broadcast %s\n", nfs_client_broadcast);
    1170     mr_fprintf(fd1, "nfs-client-defgw %s\n", nfs_client_defgw);
    1171     mr_fprintf(fd1, "nfs-server-ipaddr %s\n", nfs_server_ipaddr);
    1172     mr_fprintf(fd1, "nfs-server-mount %s\n", bkpinfo->nfs_mount);
    1173     mr_fprintf(fd1, "nfs-server-path %s\n", bkpinfo->nfs_remote_dir);
    1174     mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
     1166    mr_fprintf(fd1, "nfs-dev=%s\n", nfs_dev);
     1167    mr_fprintf(fd1, "nfs-client-ipaddr=%s\n", nfs_client_ipaddr);
     1168    mr_fprintf(fd1, "nfs-client-netmask=%s\n", nfs_client_netmask);
     1169    mr_fprintf(fd1, "nfs-client-broadcast=%s\n", nfs_client_broadcast);
     1170    mr_fprintf(fd1, "nfs-client-defgw=%s\n", nfs_client_defgw);
     1171    mr_fprintf(fd1, "nfs-server-ipaddr=%s\n", nfs_server_ipaddr);
     1172    mr_fprintf(fd1, "nfs-server-mount=%s\n", bkpinfo->nfs_mount);
     1173    mr_fprintf(fd1, "nfs-server-path=%s\n", bkpinfo->nfs_remote_dir);
     1174    mr_fprintf(fd1, "iso-prefix=%s\n", bkpinfo->prefix);
    11751175    mr_fclose(fd1);
    11761176

  • branches/stable/mondo/src/common/libmondo-tools.c

    r1155 r1158  
    605605
    606606        fd1 = mr_fopen(MONDORESTORECFG, "a");
    607         mr_fprintf(fd1, "iso-dev %s\n", iso_dev);
     607        mr_fprintf(fd1, "iso-dev=%s\n", iso_dev);
    608608
    609609        sprintf(command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
    … …  
    614614
    615615        log_it("res of it = %s", iso_mnt);
    616         mr_fprintf(fd1, "iso-mnt %s\n", iso_mnt);
     616        mr_fprintf(fd1, "iso-mnt=%s\n", iso_mnt);
    617617        log_it("isomnt: %s, %d", iso_mnt, strlen(iso_mnt));
    618618
    … …  
    624624        }
    625625        log_it("isodir: %s", iso_path);
    626         mr_fprintf(fd1, "isodir %s\n", iso_path);
     626        mr_fprintf(fd1, "isodir=%s\n", iso_path);
    627627
    628628        log_it("iso-prefix: %s",  bkpinfo->prefix);
    629         mr_fprintf(fd1, "iso-prefix %s\n", bkpinfo->prefix);
     629        mr_fprintf(fd1, "iso-prefix=%s\n", bkpinfo->prefix);
    630630
    631631        mr_fclose(fd1);

  • branches/stable/mondo/src/include/my-stuff.h

    r1144 r1158  
    1717#define MONDO_CACHE "/var/cache/mondo"
    1818#define MONDORESTORECFG MONDO_CACHE"/mondo-restore.cfg"
     19/**
     20 * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
     21 */
     22#define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
     23
    1924
    2025
    … …  
    9196 */
    9297#define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"
    93 
    94 /**
    95  * The mondo-restore.cfg stub (appended to the directory where all.tar.gz was unpacked).
    96  */
    97 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"
    9898
    9999/**
Note: See TracChangeset for help on using the changeset viewer.