Changeset 839 in MondoRescue

Timestamp:

Sep 26, 2006, 9:47:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r814:838 $SVN_M/branches/stable

Location:

trunk

Files:

• mindi-busybox (copied) (copied from branches/stable/mindi-busybox )
• mindi-kernel/VERSION (modified) (1 diff)
• mindi/.config-busybox-i386 (deleted)
• mindi/.config-busybox-i386.net (deleted)
• mindi/.config-busybox-ia64 (deleted)
• mindi/ChangeLog (modified) (1 diff)
• mindi/README.busybox (modified) (1 diff)
• mindi/distributions/rpm/mindi.spec (modified) (1 diff)
• mindi/install.sh (modified) (2 diffs)
• mindi/mindi (modified) (1 diff)
• mindi/rootfs/bin/busybox-i386 (deleted)
• mindi/rootfs/bin/busybox-i386.net (deleted)
• mindi/rootfs/bin/busybox-ia64 (deleted)
• mindi/src (copied) (copied from branches/stable/mindi/src )
• mondo/distributions/rpm/mondo.spec (modified) (3 diffs)
• mondo/src/common/Makefile.am (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (4 diffs)
• mondo/src/common/libmondo-files.c (modified) (1 diff)
• mondo/src/common/libmondo-raid.c (modified) (1 diff)
• mondo/src/common/mr_string.c (copied) (copied from branches/stable/mondo/mondo/common/mr_string.c )
• mondo/src/common/mr_string.h (copied) (copied from branches/stable/mondo/mondo/common/mr_string.h )
• mondo/src/mondorestore/mondo-restore.c (modified) (4 diffs)
• mondo/src/restore-scripts/mondo/stabgrub-me (modified) (1 diff)
• tools/DISTROS (modified) (1 diff)
• tools/build2pkg (modified) (1 diff)
• tools/file2ftp (modified) (1 diff)
• tools/mknewtag (modified) (1 diff)
• tools/mknewversion (modified) (1 diff)
• tools/pkg2ftp (modified) (1 diff)
• tools/pkg2mdv (modified) (1 diff)
• tools/svn2build (modified) (2 diffs)

trunk/mindi-kernel/VERSION

@@ -1 @@
-trunk
+2.6

trunk/mindi/ChangeLog

@@ -2 +2 @@
 
 MINDI CHANGES
+
+1.2.0 (2006-09-25)
+- busybox is now a separate package and binaries are not provided anymore in mindi (Bruno Cornec)
 
 1.0.9 (2006-08-05)

trunk/mindi/README.busybox

@@ -1 +1 @@
 Mindi uses the busybox (http://busybox.net) project to create the boot environement used during restore.
 
-If you want to modify the busybox support, you have to:
-
-1/ Get busybox sources and extract them
-2/ Copy as a base the .config file from the mindi directory under the name .config in this source directory.
-   3 files are proposed:
-   .config-busybox-i386.net : Configure busybox for Network support (NFS, PXE)
-   .config-busybox-i386     : Configure busybox for Normal support (CDs, DVD, Tapes)
-   .config-busybox-ia64     : Configure busybox for Normal and Network support on ia64/Itanium
-3/ Reconfigure busybox (make menuconfig)
-4/ Rebuild the new busybox (make busybox)
-5/ copy the new busybox binary from that directory to rootfs/bin under the mindi source tree
-   3 files are proposed:
-   busybox-i386.net : busybox with Network support (NFS, PXE)
-   busybox-i386     : busybox with Normal support (CDs, DVD, Tapes)
-   busybox-ia64     : busybox with Normal and Network support on ia64/Itanium
-6/ Relaunch mindi or mondoarchive if you use it.
+The best manner to use it is to also install our mindi-busybox package/tar file with your mindi installation.
+If you rather want to install your distribution busybox, you'll have to check it supports all the required function our is providing, that it's place under /usr/lib/mindi/rootfs/bin/busybox and that ll required links are created.

trunk/mindi/distributions/rpm/mindi.spec

@@ -11 +11 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools DDD
+ExcludeArch: ppc
+Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, busybox DDD
 OBS
 # Not on all systems

trunk/mindi/install.sh

@@ -36 +36 @@
 ARCH=`/bin/arch`
 echo $ARCH | grep -x "i[0-9]86" &> /dev/null && ARCH=i386 && locallib=$local/lib
-# For the moment, we don't build specific x86_64 busybox binaries
-echo $ARCH | grep -x "x86_64" &> /dev/null && ARCH=i386 && locallib=$local/lib64
+echo $ARCH | grep -x "x86_64" &> /dev/null && locallib=$local/lib64
 echo $ARCH | grep -x "ia64" &> /dev/null && locallib=$local/lib
 export ARCH
@@ -68 +67 @@
 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
 
-# Managing busybox
-if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH ]; then
-        echo "Installing busybox ..."
-        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH $locallib/mindi/rootfs/bin/busybox
-else
+if [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
         echo "WARNING: no busybox found, mindi will not work on this arch ($ARCH)"
 fi
-if [ "$ARCH" = "i386" ] ; then
-    if [ -f $locallib/mindi/rootfs/bin/busybox-$ARCH.net ]; then
-        echo "Installing busybox.net ..."
-        install -s -m 755 $locallib/mindi/rootfs/bin/busybox-$ARCH.net $locallib/mindi/rootfs/bin/busybox.net
-    else
-        echo "WARNING: no busybox.net found, mindi will not work on this arch ($ARCH) with network"
-    fi
-fi
-# Remove left busybox
-rm -f $locallib/mindi/rootfs/bin/busybox-*
 
 # Managing parted2fdisk

trunk/mindi/mindi

@@ -2871 +2871 @@
         # For PXE boot
         list_of_groovy_mods="$list_of_groovy_mods $NET_MODS"
-        # Here we need the net busybox
-        mv $mountpoint/bin/busybox.net $mountpoint/bin/busybox
-    else
-        rm -f $mountpoint/bin/busybox.net
     fi
     [ -e "$floppy_modules_path" ] || LogIt "path $floppy_modules_path does not exist.\n If you're not using a modular kernel then you're NUTS.\n"

trunk/mondo/distributions/rpm/mondo.spec

@@ -2 +2 @@
 # $Id$
 #
-
-%define addreq  mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 
 Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
@@ -18 +16 @@
 Source:     SSS
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-BuildRequires:  newt-devel >= 0.50, gcc
+BuildRequires:  newt-devel >= 0.50
+ExcludeArch:    ppc
 OBS
+Requires:   mindi >= 1.0.9, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
 %ifarch ia64
-Requires:   %{addreq}, elilo, parted
+Requires:   elilo, parted
 %else
-Requires:   %{addreq}, syslinux >= 1.52
+Requires:   syslinux >= 1.52
 %endif
 
@@ -58 +58 @@
 
 %build
-%configure --program-prefix=%{?_program_prefix}
-%{__make} VERSION=%{version}
+%configure
+make %{?_smp_mflags} VERSION=%{version}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean

trunk/mondo/src/common/Makefile.am

@@ -8 +8 @@
 
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                    libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                    libmondo-mountlist.c libmondo-raid.c libmondo-msg.c \
-                    libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                    libmondo-verify.c newt-specific.c \
-                    libmondo-archive.h libmondo-devices.h \
-                    libmondo-filelist.h libmondo-files.h libmondo-fork.h \
-                    libmondo-mountlist.h libmondo-raid.h \
-                    libmondo-stream.h libmondo-string.h libmondo-tools.h \
-                    libmondo-verify.h libmondo-fifo.h \
-                    libmondo-archive-EXT.h my-stuff.h mondostructures.h \
-                    libmondo-devices-EXT.h libmondo-fifo-EXT.h \
-                    libmondo-files-EXT.h libmondo-fork-EXT.h \
-                    libmondo-filelist-EXT.h \
-                    libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
-                    libmondo-string-EXT.h libmondo-tools-EXT.h \
-                    libmondo-verify-EXT.h  libmondo-stream-EXT.h \
-                    newt-specific.h
+                    libmondo-msg.c \
+                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
+                       libmondo-mountlist.c libmondo-raid.c \
+                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
+                       libmondo-verify.c newt-specific.c \
+                       libmondo-archive.h libmondo-devices.h \
+                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
+                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
+                       libmondo-stream.h libmondo-string.h libmondo-tools.h \
+                       libmondo-verify.h libmondo-fifo.h \
+                       libmondo-archive-EXT.h my-stuff.h mondostructures.h \
+                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
+                       libmondo-files-EXT.h libmondo-fork-EXT.h \
+                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
+                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
+                       libmondo-string-EXT.h libmondo-tools-EXT.h \
+                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
+                       newt-specific.h

trunk/mondo/src/common/libmondo-devices.c

@@ -2026 +2026 @@
     asprintf(&exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
            */
 }

trunk/mondo/src/common/libmondo-filelist.c

@@ -17 +17 @@
 #include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
-
+#include "mr_string.h"
 
 #include <time.h>
@@ -1318 +1318 @@
                       char *skeleton_filelist)
 {
+    const char delims[] = " ";
     DIR *dip = NULL;
     struct dirent *dit = NULL;
+
     struct stat statbuf;
     char *new = NULL;
@@ -1329 +1331 @@
     static char *name_of_evalcall_form = NULL;
     int i = 0;
+    char *strtmp = NULL;
+    char *token = NULL;
+    char *find_excludes = NULL;
+    int lastpos = 0;
     static int depth = 0;
     char *p = NULL;
@@ -1347 +1353 @@
     if (!depth) {
         malloc_string(find_skeleton_marker);
+        asprintf(&find_excludes, " ");
+        while((token = mr_strtok (sth, delims, &lastpos))) {
+          asprintf(&strtmp,"%s", find_excludes);
+          paranoid_free(find_excludes);
+          asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          paranoid_free(strtmp);
+          paranoid_free(token);
+        }
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        asprintf(&tmp,
-                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+        asprintf(&strtmp,
+             "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o %s -type d -print > %s 2> /dev/null",
+             dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        asprintf(&tmp,
-                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+        asprintf(&strtmp,
+             "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
+                dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+>>>>>>> .merge-right.r838
 #endif
-        system(tmp);
+        paranoid_free(find_excludes);
+        log_msg(5, "find command = %s", strtmp);
+        system(strtmp);
+        paranoid_free(strtmp);
         paranoid_free(tmp);
 

trunk/mondo/src/common/libmondo-files.c

@@ -772 +772 @@
 
     asprintf(&command, "du -sk %s", mountpt);
+    errno = 0;
     fin = popen(command, "r");
-    paranoid_free(command);
-
-    (void) getline(&tmp, &n, fin);
-    paranoid_pclose(fin);
-    p = strchr(tmp, '\t');
-    if (p) {
-        *p = '\0';
-    }
-    for (p = tmp, llres = 0; *p != '\0'; p++) {
-        llres *= 10;
-        llres += (int) (*p - '0');
-    }
+    if (errno) {
+      log_it("popen() FAILED: command=%s, mountpt=%s, fin=%d, errno=%d, strerror=%s", command, mountpt, fin, errno, strerror(errno));
+      llres = 0;
+    } else {
+        (void) getline(&tmp, &n, fin);
+        paranoid_pclose(fin);
+        p = strchr(tmp, '\t');
+        if (p) {
+            *p = '\0';
+        }
+        for (p = tmp, llres = 0; *p != '\0'; p++) {
+            llres *= 10;
+            llres += (int) (*p - '0');
+        }
+    }
+
+    paranoid_free(command);
     paranoid_free(tmp);
     return (llres);

trunk/mondo/src/common/libmondo-raid.c

@@ -16 +16 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-raid.h"
+#include "mr_string.h"
 
 #ifdef __FreeBSD__

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -749 +749 @@
             paranoid_free(tmp);
             retval = interactive_mode(bkpinfo, mountlist, raidlist);
-            finish(retval);
+            goto after_the_nuke;
         } else {
             paranoid_free(tmp);
@@ -853 +853 @@
     }
     retval += res;
-    call_me_after_the_nuke(retval);
-    return(retval);
+
+  after_the_nuke:
+    if (retval) {
+        log_to_screen("Errors occurred during the nuke phase.");
+    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
+    {
+        log_to_screen
+            ("PC was restored successfully. Thank you for using Mondo Rescue.");
+        log_to_screen
+            ("Please visit our website at http://www.mondorescue.org for more information.");
+    } else {
+        strcpy(tmp,"Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
+        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
+            popup_and_OK(tmp);
+        }
+        log_to_screen
+          ("Mondo has restored your system. Please wait for the command prompt.");
+        log_to_screen
+            ("Then remove the backup media and reboot.");
+        log_to_screen
+            ("Please visit our website at http://www.mondorescue.org for more information.");
+    }
+    g_I_have_just_nuked = TRUE;
+/*
+  if (!boot_loader_installed && !does_file_exist(DO_MBR_PLEASE))
+    {
+      log_to_screen("PLEASE RUN 'mondorestore --mbr' NOW TO INITIALIZE YOUR BOOT SECTOR");
+      write_one_liner_data_file(DO_MBR_PLEASE, "mondorestore --mbr");
+    }
+*/
+    return (retval);
+>>>>>>> .merge-right.r838
 }
 /**************************************************************************
@@ -2654 +2684 @@
     struct s_node *filelist = NULL;
     char *a = NULL, *b = NULL;
+    bool run_postnuke = FALSE;
 
   /**************************************************************************
@@ -3067 +3098 @@
 
 // g_I_have_just_nuked is set true by nuke_mode() just before it returns
-    if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
-        if (!system("which post-nuke > /dev/null 2> /dev/null")) {
-            log_msg(1, "post-nuke found; running...");
-            if (mount_all_devices(mountlist, TRUE)) {
-                log_to_screen
-                    (_
-                     ("Unable to re-mount partitions for post-nuke stuff"));
-            } else {
-                log_msg(1, "Re-mounted partitions for post-nuke stuff");
-                asprintf(&tmp, "post-nuke %s %d", bkpinfo->restore_path,
-                        retval);
-                if (!g_text_mode) {
-                    newtSuspend();
-                }
-                log_msg(2, "Calling '%s'", tmp);
-                if ((res = system(tmp))) {
-                    log_OS_error(tmp);
-                }
-                paranoid_free(tmp);
-                if (!g_text_mode) {
-                    newtResume();
-                }
-//              newtCls();
-                log_msg(1, "post-nuke returned w/ res=%d", res);
-            }
-            unmount_all_devices(mountlist);
-            log_msg(1, "I've finished post-nuking.");
-        }
-    }
+    if (!system("which post-nuke > /dev/null 2> /dev/null")) {
+      log_msg(1, "post-nuke found; find out whether we should run it...");
+      if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
+        run_postnuke = TRUE;
+        log_msg(1, "Yes, will run post-nuke because in nuke mode or file /POST-NUKE-ANYWAY exists.");
+      } else if (ask_me_yes_or_no("post-nuke script found. Do you want to run it?")) {
+        run_postnuke = TRUE;
+        log_msg(1, "Yes, will run post-nuke because user interactively asked for it.");
+      } else {
+        run_postnuke = FALSE;
+        log_msg(1, "No, will not run post-nuke.");
+      }
+    } else {
+      log_msg(1, "No post-nuke found.");
+    }
+    if (run_postnuke) {
+      log_to_screen("Running post-nuke...");
+      if (mount_all_devices(mountlist, TRUE)) {
+        log_to_screen
+          ("Unable to re-mount partitions for post-nuke stuff");
+      } else {
+        log_msg(1, "Re-mounted partitions for post-nuke stuff");
+        sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
+            retval);
+        log_msg(2, "Calling '%s'", tmp);
+        if ((res = run_program_and_log_output(tmp, 0))) {
+          log_OS_error(tmp);
+        }
+        log_msg(1, "post-nuke returned w/ res=%d", res);
+      }
+      unmount_all_devices(mountlist);
+      log_to_screen("I've finished post-nuking.");
+    }
+
 /*  
   log_to_screen("If you are REALLY in a hurry, hit Ctrl-Alt-Del now.");

trunk/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -34 +34 @@
     old_fstab=/mnt/RESTORING/etc/fstab
     old_grubconf=/mnt/RESTORING/etc/grub.conf
+        # For some distros, e.g. Debian, /etc/grub.conf is a symbolic link
+    # which we need to resolve and prepend with /mnt/RESTORING because
+    # we run this outside the chroot.
+    if [ -L "$old_grubconf" ] ; then
+        old_grubconf=/mnt/RESTORING`readlink "$old_grubconf"`
+    fi  
     return 0
     elif [ -f "/mnt/cdrom/archives/CUCKOO" ] ; then

trunk/tools/DISTROS

@@ -2 +2 @@
 mandrake_10.2
 mandriva_2006.0
+mandriva_2007.0
 redhat_7.3
 redhat_9

trunk/tools/build2pkg

@@ -32 +32 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

trunk/tools/file2ftp

@@ -32 +32 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

trunk/tools/mknewtag

@@ -37 +37 @@
     exit -1
 else
-    for p in mindi mondo; do
+    for p in mindi mondo mindi-busybox mindi-kernel; do
         v=`cat $TOOLHOME/../$p/VERSION`
         grep -q "${v}" $TOOLHOME/../$p/ChangeLog

trunk/tools/mknewversion

@@ -50 +50 @@
     cd ${VER}
     echo "$TAG" > tools/TAG
-    for p in mindi mondo mondo-doc mindi-kernel; do
+    for p in mindi mondo mondo-doc mindi-kernel mindi-busybox; do
         v=${VER}
         if [ $p == "mindi" ]; then

trunk/tools/pkg2ftp

@@ -32 +32 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

trunk/tools/pkg2mdv

@@ -31 +31 @@
     
 if [ "$1" = "" ]; then
-    c="mondo-doc mindi mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-        c="mindi-kernel mondo-doc mindi mondo"
+        c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1

trunk/tools/svn2build

@@ -23 +23 @@
 
 if [ "$1" = "" ]; then
-        c="mondo-doc mindi mondo"
+        c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
-            c="mindi-kernel mondo-doc mindi mondo"
+            c="mindi-kernel mondo-doc mindi mindi-busybox mondo"
     else
         c=$1
@@ -116 +116 @@
     fi
 
-    if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
+    if [ _"`echo $p | grep -vE 'kernel|busybox' | grep mindi`" != _"" ]; then
         v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then