Changeset 3653


Ignore:
Timestamp:
Feb 23, 2017, 2:05:46 AM (9 months ago)
Author:
bruno
Message:

Stop using the word PC and use machines instead

Location:
branches/3.3
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/contrib/mkcd/setup

    r1526 r3653  
    764764#fi
    765765#LogIt ""
    766 LogIt "Log in as root and type 'mondoarchive' to backup your PC."
     766LogIt "Log in as root and type 'mondoarchive' to backup your machine"
    767767LogIt ""
    768768echo -en "Press ENTER to finish."
  • branches/3.3/mindi/README.bootparam

    r3175 r3653  
    1010denymods    List of modules to NOT load (using denymods="mod1 mod2")
    1111donteject   mondorestore will not eject the CD
    12             Useful if your PC's case has a concealed CD-ROM drive
     12            Useful if your machine's case has a concealed CD-ROM drive
    1313excludedevs Exclude those devices from restoration process
    1414            No LVM action done such as pvcreate, and no partitioning
  • branches/3.3/mindi/mindi

    r3652 r3653  
    19361936                echo -en "FYI, this is _not_ a MondoRescue CD.\n"
    19371937                if [ -e "$MINDI_LIB/memtest.img" ] ; then
    1938                     echo -en "Type 'memtest' <Enter> to test your PC's memory intensively.\nJust press <Enter> to go to the main test menu.\n"
     1938                    echo -en "Type 'memtest' <Enter> to test your machine's memory intensively.\nJust press <Enter> to go to the main test menu.\n"
    19391939                fi
    19401940            else
     
    35853585
    35863586[ -e "$MINDI_LIB/memtest.img" ] && BOOT_MEDIA_MESSAGE="$BOOT_MEDIA_MESSAGE\n\
    3587 ...Or type 'memtest' to test your PC's RAM thoroughly.\n"
     3587...Or type 'memtest' to test your machine's RAM thoroughly.\n"
    35883588
    35893589if [ _"$MONDO_SHARE" = _"" ]; then
  • branches/3.3/mindi/rootfs/etc/init.d/rcS

    r3639 r3653  
    5959
    6060GetShell() {
    61     echo -en "Type 'exit' to reboot the PC\n"
     61    echo -en "Type 'exit' to reboot the machine\n"
    6262    umount -d /mnt/cdrom 2> /dev/null
    6363    mount / -o rw,remount > /dev/null 2> /dev/null
  • branches/3.3/mondo-doc/mondoarchive.8

    r3429 r3653  
    2828[
    2929.I options
    30 ] : backup your PC
     30] : backup your machine
    3131.br
    3232.B mondoarchive \-V
     
    4040backs up a subset of your files, your entire filesystem, or even images of
    4141non-Linux filesystems to CD's, tape, ISO images or an NFS mount. In the event of
    42 catastrophic data loss, you will be able to restore everything, taking a PC from
    43 bare metal to its original state if necessary.
     42catastrophic data loss, you will be able to restore everything, taking a
     43machine from bare metal to its original state if necessary.
    4444
    4545.PP
     
    455455
    456456.BI DVD:
    457 Backup PC using DVD Media:
     457Backup machine using DVD Media:
    458458.br
    459459.I "mondoarchive -OVr -d /dev/scd0 -gF -s 4480m"
     
    506506
    507507.BI RAID:
    508 Backup PC to a Software Raid mount point, iso size 700mb:
     508Backup machine to a Software Raid mount point, iso size 700mb:
    509509.br
    510510.I "mondoarchive -O -s 700m -d /mnt/raid"
  • branches/3.3/mondo-doc/mondorescue-howto.sgml

    r3542 r3653  
    568568unmount it, and create a boot CD to allow you to restore from
    569569scratch if necessary. To reassure yourself that you will be able to
    570 restore from the NFS share even if your PC is wiped, please boot
     570restore from the NFS share even if your machine is wiped, please boot
    571571from the Mindi CD and type 'compare'. The on-screen instructions
    572572from that point on should be sufficient.</para>
     
    14351435whatever your CD writer's SCSI node is; usually, it is 0,0,0) to
    14361436the call.</para>
    1437 <para>Please insert the first disk in the writer while the PC is
     1437<para>Please insert the first disk in the writer while the machine is
    14381438chugging away. If Mondo needs additional CD-R(W) then it will ask
    14391439for them.</para>
     
    18881888is very reliable.
    18891889</para>
    1890 <para>If you find that you cannot make your PC boot from the CD,
     1890<para>If you find that you cannot make your machine boot from the CD,
    18911891take heart: the first backup media of each set contains disk
    18921892images to give you the same functionality as this media (minus the
     
    19161916
    19171917<para>If the CD is not found during the initial restore CD boot
    1918 attempt, reboot the PC a second time prior to reporting failure.
     1918attempt, reboot the machine a second time prior to reporting failure.
    19191919Occasional timing errors and hardware/software/system conflicts do
    19201920occur.</para>
     
    23342334<title>Advanced</title>
    23352335<para>It is now possible to restore to a live filesystem using
    2336 Mondo. In other words, you do not have to boot your PC from your
     2336Mondo. In other words, you do not have to boot your machine from your
    23372337media in order to restore files. Mondo was originally designed
    23382338for disaster recovery - situations in which you cannot boot your
    2339 PC. If you can boot your PC, it is not really a disaster, is it? :)
     2339machine. If you can boot your machine, it is not really a disaster, is it? :)
    23402340Well, if you have wiped out your priceless collection of "MTV's
    23412341Bjork Unplugged" MP3's, perhaps it is. Anyway, just type this as
     
    24632463</listitem>
    24642464<listitem>
    2465 <para>What sort of PC you are using, including hard disk configurations (results of dmidecode, lshw, fdisk -l are useful here)</para>
     2465<para>What sort of machine you are using, including hard disk configurations (results of dmidecode, lshw, fdisk -l are useful here)</para>
    24662466</listitem>
    24672467</itemizedlist>
     
    25002500The more distributions we support, the more moving targets we have to
    25012501hit. Please bear this in mind when e-mailing the list. :) If you
    2502 would like to help us by beta-testing Mondo (or Mindi) on your PC
     2502would like to help us by beta-testing Mondo (or Mindi) on your machine
    25032503then we would be very interested in working with you to work around
    25042504the eccentricities of your Linux distro. However, rest assured, 90%
     
    26272627<qandaentry>
    26282628<question><para>Q: Can I create a Mondo CD and then use
    2629                 it to create an archive of any OS on any PC?</para></question>
     2629                it to create an archive of any OS on any machine?</para></question>
    26302630<answer>
    26312631<para>A: Not yet. You can use Mondo to backup Linux or
     
    27032703support. Take a look at <link linkend="overview-sysrq-kernelreq">Linux
    27042704Kernel support</link> to see what your kernel must support. (Of
    2705 course, if your PC has less than 64MB of RAM, you could always...
     2705course, if your machine has less than 64MB of RAM, you could always...
    27062706what's the phrase? I know, upgrade your RAM!)</para>
    27072707</answer>
  • branches/3.3/mondo-doc/mondorestore.8

    r3155 r3653  
    2626.SH SYNOPSIS
    2727.B mondorestore [\-p prefix][\-K loglevel][\-i][\-U]...
    28 : restore your PC
     28: restore your machine
    2929
    3030.SH DESCRIPTION
  • branches/3.3/mondo/src/common/libmondo-devices.c

    r3648 r3653  
    319319/**
    320320 * Determine whether a non-Microsoft partition exists on any connected hard drive.
    321  * @return TRUE (there's a Linux/FreeBSD partition) or FALSE (Microsoft has taken over yet another innocent PC).
     321 * @return TRUE (there's a Linux/FreeBSD partition) or FALSE (Microsoft has taken over yet another innocent machine).
    322322 */
    323323bool does_nonMS_partition_exist(void)
     
    21932193        which_backup_media_type(bkpinfo->restore_data);
    21942194    if (bkpinfo->backup_media_type == none) {
    2195         log_to_screen("User has chosen not to backup the PC");
     2195        log_to_screen("User has chosen not to backup the machine");
    21962196        finish(1);
    21972197    }
     
    22452245            }
    22462246            if ((compression_type = which_compression_type()) == NULL) {
    2247                 log_to_screen("User has chosen not to backup the PC");
     2247                log_to_screen("User has chosen not to backup the machine");
    22482248                finish(1);
    22492249            }
    22502250
    22512251            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
    2252                 log_to_screen("User has chosen not to backup the PC");
     2252                log_to_screen("User has chosen not to backup the machine");
    22532253                finish(1);
    22542254            }
     
    22682268            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
    22692269                if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
    2270                     log_to_screen("User has chosen not to backup the PC");
     2270                    log_to_screen("User has chosen not to backup the machine");
    22712271                    mr_free(comment);
    22722272                    finish(1);
     
    22802280            mr_free(mds);
    22812281            if (!popup_and_get_string("Size", comment, tmp1, 5)) {
    2282                 log_to_screen("User has chosen not to backup the PC");
     2282                log_to_screen("User has chosen not to backup the machine");
    22832283                finish(1);
    22842284            }
     
    22872287
    22882288            if (bkpinfo->media_size <= 0) {
    2289                 log_to_screen("User has chosen not to backup the PC");
     2289                log_to_screen("User has chosen not to backup the machine");
    22902290                finish(1);
    22912291            }
     
    23072307                mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
    23082308                if (!popup_and_get_string("Device?", comment, bkpinfo->media_device, MAX_STR_LEN / 4)) {
    2309                     log_to_screen("User has chosen not to backup the PC");
     2309                    log_to_screen("User has chosen not to backup the machine");
    23102310                    finish(1);
    23112311                }
     
    23382338                }
    23392339                if (!i) {
    2340                     log_to_screen("User has chosen not to backup the PC");
     2340                    log_to_screen("User has chosen not to backup the machine");
    23412341                    finish(1);
    23422342                }
     
    23522352        if (!ask_me_yes_or_no
    23532353            ("This option is for advanced users only. Are you sure?")) {
    2354             log_to_screen("User has chosen not to backup the PC");
     2354            log_to_screen("User has chosen not to backup the machine");
    23552355            finish(1);
    23562356        }
     
    23842384        if (!bkpinfo->media_device[0]) {
    23852385            if (!popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device, MAX_STR_LEN / 4)) {
    2386                 log_to_screen("User has chosen not to backup the PC");
     2386                log_to_screen("User has chosen not to backup the machine");
    23872387                finish(1);
    23882388            }
     
    23982398        tmp = mr_popup_and_get_string("Tape block size?", "What is the block size of your tape streamer?", sz_size);
    23992399        if (tmp == NULL) {
    2400             log_to_screen("User has chosen not to backup the PC");
     2400            log_to_screen("User has chosen not to backup the machine");
    24012401            finish(1);
    24022402        }
     
    24092409
    24102410        if (bkpinfo->internal_tape_block_size <= 0) {
    2411             log_to_screen("User has chosen not to backup the PC");
     2411            log_to_screen("User has chosen not to backup the machine");
    24122412            finish(1);
    24132413        }
     
    24252425        if (archiving_to_media) {
    24262426            if ((compression_type = which_compression_type()) == NULL) {
    2427                 log_to_screen("User has chosen not to backup the PC");
     2427                log_to_screen("User has chosen not to backup the machine");
    24282428                finish(1);
    24292429            }
    24302430            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
    2431                 log_to_screen("User has chosen not to backup the PC");
     2431                log_to_screen("User has chosen not to backup the machine");
    24322432                finish(1);
    24332433            }
     
    24562456        {
    24572457            if (!popup_and_get_string("Network shared dir.", "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)", p, MAX_STR_LEN / 4)) {
    2458                 log_to_screen("User has chosen not to backup the PC");
     2458                log_to_screen("User has chosen not to backup the machine");
    24592459                finish(1);
    24602460            }
     
    24652465            if (!bkpinfo->restore_data) {
    24662466                if ((compression_type = which_compression_type()) == NULL) {
    2467                     log_to_screen("User has chosen not to backup the PC");
     2467                    log_to_screen("User has chosen not to backup the machine");
    24682468                    finish(1);
    24692469                }
    24702470
    24712471                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
    2472                     log_to_screen("User has chosen not to backup the PC");
     2472                    log_to_screen("User has chosen not to backup the machine");
    24732473                    finish(1);
    24742474                }
     
    24972497                mr_free(sz_size);
    24982498                if (!popup_and_get_string("Size", comment, tmp1, 5)) {
    2499                     log_to_screen("User has chosen not to backup the PC");
     2499                    log_to_screen("User has chosen not to backup the machine");
    25002500                    finish(1);
    25012501                }
     
    25092509
    25102510            if (bkpinfo->media_size < 0) {
    2511                 log_to_screen("User has chosen not to backup the PC");
     2511                log_to_screen("User has chosen not to backup the machine");
    25122512                finish(1);
    25132513            }
     
    25212521        strcpy(tmp1, bkpinfo->netfs_proto);
    25222522        if (!popup_and_get_string("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",tmp1, MAX_STR_LEN)) {
    2523             log_to_screen("User has chosen not to backup the PC");
     2523            log_to_screen("User has chosen not to backup the machine");
    25242524            finish(1);
    25252525        }
     
    25292529        strcpy(tmp1, bkpinfo->netfs_mount);
    25302530        if (!popup_and_get_string("Network share", "Which remote share should I mount?", tmp1, MAX_STR_LEN)) {
    2531             log_to_screen("User has chosen not to backup the PC");
     2531            log_to_screen("User has chosen not to backup the machine");
    25322532            finish(1);
    25332533        }
     
    25412541        }
    25422542        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1, MAX_STR_LEN)) {
    2543             log_to_screen("User has chosen not to backup the PC");
     2543            log_to_screen("User has chosen not to backup the machine");
    25442544            finish(1);
    25452545        }
     
    26012601        strcpy(tmp1, bkpinfo->netfs_remote_dir);
    26022602        if (!popup_and_get_string ("Directory", "Which directory within that mountpoint?", tmp1, MAX_STR_LEN)) {
    2603             log_to_screen("User has chosen not to backup the PC");
     2603            log_to_screen("User has chosen not to backup the machine");
    26042604            finish(1);
    26052605        }
     
    26092609
    26102610        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix, MAX_STR_LEN / 4)) {
    2611             log_to_screen("User has chosen not to backup the PC");
     2611            log_to_screen("User has chosen not to backup the machine");
    26122612            finish(1);
    26132613        }
     
    26202620        if (!bkpinfo->disaster_recovery) {
    26212621            if (!popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir, MAX_STR_LEN / 4)) {
    2622                 log_to_screen("User has chosen not to backup the PC");
     2622                log_to_screen("User has chosen not to backup the machine");
    26232623                finish(1);
    26242624            }
    26252625            if (archiving_to_media) {
    26262626                if ((compression_type = which_compression_type()) == NULL) {
    2627                     log_to_screen("User has chosen not to backup the PC");
     2627                    log_to_screen("User has chosen not to backup the machine");
    26282628                    finish(1);
    26292629                }
    26302630                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
    2631                     log_to_screen("User has chosen not to backup the PC");
     2631                    log_to_screen("User has chosen not to backup the machine");
    26322632                    finish(1);
    26332633                }
    26342634                sprintf(tmp1, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
    26352635                if (!popup_and_get_string("ISO size.", "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s (700) or DVD's (4480) you plan to backup to.", tmp1, 16)) {
    2636                     log_to_screen("User has chosen not to backup the PC");
     2636                    log_to_screen("User has chosen not to backup the machine");
    26372637                    finish(1);
    26382638                }
     
    26432643        }
    26442644        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix, MAX_STR_LEN / 4)) {
    2645             log_to_screen("User has chosen not to backup the PC");
     2645            log_to_screen("User has chosen not to backup the machine");
    26462646            finish(1);
    26472647        }
     
    26672667#ifdef __FreeBSD__
    26682668            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/ad0)", bkpinfo->boot_device, MAX_STR_LEN / 4)) {
    2669                 log_to_screen("User has chosen not to backup the PC");
     2669                log_to_screen("User has chosen not to backup the machine");
    26702670                finish(1);
    26712671            }
     
    26742674            strcpy(tmp1, bkpinfo->boot_device);
    26752675            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/hda)", tmp1, MAX_STR_LEN / 4)) {
    2676                 log_to_screen("User has chosen not to backup the PC");
     2676                log_to_screen("User has chosen not to backup the machine");
    26772677                finish(1);
    26782678            }
     
    27112711        }
    27122712        if (!popup_and_get_string("Backup paths", "Please enter paths (separated by '|') which you want me to backup. The default is '/' (i.e. everything).", tmp1, MAX_STR_LEN)) {
    2713             log_to_screen("User has chosen not to backup the PC");
     2713            log_to_screen("User has chosen not to backup the machine");
    27142714            finish(1);
    27152715        }
     
    27272727        if (strlen(tmp1) > 2) {
    27282728            if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1, MAX_STR_LEN / 4)) {
    2729                 log_to_screen("User has chosen not to backup the PC");
     2729                log_to_screen("User has chosen not to backup the machine");
    27302730                finish(1);
    27312731            }
     
    27402740        popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with '|'. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", p, (16*MAX_STR_LEN)-1);
    27412741        if (p == NULL) {
    2742             log_to_screen("User has chosen not to backup the PC");
     2742            log_to_screen("User has chosen not to backup the machine");
    27432743            finish(1);
    27442744        }
     
    27542754        }
    27552755        if (!popup_and_get_string("Temporary directory", "Please enter your temporary directory.", p, (4*MAX_STR_LEN)-1)) {
    2756             log_to_screen("User has chosen not to backup the PC");
     2756            log_to_screen("User has chosen not to backup the machine");
    27572757            finish(1);
    27582758        }
     
    27702770        }
    27712771        if (!popup_and_get_string("Scratch directory", "Please enter your scratch directory.", p, (4*MAX_STR_LEN)-1)) {
    2772             log_to_screen("User has chosen not to backup the PC");
     2772            log_to_screen("User has chosen not to backup the machine");
    27732773            finish(1);
    27742774        }
     
    28312831        if (!ask_me_yes_or_no
    28322832            ("Are you sure you want to proceed? Hit 'no' to abort.")) {
    2833             log_to_screen("User has chosen not to backup the PC");
     2833            log_to_screen("User has chosen not to backup the machine");
    28342834            finish(1);
    28352835        }
  • branches/3.3/mondo/src/common/libmondo-fork.c

    r3643 r3653  
    8686
    8787
    88 #define MONDO_POPMSG  "Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."
     88#define MONDO_POPMSG  "Your machine will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."
    8989
    9090/**
  • branches/3.3/mondo/src/common/libmondo-string.c

    r3614 r3653  
    904904        sev = 3;
    905905        mr_free(reason);
    906         mr_asprintf(reason, "Do not edit config files while backing up your PC.");
     906        mr_asprintf(reason, "Do not edit config files while backing up your machine.");
    907907    }
    908908    if (!strcmp(filename, "/etc/adjtime")
  • branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

    r3635 r3653  
    19361936    mr_asprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
    19371937    if (run_program_and_log_output(tmp, FALSE)) {
    1938         log_msg(1, "Error. Failed to copy log to PC's /var/log dir. (Mounted read-only?)");
     1938        log_msg(1, "Error. Failed to copy log to the machine's /var/log dir. (Mounted read-only?)");
    19391939    }
    19401940    paranoid_free(tmp);
  • branches/3.3/mondo/src/mondorestore/mondorestore.c

    r3628 r3653  
    22022202        log_to_screen("Errors occurred during the nuke phase.");
    22032203    } else if (strstr(tmp1, "RESTORE")) {
    2204         log_to_screen("PC was restored successfully. Thank you for using Mondo Rescue.");
     2204        log_to_screen("The machine was restored successfully. Thank you for using Mondo Rescue.");
    22052205        log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
    22062206    } else {
Note: See TracChangeset for help on using the changeset viewer.