Changeset 1406 in MondoRescue

Timestamp:

May 7, 2007, 12:49:50 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Fix a Debian packaging bug
• Do not use mindi-boot.2880.img (which may not exist) anymore in mondorestore

Location:

branches/2.2.4

Files:

• mindi/distributions/debian/rules (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

branches/2.2.4/mindi/distributions/debian/rules

@@ -26 +26 @@
     dh_installdirs
     # Build the installation tree:
-    ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export PREFIX=/usr && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
+    export PREFIX=/usr
+    ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh )
 
 # Build architecture-independent files here.

branches/2.2.4/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2499 +2499 @@
             }
         } else {
+            /* That boot imae doesn't always exist where the following method always works 
             log_msg(2,
                     "gcffa --- looking at mounted CD for mindi-boot.2880.img");
@@ -2506 +2507 @@
             sprintf(mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {
+            */
                 log_msg(2,
-                        "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
+                        "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
                 sprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
@@ -2514 +2516 @@
                         ("Please reinsert the disk/CD and try again.");
                 }
+                    /*
             }
+                */
         }
     }