Changeset 1919


Ignore:
Timestamp:
Apr 17, 2008, 1:50:50 AM (11 years ago)
Author:
bruno
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.6/mindi/mindi

    r1914 r1919  
    169169    mkdir -p $bigdir/etc
    170170    #cp --parents -pRdf $mappath $bigdir 2>> $LOGFILE || LogIt "AKMF -- Could not copy $mappath to $bigdir"
    171     tar cf - $mappath 2>> $LOGFILE | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
     171    tar cf - $mappath 2>> /dev/null | (cd $bigdir ; tar xf -) || LogIt "AKMF -- Could not copy $mappath to $bigdir"
    172172    if [ "`echo $mappath | grep -F ".gz"`" ] ; then
    173173        included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
     
    24702470        LocateDeps $MINDI_LIB/rootfs/bin/busybox /bin/mount > $MINDI_TMP/busy.lis
    24712471        #cp --parents -Rdf `sort -u $MINDI_TMP/busy.lis` .
    2472         tar cf - $MINDI_LIB/rootfs/bin/busybox /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
     2472        tar cf - /bin/mount `sort -u $MINDI_TMP/busy.lis` 2> /dev/null | tar xf -
    24732473        rm -f $MINDI_TMP/busy.lis
    24742474    fi
  • branches/2.2.6/mondo/src/common/libmondo-devices.c

    r1917 r1919  
    11/* libmondo-devices.c                 Subroutines for handling devices
    22   $Id$
    3 .
    4 
    5 
    6 01/07/2005
    7 - sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs and (new) cifs
    8 
    9 10/23
    10 - if root mounted at '/dev/rd/' then say FALSE, not mounted on ramdisk
    11   just to please Fred Beondo :-p
    12 
    13 07/25
    14 - updated get_phys_size_of_drive() to support newer, larger drives
    15 
    16 07/18
    17 - better support of users who boot from LVM CD and nuke-restore non-LVM backups
    18 
    19 07/08
    20 - BLKGETSIZE64 instead of BLKGETIO..whatever (Joshua)
    21 - amended to use BLKGETSIZE if BLKGETSIZE64 missing (Hugo)
    22 - resort to HDIO_GETGEO if BLKGETSIZE and BLKGETSIZE63 fail
    23 
    24 
    25 06/25
    26 - added Mandrake 9.2 support to which_boot_loader()
    27 - cleaned up find_cdrom_device()
    28 
    29 06/23
    30 - rewrote resolve_softlinks_to_get_to_actual_device_file() in C
    31 
    32 06/17
    33 - don't use star automatically if SELINUX detected; let user do that
    34 
    35 05/07
    36 - usage of parted2fdisk instead of fdisk alone (ia32/ia64 compatibility)
    37   BCO
    38 
    39 04/17
    40 - replaced INTERNAL_TAPE_BLK_SIZE with bkpinfo->internal_tape_block_size
    41 
    42 04/13
    43 - if kernel >= 2.6 then ask for /dev entry, not SCSI node
    44 
    45 04/12
    46 - in mount_CDROM_...whatever, don't use bkpinfo_DONTUSETHIS to see if
    47   mounting a real CD device; look for /dev/ at start of $device instead
    48 
    49 04/04
    50 - when testing for tape drive, use INTERNAL_TAPE_BLK_SIZE, not TAPE_BLOCK_SIZE
    51 
    52 04/03
    53 - don't eject/retract drive if ISO
    54 
    55 02/23/2004
    56 - changed strstr() to strncmp() in a few places
    57 
    58 12/11/2003
    59 - if we can't find the DVD using dvdrecord then try it w/cdrecord
    60 
    61 11/15
    62 - changed a few []s to char*s
    63 - better support of multiple CD-ROM drives
    64 
    65 11/14
    66 - better find_cdrom_device(), to cope w/ multiple CD writers
    67 
    68 10/26
    69 - call 'mt -f %s offline' to eject tape drive in eject_device()
    70 
    71 10/25
    72 - ask user to confirm which NFS share to mount
    73 - improved which_boot_loader()
    74 
    75 10/22
    76 - tweaked find_cdrom_device() and find_cdrw_device()
    77 - created find_dvd_device()
    78 
    79 10/21
    80 - changed "/mnt/cdrom" to MNT_CDROM
    81 
    82 09/28
    83 - interactive gui no longer asks dvd's speed
    84 
    85 09/26
    86 - interactive gui now supports dvd
    87 
    88 09/23
    89 - malloc/free global strings in new subroutines - malloc_libmondo_global_strings()
    90   and free_libmondo_global_strings() - which are in libmondo-tools.c
    91 
    92 09/21
    93 - ask for CD size when backing up interactively
    94 - offer to exclude NFS shares if they're present
    95 
    96 09/20
    97 - exclude /dev/shm from sensibly_*()
    98 
    99 09/18
    100 - less verbose logging when insisting on CD #n
    101 
    102 09/09
    103 - added resolve_softlinks_to_get_to_actual_device_file()
    104 
    105 09/05
    106 - rewrote inisist_on_this_cd_number() and what_number_cd_is_this()
    107 
    108 09/02
    109 - is_this_a_valid_disk_format() -- treat ntfs (a.k.a. type 7) as recognized format
    110   just in case user's backup includes a partimagehack-imaged drive
    111 
    112 08/01 - 08/31
    113 - better boot-time tape detection
    114 - remove backup-time, erroneous, "remove floppy" msg
    115 - working on am_I_in_disaster_recovery_mode()
    116 - interactively_obtain_...() - pause & ask user to remove CD/floppy
    117 
    118 06/01 - 07/31
    119 - in which_boot_loader(), also search /dev/cciss for boot loader
    120 - fixed calls to popup_and_get_string()
    121 - fixed bug in get_phys_size_of_drive()
    122 - fixed bug in where_is_root_mounted()
    123 - commented out a spurious assert()
    124 
    125 05/01 - 05/31
    126 - superior get_phys_size_of_drive() (Joshua Oreman)
    127 - fixed call to inject_device() --- Andree L.
    128 - find_cdrom_device() now may, if asked to, mount drive if possible,
    129   to test that it has a CD in it; it then unmounts
    130 - mount_CDROM_here() now calls retract_cd_and_defeat_autorun() as well
    131 - fixed support for subdir-within-NFS-mount
    132 - cleaned up some FreeBSD-specific stuff
    133 - added Joshua Oreman's FreeBSD patches
    134 - mount_CDROM_here() --- mkdir -p mountpt
    135 - add older drive support to get_phys_size_of_drive()
    136 
    137 04/01 - 04/30
    138 - made which_boot_loader() more friendly towards Red Hat 9
    139 - find_and_mount_actual_cd() retracts all CD trays
    140 - added lots of log_OS_error()'s and assert()'s
    141 - fix ISO support in interactively_restore_...()
    142 - made find_cdrom_device() skip dmesg if second-stage string is empty
    143 - in find_cdrw_device(), find cdrecord before dvdrecord
    144 - fixed am_i_in_disaster_recovery_mode()
    145 - fixed insist_on_this_cd_number()
    146 
    147 03/01 - 03/31
    148 - more work on find_cdrom_device()
    149 - find_cdrom_device() --- if nonexistent/not found then
    150   make sure to return '' as dev str and 1 as res
    151 - cleaner find_cdrom_device(), to find DVD instead of CD-ROM
    152   as last resort
    153 - fix insist_on_this_cd_number()
    154 - add user the speed of CD writer, if writing
    155 - if root is /dev/root then assume not a ramdisk
    156 
    157 01/07 - 02/28
    158 - fixed find_cdrom_device (Stan Benoit)
    159 - if root is at /dev/root/root then LVM (not ramdisk)
    160 - fix am_I_in_disaster_recovery_mode() to recognize that /dev/rd/cp*
    161   entries are not ramdisks but RAID disks
    162 - find_cdrw_device() no longer complains to stderr if no cdrecord
    163 
    164 01/02/2003
    165 - sensibly_set_tmpdir_and_scratchdir() --- exclude smb and smbfs
    166 
    167 12/01/2002
    168 - don't ask for isodir path if in disaster recovery mode
    169 
    170 11/01 - 11/30
    171 - added g_restoring_live_from_cd;
    172 - handle_incoming_parameters() will sensibly set tmpdir and scratchdir
    173 - properly wipe spurious scratchdir and tmpdir
    174 - modified sensibly_...() to use tmp.mondo.* and mondo.scratch.*
    175   instead of mondo.tmpdir.* and mondo.scratchdir.*
    176 - line 861,912: set media_size[0] to 1999 as well as 1 thru N
    177 - chmod 700, not 770, in make_fifo()
    178 - sensibly_set_tmpdir_and_scratchdir() will now prefix a '/' to the
    179   strings if it is missing
    180 
    181 10/01 - 10/31
    182 - changed find_cdrom_device() to ignore DVD drives in the hd[a-d] search;
    183   consequently, the subroutine will try scd0, sr0, etc. afterwards
    184 - commented code
    185 - fixed obscure bug in find_and_mount_actual_cd()
    186 - code which sensibly configures tmpdir,scratchdir is now sep. sub.
    187 - changed sort -s to sort -n <-- sensibly...()
    188 
    189 09/01 - 09/30
    190 - added list_of_NFS_devices_and_mounts()
    191 - try /dev/st0 if no tape specified at all
    192 - change '64k' to TAPE_BLOCK_SIZE
    193 - improved find_cdrom_device()
    194 - if cdrecord not found then find_cdrom_device() returns 1
    195 - if disaster recovery mode then don't ask for CD-ROM's /dev entry;
    196   assume /dev/cdrom
    197 - if restoring data then ask for CD-ROM's /dev entry (not its SCSI node)
    198 - run_program_and_log_output() now takes boolean operator to specify
    199   whether it will log its activities in the event of _success_
    200 - changed sort -n +4 to sort -s +4 (Troff)
    201 - ask if user's kernel is sane; if 'no' then use FAILSAFE
    202 - ask user to confirm the tape/CD device name
    203 - if restoring (not archiving) then don't try to find CD-ROM's SCSI
    204   node; try to find its /dev entry instead
    205 - better detection of biggest partition
    206 
    207 08/01 - 08/31
    208 - fixed verify bug --- CD#1 was being verified again & again & ...
    209 - detect boot loader + device; if not detectible then _ask_
    210 - if run interactively, assume tape size is irrelevant & don't ask
    211   for it; Mondo should handle end-of-tape gracefully now
    212 - worked on handling unknowng media size
    213 - added interactively_obtain_media_parameters_from_user()
    214 - when trying to mount CD-ROM, find_and_mount_actual_cd() will
    215   now call find_cdrom_device() to try to find the /dev entry first
    216 - fixed serious bug in zero_out_a_device()
    217 - cleaned up some log_it() calls
    218 - fixed minor bug in find_cdrom_device()
    219 - better at distinguishing between live filesystem and ramdisk
    220 
    221 07/24/2002
    222 - created
    2233*/
    2244
  • branches/2.2.6/mondo/src/common/libmondo-tools.c

    r1917 r1919  
    996996    strcpy(bkpinfo->tmpdir,p);
    997997    paranoid_free(tmp);
    998 
    999     //sprintf(bkpinfo->tmpdir, "%s/tmpfs/mondo.tmp.%d", "/tmp", (int) (random() % 32768));  // for mondorestore
    1000998}
    1001999
  • branches/2.2.6/mondo/src/common/newt-specific.c

    r1899 r1919  
    44  subroutines which do display-type things
    55  and use the newt library to do them
    6 .
    7 
    8 10/02
    9 - tell user not to bother mailing list unless snapshot
    10 
    11 07/09
    12 - finish() calls g_erase_tmpdir_and_scratchdir to erase
    13   tmpdir and scratchdir at end
    14 
    15 06/25
    16 - tried to fix newtFinished() segfault
    17 
    18 04/13/2004
    19 - lots of char[]'s are now *char's
    20 
    21 10/09/2003
    22 - allow DVD option for text-mode which_backup_type() too
    23 
    24 09/28
    25 - log_to_screen() now takes printf-like parameters
    26 
    27 09/26
    28 - b5 now means dvd (was udev)
    29 
    30 09/16
    31 - echo fatal error to screen before exiting
    32 - working on fatal_error()
    33 - swapped g_blurb2 and g_blurb3 in a few places to fix a GUI problem;
    34   it shouldn't have worked! :) I think there's a mem-leak somewhere
    35 
    36 09/13
    37 - changed some '\n' occurrences to '\r\n'
    38 
    39 09/09
    40 - fixed silly bug in log_to_screen()
    41 
    42 07/02
    43 - modified popup_and_get_string()
    44 
    45 05/03
    46 - cleaned up fatal_error()
    47 
    48 04/30
    49 - fixed popup_changelist_*()
    50 
    51 04/27
    52 - replace newtFinished() and newtInit() with
    53   newtSuspend() and newtResume()
    54 
    55 04/25
    56 - after comparing, popup the changelist for the user
    57 - moved the relevant code from compare_to_cds() into
    58   compare_mode(), so that tape users may benefit too
    59 
    60 04/24
    61 - added lots of assert()'s and log_OS_error()'s
    62 - cleaned up a few uninitialized strings (valgrind)
    63 
    64 04/22
    65 - line 1181 - 'read from' (not 'restoring from')
    66 
    67 03/15/2003
    68 - fixed potentially infinite loop in log_to_screen (Tom Mortell)
    69 
    70 12/04/2002
    71 - changed "Pick file" to "Non-matching files"
    72 
    73 11/28
    74 - finish() now unregisters Mondo's pid
    75 
    76 10/28
    77 - unmount tmpfs if fatal_error
    78 
    79 10/04
    80 - more XMondo-related work
    81 - added some =NULL's in a few places
    82 
    83 09/01 - 09/30
    84 - write log_to_screen()'s string to stdout if in text mode
    85 - update_progress_form_FULL(), update_evalcall_form(),
    86   popup_and_*(), ask_me_yes_or_no() now write
    87   XMondo-friendly info to stdout if in text mode
    88 - if fatal error then popup and say what the fatal error is
    89 - run_program_and_log_output() now takes boolean operator to specify
    90   whether it will log its activities in the event of _success_
    91 - added popup_changelist_from_file(char*source_file, char*topic, void*call_if_entry_selected(void*));
    92 
    93 08/07
    94 - added some functions to let user choose backup dev + format
    95 
    96 07/27
    97 - created
    986*/
    997
Note: See TracChangeset for help on using the changeset viewer.