Changeset 1919 in MondoRescue

Timestamp:

Apr 17, 2008, 1:50:50 AM (16 years ago)

Author:

Bruno Cornec

Message:

busybox under /usr/lib shouldn't be put on the boot disk as it breaks the /usr/lib* build. Use only the /bin/busybox bin.

Location:

branches/2.2.6

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/common/newt-specific.c (modified) (1 diff)

branches/2.2.6/mindi/mindi

@@ -169 +169 @@
     mkdir -p $bigdir/etc
     #cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
-    tar cf - $mappath 2>> $LOGFILE | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
+    tar cf - $mappath 2>> /dev/null | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
         included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -2470 +2470 @@
         LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
         #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
-        tar cf - $MINDI_LIB/rootfs/bin/busybox /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
+        tar cf - /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
         rm -f $MINDI_TMP/busy.lis
     fi

branches/2.2.6/mondo/src/common/libmondo-devices.c

@@ -1 +1 @@
 /* libmondo-devices.c                 Subroutines for handling devices
    $Id$
-.
-
-
-01/07/2005
-- sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs and (new) cifs
-
-10/23
-- if root mounted at '/dev/rd/' then say FALSE, not mounted on ramdisk
-  just to please Fred Beondo :-p
-
-07/25
-- updated get_phys_size_of_drive() to support newer, larger drives
-
-07/18
-- better support of users who boot from LVM CD and nuke-restore non-LVM backups
-
-07/08
-- BLKGETSIZE64 instead of BLKGETIO..whatever (Joshua)
-- amended to use BLKGETSIZE if BLKGETSIZE64 missing (Hugo)
-- resort to HDIO_GETGEO if BLKGETSIZE and BLKGETSIZE63 fail
-
-
-06/25
-- added Mandrake 9.2 support to which_boot_loader()
-- cleaned up find_cdrom_device()
-
-06/23
-- rewrote resolve_softlinks_to_get_to_actual_device_file() in C
-
-06/17
-- don't use star automatically if SELINUX detected; let user do that
-
-05/07
-- usage of parted2fdisk instead of fdisk alone (ia32/ia64 compatibility)
-  BCO
-
-04/17
-- replaced INTERNAL_TAPE_BLK_SIZE with bkpinfo->internal_tape_block_size
-
-04/13
-- if kernel >= 2.6 then ask for /dev entry, not SCSI node
-
-04/12
-- in mount_CDROM_...whatever, don't use bkpinfo_DONTUSETHIS to see if
-  mounting a real CD device; look for /dev/ at start of $device instead
-
-04/04
-- when testing for tape drive, use INTERNAL_TAPE_BLK_SIZE, not TAPE_BLOCK_SIZE
-
-04/03
-- don't eject/retract drive if ISO
-
-02/23/2004
-- changed strstr() to strncmp() in a few places
-
-12/11/2003
-- if we can't find the DVD using dvdrecord then try it w/cdrecord
-
-11/15
-- changed a few []s to char*s
-- better support of multiple CD-ROM drives
-
-11/14
-- better find_cdrom_device(), to cope w/ multiple CD writers
-
-10/26
-- call 'mt -f %s offline' to eject tape drive in eject_device()
-
-10/25
-- ask user to confirm which NFS share to mount
-- improved which_boot_loader()
-
-10/22
-- tweaked find_cdrom_device() and find_cdrw_device()
-- created find_dvd_device()
-
-10/21
-- changed "/mnt/cdrom" to MNT_CDROM
-
-09/28
-- interactive gui no longer asks dvd's speed
-
-09/26
-- interactive gui now supports dvd
-
-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
-- ask for CD size when backing up interactively
-- offer to exclude NFS shares if they're present
-
-09/20
-- exclude /dev/shm from sensibly_*()
-
-09/18
-- less verbose logging when insisting on CD #n
-
-09/09
-- added resolve_softlinks_to_get_to_actual_device_file()
-
-09/05
-- rewrote inisist_on_this_cd_number() and what_number_cd_is_this()
-
-09/02
-- is_this_a_valid_disk_format() -- treat ntfs (a.k.a. type 7) as recognized format
-  just in case user's backup includes a partimagehack-imaged drive
-
-08/01 - 08/31
-- better boot-time tape detection
-- remove backup-time, erroneous, "remove floppy" msg
-- working on am_I_in_disaster_recovery_mode()
-- interactively_obtain_...() - pause & ask user to remove CD/floppy
-
-06/01 - 07/31
-- in which_boot_loader(), also search /dev/cciss for boot loader
-- fixed calls to popup_and_get_string()
-- fixed bug in get_phys_size_of_drive()
-- fixed bug in where_is_root_mounted()
-- commented out a spurious assert()
-
-05/01 - 05/31
-- superior get_phys_size_of_drive() (Joshua Oreman)
-- fixed call to inject_device() --- Andree L.
-- find_cdrom_device() now may, if asked to, mount drive if possible,
-  to test that it has a CD in it; it then unmounts
-- mount_CDROM_here() now calls retract_cd_and_defeat_autorun() as well
-- fixed support for subdir-within-NFS-mount
-- cleaned up some FreeBSD-specific stuff
-- added Joshua Oreman's FreeBSD patches
-- mount_CDROM_here() --- mkdir -p mountpt
-- add older drive support to get_phys_size_of_drive()
-
-04/01 - 04/30
-- made which_boot_loader() more friendly towards Red Hat 9
-- find_and_mount_actual_cd() retracts all CD trays
-- added lots of log_OS_error()'s and assert()'s
-- fix ISO support in interactively_restore_...()
-- made find_cdrom_device() skip dmesg if second-stage string is empty
-- in find_cdrw_device(), find cdrecord before dvdrecord
-- fixed am_i_in_disaster_recovery_mode()
-- fixed insist_on_this_cd_number()
-
-03/01 - 03/31
-- more work on find_cdrom_device()
-- find_cdrom_device() --- if nonexistent/not found then
-  make sure to return '' as dev str and 1 as res
-- cleaner find_cdrom_device(), to find DVD instead of CD-ROM
-  as last resort
-- fix insist_on_this_cd_number()
-- add user the speed of CD writer, if writing
-- if root is /dev/root then assume not a ramdisk
-
-01/07 - 02/28
-- fixed find_cdrom_device (Stan Benoit)
-- if root is at /dev/root/root then LVM (not ramdisk)
-- fix am_I_in_disaster_recovery_mode() to recognize that /dev/rd/cp*
-  entries are not ramdisks but RAID disks
-- find_cdrw_device() no longer complains to stderr if no cdrecord
-
-01/02/2003
-- sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs
-
-12/01/2002
-- don't ask for isodir path if in disaster recovery mode
-
-11/01 - 11/30
-- added g_restoring_live_from_cd;
-- handle_incoming_parameters() will sensibly set tmpdir and scratchdir
-- properly wipe spurious scratchdir and tmpdir
-- modified sensibly_...() to use tmp.mondo.* and mondo.scratch.*
-  instead of mondo.tmpdir.* and mondo.scratchdir.*
-- line 861,912: set media_size[0] to 1999 as well as 1 thru N
-- chmod 700, not 770, in make_fifo()
-- sensibly_set_tmpdir_and_scratchdir() will now prefix a '/' to the
-  strings if it is missing
-
-10/01 - 10/31
-- changed find_cdrom_device() to ignore DVD drives in the hd[a-d] search;
-  consequently, the subroutine will try scd0, sr0, etc. afterwards
-- commented code
-- fixed obscure bug in find_and_mount_actual_cd()
-- code which sensibly configures tmpdir,scratchdir is now sep. sub.
-- changed sort -s to sort -n <-- sensibly...()
-
-09/01 - 09/30
-- added list_of_NFS_devices_and_mounts()
-- try /dev/st0 if no tape specified at all
-- change '64k' to TAPE_BLOCK_SIZE
-- improved find_cdrom_device()
-- if cdrecord not found then find_cdrom_device() returns 1
-- if disaster recovery mode then don't ask for CD-ROM's /dev entry;
-  assume /dev/cdrom
-- if restoring data then ask for CD-ROM's /dev entry (not its SCSI node)
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- changed sort -n +4 to sort -s +4 (Troff)
-- ask if user's kernel is sane; if 'no' then use FAILSAFE
-- ask user to confirm the tape/CD device name
-- if restoring (not archiving) then don't try to find CD-ROM's SCSI
-  node; try to find its /dev entry instead
-- better detection of biggest partition
-
-08/01 - 08/31
-- fixed verify bug --- CD#1 was being verified again & again & ...
-- detect boot loader + device; if not detectible then _ask_
-- if run interactively, assume tape size is irrelevant & don't ask
-  for it; Mondo should handle end-of-tape gracefully now
-- worked on handling unknowng media size
-- added interactively_obtain_media_parameters_from_user()
-- when trying to mount CD-ROM, find_and_mount_actual_cd() will
-  now call find_cdrom_device() to try to find the /dev entry first
-- fixed serious bug in zero_out_a_device()
-- cleaned up some log_it() calls
-- fixed minor bug in find_cdrom_device()
-- better at distinguishing between live filesystem and ramdisk
-
-07/24/2002
-- created
 */
 

