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


Ignore:
Timestamp:
Sep 7, 2007, 11:56:50 AM (17 years ago)
Author:
Bruno Cornec
Message:

(merge -r1599:1614 $SVN_M/branches/2.2.5 .)

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

Legend:

Unmodified
Added
Removed

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

    r1609 r1621  
    741741        }
    742742        if (!does_file_exist("/etc/elilo.conf")
    743             && does_file_exist("/boot//efi/debian/elilo.conf")) {
     743            && does_file_exist("/boot/efi/debian/elilo.conf")) {
    744744            run_program_and_log_output
    745745                ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf",

  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1594 r1621  
    712712    tmp1 = call_program_and_get_last_line_of_output("cat /proc/cmdline");
    713713#endif
    714         if ((strstr(tmp1,"restore") == NULL) ||
    715             (strstr(tmp1,"RESTORE") == NULL)) {
     714        if (strstr(tmp1,"RESTORE") == NULL) {
    716715            /* -H option */
    717716            mr_asprintf(&tmp,

  • branches/stable/mondo/src/restore-scripts/mondo/ISO

    r30 r1621  
    11#!/bin/sh
    22
    3 mondo-restore --iso
     3mondorestore --iso
    44exit $?
Note: See TracChangeset for help on using the changeset viewer.