Changeset 1621 for branches/stable


Ignore:
Timestamp:
Sep 7, 2007, 11:56:50 AM (12 years ago)
Author:
bruno
Message:

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

Location:
branches/stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/rootfs/etc/syslog.conf

    r30 r1621  
    11# Various entry
    2 *.*                                      /tmp/mondo-restore.log
     2*.*                                      /tmp/mondorestore.log
  • branches/stable/mindi/rootfs/sbin/init

    r1581 r1621  
    322322                LogIt "$i is started already; no need to run 'mdadm $i'" 1
    323323            else
    324                 LogIt "Running 'mdadm $i'" 1
    325                 mdadm -Ac partitions -m dev $i
     324                if [ -f /etc/mdadm.conf ] ; then
     325                    LogIt "Running 'mdadm $i' with user supplied /etc/mdadm.conf" 1
     326                    mdadm -A $i -c /etc/mdadm.conf
     327                elif [ -f /etc/mdadm/mdadm.conf ] ; then
     328                    LogIt "Running 'mdadm $i' with user supplied /etc/mdadm/mdadm.conf" 1
     329                    mdadm -A $i -c /etc/mdadm/mdadm.conf
     330                else
     331                    LogIt "Running 'mdadm $i'" 1
     332                    mdadm -Ac partitions -m dev $i
     333                fi
    326334            fi
    327335        done
     
    558566    LogIt "I think this media has no archives on it."
    559567fi
    560 echo -en "Type 'exit' to reboot the PC\n"
    561 umount /mnt/cdrom 2> /dev/null
    562 mount / -o rw,remount > /dev/null 2> /dev/null
    563 LogIt "Launching Shell"
    564 sh
     568if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then
     569    echo "Rebooting in 10 seconds automatically as per reboot order"
     570    echo -en "Press ^C to interrupt if you have to ..."
     571    for i in 1 2 3 4 5 6 7 8 9 10 ; do
     572        sleep 1
     573        echo -en "."
     574    done
     575    echo "Boom."
     576    sleep 1
     577else
     578    echo -en "Type 'exit' to reboot the PC\n"
     579    umount /mnt/cdrom 2> /dev/null
     580    mount / -o rw,remount > /dev/null 2> /dev/null
     581    LogIt "Launching Shell"
     582    sh
     583fi
    565584CaughtSoftReset
    566585# reboot
  • branches/stable/mindi/rootfs/sbin/post-init

    r1339 r1621  
    121121                mondorestore --nuke
    122122            else
    123             mondorestore; # MR will detect & access the tape
     123                mondorestore; # MR will detect & access the tape
    124124            fi
    125125    fi
     
    138138        fi
    139139    else
    140     LogIt "------------------EXPERT MODE------------------" 1
    141     LogIt "You do all the work. :-)" 1
    142     if which mondorestore > /dev/null 2> /dev/null ; then
     140        LogIt "------------------EXPERT MODE------------------" 1
     141        LogIt "You do all the work. :-)" 1
     142        if which mondorestore > /dev/null 2> /dev/null ; then
    143143            LogIt "Type 'mondorestore' to begin the restore/compare process." 1
    144         loc=`which ISO 2> /dev/null`
     144            loc=`which ISO 2> /dev/null`
    145145        fi
    146146    fi
  • branches/stable/mondo-doc/mondorescue-howto.sgml

    r1591 r1621  
    19901990<itemizedlist>
    19911991<listitem>
    1992 <para>If it did not work then please copy /tmp/mondo-restore.log to
     1992<para>If it did not work then please copy /tmp/mondorestore.log to
    19931993your hard disk, USB key, ..., gzip it and e-mail it to the
    19941994&ML;.</para>
     
    20252025wait.</para>
    20262026<para>Now, should something go wrong, you will be able to examine
    2027 /tmp/mondo-restore.log to see what happened. All is not lost. You
     2027/tmp/mondorestore.log to see what happened. All is not lost. You
    20282028can fdisk and format the partitions yourself, using the tools that
    20292029come with the CD. You can then run mondorestore in Interactive Mode
  • 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.