branches/2.2.6/mondo/src/common/libmondo-tools.c

@@ -996 +996 @@
     strcpy(bkpinfo->tmpdir,p);
     paranoid_free(tmp);
-
-    //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));  // for mondorestore
 }
 

branches/2.2.6/mondo/src/common/newt-specific.c

@@ -4 +4 @@
   subroutines which do display-type things
   and use the newt library to do them
-.
-
-10/02
-- tell user not to bother mailing list unless snapshot
-
-07/09
-- finish() calls g_erase_tmpdir_and_scratchdir to erase
-  tmpdir and scratchdir at end
-
-06/25
-- tried to fix newtFinished() segfault
-
-04/13/2004
-- lots of char[]'s are now *char's
-
-10/09/2003
-- allow DVD option for text-mode which_backup_type() too
-
-09/28
-- log_to_screen() now takes printf-like parameters
-
-09/26
-- b5 now means dvd (was udev)
-
-09/16
-- echo fatal error to screen before exiting
-- working on fatal_error()
-- swapped g_blurb2 and g_blurb3 in a few places to fix a GUI problem;
-  it shouldn't have worked! :) I think there's a mem-leak somewhere
-
-09/13
-- changed some '\n' occurrences to '\r\n'
-
-09/09
-- fixed silly bug in log_to_screen()
-
-07/02
-- modified popup_and_get_string()
-
-05/03
-- cleaned up fatal_error()
-
-04/30
-- fixed popup_changelist_*()
-
-04/27
-- replace newtFinished() and newtInit() with
-  newtSuspend() and newtResume()
-
-04/25
-- after comparing, popup the changelist for the user
-- moved the relevant code from compare_to_cds() into
-  compare_mode(), so that tape users may benefit too
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-- cleaned up a few uninitialized strings (valgrind)
-
-04/22
-- line 1181 - 'read from' (not 'restoring from')
-
-03/15/2003
-- fixed potentially infinite loop in log_to_screen (Tom Mortell)
-
-12/04/2002
-- changed "Pick file" to "Non-matching files"
-
-11/28
-- finish() now unregisters Mondo's pid
-
-10/28
-- unmount tmpfs if fatal_error
-
-10/04
-- more XMondo-related work
-- added some =NULL's in a few places
-
-09/01 - 09/30
-- write log_to_screen()'s string to stdout if in text mode
-- update_progress_form_FULL(), update_evalcall_form(),
-  popup_and_*(), ask_me_yes_or_no() now write
-  XMondo-friendly info to stdout if in text mode
-- if fatal error then popup and say what the fatal error is
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-- added popup_changelist_from_file(char*source_file, char*topic, void*call_if_entry_selected(void*));
-
-08/07
-- added some functions to let user choose backup dev + format
-
-07/27
-- created
 */