Changeset 1077 in MondoRescue

Timestamp:

Jan 27, 2007, 8:20:48 AM (18 years ago)

Author:

Bruno Cornec

Message:

Fix a bug reported by Andy Wright (introduced when supporting gzip) where no bzip2 format file would be found.

File:

• branches/stable/mondo/src/mondorestore/mondo-restore.c (modified) (2 diffs)

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

@@ -1 +1 @@
 /***************************************************************************
-       mondo-restore.c  -  restores mondoarchive data
-                             -------------------
-    begin                : Fri May 19 2000
-    copyright            : (C) 2000 by Hugo Rabson
-    email                : Hugo Rabson <hugorabson@msn.com>
-    cvsid                : $Id$
+$Id$
+restores mondoarchive data
 ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
- *                         Change Log                                      *
- ***************************************************************************
-.
-
-
-07/26
-- workaround - if not /dev then don't call partimagehack
-
-07/21
-- if switch to Interactive Mode during nuke then don't nuke twice :) just once
-
-07/18
-- better support of users who boot from LVM CD and nuke-restore non-LVM backups
-
-07/10
-- when using 'star', exclude all 'not removed.' messages from log (misleading, they are)
-- try w/ ACLs, then w/o ACLs if star fails w/ ACLs
-- added ACL, xattr support for afio
-
-06/26
-- remove make_relevant_partition_bootable(); roll into mondo-prep.c
-- changed various newtDrawRootText() calls to use g_noof_rows instead of
-  integers
-
-06/19
-- don't try to access biggiestruct before it is populated w/ data relating
-  to biggiefile; instead, use control char to find out if biggiefile is
-  to be restored w/ partimagehack or not
-- added AUX_VER
-
-06/15
-- read_cfg_file_into_bkpinfo() --- use user-supplied 'isodir' instead of
-  archive's 'isodir' if different
-  Conor Daly <conor.daly@met.ie>
-
-06/17
-- restore with partimagehack if NTFS device; dd, if non-NTFS device
-
-06/14
-- unmount all; remount, run grub-mr; unmount again
-
-04/09
-- fixed subset restoration bug introduced when I added 'star' support
-
-04/04
-- cleaned up restore_a_tarball_from_stream()
-
-04/03
-- added star support
-- pause for 3s between partitioning and formatting (if in Nuke Mode)
-
-03/28
-- check that g_mountlist_fname was correcfly set; abort if it wasn't
-
-03/25
-- removed dev_null code
-
-03/22/04
-- added mode_of_file()
-- added code to check for unauthorised modification of /dev/null
-  by afio (for instance)
-
-12/27/03
-- check /tmp/cmdline instead of /proc/cmdline if on FreeBSD
-
-11/15
-- added g_fprep
-- "Switch to interactive mode?" msg is now more informative
-
-11/05
-- after 'Are you sure?' when user specifies / as restore path, set
-  restore_path[] to "" so that files are restored to [blank]/file/name :)
-
-10/29
-- moved "No restoring or comparing will take place today" block
-  up to before iso_fiddly_bits (if iso) is called - fix bug
-  if you're in ISO Mode and you say "exit to shell"
-
-10/22
-- swapped calls to chmod() and chown() after restoration
-  of big files (Jens)
-
-10/21
-- changed "/mnt/cdrom" to MNT_CDROM
-
-10/19
-- restore biggiefiles selectively from CD properly
-- use find_my_editor() to find pico/vi/whatever
-- better use of call_program_and_get_last_line_of_output() to
-  scan /proc/cmdline
-
-10/18
-- don't report 'missing compressor' if no compressor used at all
-
-10/14
-- log afio's error messages to /var/log/mondo-archive.log
-  when restoring :)
-- call vi if pico is not available
-
-10/09
-- better logging if fatal error (cannot openout bigfile)
-- better GUI feedback when restoring big files
-- restore_everything() now uses s_node* instead of char*
-- ditto restore_all_*_from_*()
-
-10/02
-- succinct msg instead of pop-ups, if used -H
-
-09/27
-- tweaked restore-time gui
-
-09/26
-- proper reporting of DVD/CDR/etc. type in displayed dialogs
-
-09/23
-- malloc/free global strings in new subroutines - malloc_libmondo_global_strings()
-  and free_libmondo_global_strings() - which are in libmondo-tools.c
-
-09/21
-- trying to fix "mondorestore <no params>" segfault
-
-09/18
-- better remounting of /
-- cleaned up run_grub()
-- sensible command-line handling in Live Mode
-
-09/17
-- cleaned up GRUB installer script a bit
-
-09/15
-- remount / as r/w if in disaster recovery mode;
-  helps for b0rken distros
-
-09/13
-- major NTFS hackage
-
-09/12
-- changed some in-sub var decl'ns to malloc()'s
-
-09/05
-- don't let me run unless I'm root
-- finished NTFS/partimagehack support (CD only); working on tape now
-
-09/01
-- fixed cosmetic bug in biggiefile restore window
-
-06/01 - 08/31
-- added code to main() to make sure NFS
-  (backup) share is mounted in Nuke and Compare Modes
-- added code to run_grub() to mount /boot before running grub-install
-- fixed some stray assert()'s in restore_a_biggiefile_from_stream()
-- fixed bugs in extract_config_file_from_ramdisk()
-  and get_cfg_file_from_archive() which
-  stopped fape+floppy users from being able to
-  boot from floppy and leave floppy in drive :)
-- added hooks to partimage for doing imagedevs
-- fixed calls to popup_and_get_string()
-
-05/01 - 05/31
-- fixed biggiefile atime/utime dates restoration bug, I think
-- added misc clean-up (Steve Hindle)
-- fixed support for subdir-within-NFS-mount
-- if nuke mode fails & user reverts to interactive mode _and succeeds_,
-  don't claim nuke mode aborted :)
-- unmount_all_devices() uses mountlist->el[lino].mountpt
-  instead of mountlist->el[lino].device where possible
-- added Joshua Oreman's FreeBSD patches
-- copied missing paragraph from 1.6x's read_cfg_file_into_bkpinfo()
-  to 1.7x's; affected tape streamer users (badly!)
-- cleaned up some paranoid assert()'s
-- use which("post-nuke") instead of find_home_of_exe("post-nuke")
-- fixed "Don't eject while restoring" mode
-- get_cfg_file_from_archive() --- also recovers mountlist.txt now :)
-- don't eject if 'donteject' is in kernel's command line
-- added 'don't panic' msg to start of log
-
-04/01 - 04/30
-- added text mode (cat /proc/cmdline; if textonly then text mode is on)
-- delete /var/lock/subsys/ * when nuking
-- don't resize mountlist if "noresize" present in /proc/cmdline
-- changed from chmod -R 1777 tmp to chmod 1777 tmp
-- replace newtFinished() and newtInit() with
-  newtSuspend() and newtResume()
-- get_cfg_file_from_archive() returns 1 instead of aborting now
-- read_cfg_file_into_bkpinfo) --- if autorun CD but its config
-  file indicates a non-CD backup media then ask, just in case
-- sped up restore_a_tarball_from_CD() a bit
-- line 4469 --- if post-nuke not found then don't run it :)
-- replaced "/mnt/RESTORING" with MNT_RESTORING (#define'd)
-- moved compare_*() into mondorestore/mondo-rstr-compare.c
-- moved some RAID subroutines into common/libmondo-raid.c
-- fixed some iso live compare problems
-- replaced FILELIST_FULL with g_filelist_full and FILELIST_FULL_STUB;
-  g_filelist_full being the full path of the filelist.full text file and
-  FILELIST_FULL_STUB being "tmp/filelist.full" (relative path);
-- ditto BIGGIELIST_TXT, MONDO_CFG_FILE
-- added lots of assert()'s and log_OS_error()'s
-- in Nuke Mode, check mountlist's sanity before doing anything else;
-  if it fails sanity test, offer to revert to Interactive Mode (or abort)
-- copy log to /mnt/RESTORING/root at end
-- read_cfg_file_into_bkpinfo() --- read iso-dev and isodir if bkptype==iso
-- line 1701 --- delete ramdisk file after extracting config info
-- moved call to make_relevant_partitions_bootable() from
-  within run_boot_loader() to within interactive_mode() and
-  nuke_mode(), after unmounting disks
-- if editing fstab or *.conf, try to use pico if available
-- better calling of make-me-bootable
-- don't sort mountlist anywhere anymore except _locally_ in
-  mount_all_devices() and unmount_all_devices()
-- edit fstab, grub.conf _after_ stabgrub-me if it fails
-- run_boot_loader() --- backup all crucial files to /etc/ *.pristine first
-- added iso_fiddly_bits()
-- fixed ISO mode support
-- mount_cdrom() only searches for device if NOT in disaster recovery mode
-- changed lost of system()'s into run_program_and_log_output()'s
-- don't eject if bkpinfo->please_dont_eject_when_restoring
-- cleaned up post-nuke handling code
-- always eject CD at end, unless bkpinfo->please_dont_...
-- misc clean-up (Tom Mortell)
-- afio uses -c (1024L*1024L)/TAPE_BLOCK_SIZE now
-  instead of -c 1024
-
-01/01 - 03/31/2003
-- commented out sort_... line (BB)
-- clean-up (Stan Benoit)
-- added code for LVM and SW Raid (Brian Borgeson)
-- line 814 - added -p to 'mkdir -p tmp'
-- mount_cdrom() - calls find_cdrom_device() if
-  bkpinfo->media_device is blank (to fill it)
-
-11/01 - 12/31/2002
-- mount_cdrom() better at handling multiple CD drives
-- minor clean-up in restore_a_tarball_from_CD()
-- if --live-from-cd then assume restoring live from CD
-- tweaked it to run better w/ ArkLinux
-- create /mnt/RESTORING/mnt/.boot.d for Gentoo users
-  after restoring
-- cleaned up iso_mode(); no longer asks for NFS info 3 times
-- mount_cdrom() was trying to mount /mnt/isodir/%s/%d.iso;
-  is now just %s/%d.iso
-- mount/unmount /boot if necessary (Gentoo)
-- added RAW MBR support; added run_raw_mbr() for the purpose
-- unmount & remount supermounts at start/end of live restore
-- copy /tmp/mountlist.txt to /tmp/mountlist.txt.orig at start
-- cleaned up string-handling in get_cfg_info_from_archives()
-- fixed run_grub() to call new stabgrub-me script
-- popup list of changed files after Compare Mode
-- permit mondorestore --edit-mountlist even if live mode
-- create a repaired copy of grub-install which is RAID-friendly;
-  use it when initializing boot sector with run_grub()
-- use grub-MR instead of grub-install
-- fixed read_cfg_file_into_bkpinfo() to ignore cfg file's backup_media_type
-  if user has already specified a backup media type interactively
-
-10/01 - 10/31
-- run_grub() will let you specify the boot device as well as edit the system
-  files, if grub-install fails
-- fixed bug in fwrite() call in restore_biggiefile_from_CD()
-- fixed bug affecting restoration of bigfiles from CD's w/0 compression
-- run_grub() will run 'grub-install {boot device}' instead of
-  'grub-install (hd0)'
-
-09/01 - 09/30
-- use /tmp/tmpfs/mondo.tmp instead of /tmp/mondo.tmp
-- initialize MOUNTLIST_FNAME at start of main()
-- differential-related cleanup
-- better handling of CD-ROM drives which aren't /dev/cdrom :)
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- always load config file from archive before operating on it
-- moved some subroutines around; now closer to alphabetical order
-- changed mount.mindi to mount.bootisk
-- mount disks readonly if in Compare Mode
-- set /dev/null's permissions to 777, just in case it somehow gets mangled
-  ...which apparently happen with some devfs-based Linux distributions
-- remove /var/run/ *.pid after restoring
-- move spurious lockfiles from /home/ * to /home/ * /.disabled
-- if Interactive Mode then ask user which media, etc. (i.e. catchall mode
-  is now same as Interactive Mode)
-
-08/01 - 08/30
-- use data structure to store the fname, checksum, mods & perms of each bigfile
-  ... biggiestruct :)
-- if a filelist is tiny (2 bytes or less) then ignore it
-- insist_on_this_cd_number() --- now takes 2 params, not 1
-- re-enabled 'g_current_media_number = 1' in restore_everything()
-- added same to compare_mode()
-- replaced lots of global char[]'s with malloc()'s
-- if differential backup then don't permit formatting or fdisking,
-  whether Interactive or Nuke mode
-- added call to register_pid() at start of main()
-- if Nuke Mode & it succeeds then ask user if they have contributed yet
-- changed tape-size to media-size (config file)
-- changed using_* to backup_media_type
-- changed *_from_tape to *_from_stream
-
-07/01 - 07/31
-- added find_and_mount_actual_cdrom()
-- temp dir is always random
-- skip tarballs if they don't contain files we're looking for
-  (used to read the whole thing & _then_ skip)
-- use media_size[1] instead of media_size[0]
-- fixed serious bug in line 1546 - should have been !=, not ==; stopped
-  mondorestore from correctly restoring big files
-- bigfile piping enhancements (Philippe de Muyter)
-- unmount CD-ROM after restoring from live filesystem
-- TAPE_BLOCK_SIZE treated as %ld, not %d
-
-06/01 - 06/30
-- added signal-trapping
-- disabled 'nr-failed-disks' flag
-- fixed problem w/selective restore
-- don't change /tmp's permissions unless it doesn't exist & must be created
-- fixed bug in --mbr
-- is_file_in_list() enhanced to exclude /mnt/RESTORING or whatever
-- added support for uncompressed archives
-- --monitas-live now accepts path-to-restore_to_, not just path to restore
-- added some debugging/tracking code to the NFS section
-- various monitas-related enhancements
-- added --isonuke and --mbr switches
-- better logging in run_grub()
-- improved --monitas-live
-- mkdir -p /mnt/RESTORING/var/run/console just in case user excludes it
-- afio now uses 16MB buffer instead of 8MB
-- always use bkpinfo->media_size[0], now that -s has been expanded
-- popup and ask where to restore data, if restoring selectively
-
-05/01 - 05/31
-- add '--monitas' flag
-- don't run chmod -R 1777 /mnt/RESTORING/tmp before unmounting unless
-  restoring at the time...
-
-04/01 - 04/30
-- delete old /tmp/filelist.full,biggielist.txt if found when restoring to
-  live filesystem
-- replace MONDO_VERSION #define with VERSION from ../config.h
-- write fname of bigfile to screen when having trouble reading/comparing it
-- if restoring to live filesystem then wipe /tmp/tmpfs/ * afterwards
-- removed spurious finish(0) from main()
-
-03/01 - 03/31/2002
-- if /tmp/m*ndo-restore.cfg not found then assume live restore; restore
-  to / instead of /mnt/RESTORING
-- clean up is_file_in_list() to deal with the /mnt/RESTORING/ prefix
-- exclude leading '/' from filelist.restore-these
-- if /tmp/fstab.new exists then use _it_ instead of /tmp/fstab to label
-  ext2 or ext3 partitions
-- improved logging
-
-[...]
-
-07/10/2001 --- first incarnation
-*/
-
 
 /**
@@ -2575 +2206 @@
         sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
                 current_tarball_number);
-        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
+        if (!does_file_exist(tarball_fname)) {
+            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
                 current_tarball_number);
+        }
         if (!does_file_exist(tarball_fname)) {
             sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",