Changeset 1621 in MondoRescue for branches/stable

Timestamp:

Sep 7, 2007, 11:56:50 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix #194
• Fix #190 (veelo)
• Fix bug #189 (MarkNienberg)

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

Location:

branches/stable

Files:

• mindi/rootfs/etc/syslog.conf (modified) (1 diff)
• mindi/rootfs/sbin/init (modified) (2 diffs)
• mindi/rootfs/sbin/post-init (modified) (2 diffs)
• mondo-doc/mondorescue-howto.sgml (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)
• mondo/src/restore-scripts/mondo/ISO (modified) (1 diff)

branches/stable/mindi/rootfs/etc/syslog.conf

@@ -1 +1 @@
 # Various entry
-*.*                                      /tmp/mondo-restore.log
+*.*                                      /tmp/mondorestore.log

branches/stable/mindi/rootfs/sbin/init

@@ -322 +322 @@
                 LogIt "$i is started already; no need to run 'mdadm $i'" 1
             else
-                LogIt "Running 'mdadm $i'" 1
-                mdadm -Ac partitions -m dev $i
+                if [ -f /etc/mdadm.conf ] ; then
+                    LogIt "Running 'mdadm $i' with user supplied /etc/mdadm.conf" 1
+                    mdadm -A $i -c /etc/mdadm.conf
+                elif [ -f /etc/mdadm/mdadm.conf ] ; then
+                    LogIt "Running 'mdadm $i' with user supplied /etc/mdadm/mdadm.conf" 1
+                    mdadm -A $i -c /etc/mdadm/mdadm.conf
+                else
+                    LogIt "Running 'mdadm $i'" 1
+                    mdadm -Ac partitions -m dev $i
+                fi
             fi
         done
@@ -558 +566 @@
     LogIt "I think this media has no archives on it."
 fi
-echo -en "Type 'exit' to reboot the PC\n"
-umount /mnt/cdrom 2> /dev/null
-mount / -o rw,remount > /dev/null 2> /dev/null
-LogIt "Launching Shell"
-sh
+if grep "RESTORE" /proc/cmdline > /dev/null 2> /dev/null ; then
+    echo "Rebooting in 10 seconds automatically as per reboot order"
+    echo -en "Press ^C to interrupt if you have to ..."
+    for i in 1 2 3 4 5 6 7 8 9 10 ; do
+        sleep 1
+        echo -en "."
+    done
+    echo "Boom."
+    sleep 1
+else
+    echo -en "Type 'exit' to reboot the PC\n"
+    umount /mnt/cdrom 2> /dev/null
+    mount / -o rw,remount > /dev/null 2> /dev/null
+    LogIt "Launching Shell"
+    sh
+fi
 CaughtSoftReset
 # reboot

branches/stable/mindi/rootfs/sbin/post-init

@@ -121 +121 @@
                 mondorestore --nuke
             else
-            mondorestore; # MR will detect & access the tape
+                mondorestore; # MR will detect & access the tape
             fi
     fi
@@ -138 +138 @@
         fi
     else
-    LogIt "------------------EXPERT MODE------------------" 1
-    LogIt "You do all the work. :-)" 1
-    if which mondorestore > /dev/null 2> /dev/null ; then
+        LogIt "------------------EXPERT MODE------------------" 1
+        LogIt "You do all the work. :-)" 1
+        if which mondorestore > /dev/null 2> /dev/null ; then
             LogIt "Type 'mondorestore' to begin the restore/compare process." 1
-        loc=`which ISO 2> /dev/null`
+            loc=`which ISO 2> /dev/null`
         fi
     fi

branches/stable/mondo-doc/mondorescue-howto.sgml

@@ -1990 +1990 @@
 <itemizedlist>
 <listitem>
-<para>If it did not work then please copy /tmp/mondo-restore.log to
+<para>If it did not work then please copy /tmp/mondorestore.log to
 your hard disk, USB key, ..., gzip it and e-mail it to the
 &ML;.</para>
@@ -2025 +2025 @@
 wait.</para>
 <para>Now, should something go wrong, you will be able to examine
-/tmp/mondo-restore.log to see what happened. All is not lost. You
+/tmp/mondorestore.log to see what happened. All is not lost. You
 can fdisk and format the partitions yourself, using the tools that
 come with the CD. You can then run mondorestore in Interactive Mode

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

@@ -741 +741 @@
         }
         if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot//efi/debian/elilo.conf")) {
+            && does_file_exist("/boot/efi/debian/elilo.conf")) {
             run_program_and_log_output
                 ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf",

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

@@ -712 +712 @@
     tmp1 = call_program_and_get_last_line_of_output("cat /proc/cmdline");
 #endif
-        if ((strstr(tmp1,"restore") == NULL) ||
-            (strstr(tmp1,"RESTORE") == NULL)) {
+        if (strstr(tmp1,"RESTORE") == NULL) {
             /* -H option */
             mr_asprintf(&tmp,

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

@@ -1 +1 @@
 #!/bin/sh
 
-mondo-restore --iso
+mondorestore --iso
 exit $?