Changeset 2085 in MondoRescue for branches/2.2.8/mondo

Timestamp:

Dec 14, 2008, 3:32:33 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug on ia64 where an attempt to create boot.b was made (report Grassi Giuseppe giuseppe.grassi2_at_italtel.it)

Location:

branches/2.2.8/mondo/src

Files:

• common/libmondo-cli.c (modified) (2 diffs)
• restore-scripts/mondo/format-and-kludge-vfat (modified) (1 diff)

branches/2.2.8/mondo/src/common/libmondo-cli.c

@@ -1 +1 @@
 /***************************************************************************
-mondo-cli.c
--------------------
-begin                : Fri Apr 19 16:40:35 EDT 2002
-copyright        : (C) 2002 Mondo  Hugo Rabson
-email                : Hugo Rabson <hugorabson@msn.com>
-edited by            : by Stan Benoit 4/2002
-email                : troff@nakedsoul.org
-cvsid                : $Id$
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/***************************************************************************
-UPDATE LOG
-
-
-08/04
-- if user specifies a dumb -T value, abort
-
-07/22
-- handle -Q sensibly (don't abort if only -Q supplied)
-
-07/17
-- better checking of NFS dir's validity
-
-06/19
-- added AUX_VER
-
-04/17
-- added '-b' support
-04/03
-- added star support
-
-02/06
-- fixed "Please give /dev entry" error msg
-
-01/20/2004
-- added 2.6.x-kernel "device = /dev/...." support to param reader
-- better handling of SCSI and /dev entries
-- touch /boot/boot.b if necessary
-
-09/26/2003
-- typo in command-line handling of 'r'
-
-09/25
-- added DVD write support
-
-09/24
-- if tape backup (-t) but user doesn't specify tape drive then
-  make an educated guess using find_tape_device_and_size()
-
-09/18
-- insist on partimagehack being present if -x found
-
-09/16
-- added support for multiple -I's and -E's in call to mondoarchive
-- the '-D' flag doesn't take a value now
-
-07/14
-- fatal error if -E too short
-
-05/14
-- if 'n' and user doesn't have rights to write to output dir
-  then error out
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-05/04
-- added Herman Kuster's multi-level bkp patch
-
-05/02
-- write errors to screen, not just to log
-
-04/25
-- added lots of assert()'s and log_OS_error()'s
-
-04/21
-- line 570 --- resolve boot device if softlink
-
-04/08
-- changed a bunch of fprintf(stderr,...)'s to log_it()'s
-- fixed final / removal in retrieve_switches_from_command_line()
-
-04/04
-- added -e
-
-03/15
-- reject relative paths if -d flag (Alessandro Polverini)
-
-01/02/2003
-- added -J flag (to let user specify incoming filelist)
-
-12/13/2002
-- various strcpy() calls replaced with strncpy() calls
-
-12/10
-- added g_loglevel
-
-11/25
-- line 614 --- if commmand-line param ends in '/' then drop that '/'
-
-11/19
-- rewrote finish() to kill processes more softly
-- if user calls with '-l RAW' then 
-
-09/01 - 09/30
-- added -N to let user exclude all NFS-related mounts and devices
-- run_program_and_log_output() now takes boolean operator to specify
-  whether it will log its activities in the event of _success_
-
-08/01 - 08/31
-- if no device specified when backing up to tape streamer then assume /dev/st0
-- abort if tape user specifies tape size (just for testing porpoises)
-- tape users no longer need to specify tape size
-- added some comments
-- added bkpinfo->backup_media_type
-- renamed from mondo-archive.c to mondo-cli.c
-
-07/01 - 07/31
-- better check for mkfs.vfat
-- more sanity-checking for -d flag
-- if isodir does not exist then abort
-- removed "the rest are..." comment from log
-- do not permit '-H' and '-t' in the same command line
-- if not '-o' then insist on vfat-friendly kernel
-
-06/01 - 06/30
-- added signal-trapping
-- added '-W' (won't make bootable CD or floppies) flag
-- added missing 'j++' to -s switch's code
-- expanded -s switch
-- added -u switch
-- if dvdrecord exists and cdrecord doesn't then use
-  dvdrecord instead of cdrecord
-
-04/01 - 04/30
-- if CD-ROM is supermounted then unmount, run, and remount
-- replace MONDO_VERSION #define with VERSION from ../config.h
-- if CD-ROM is mounted at start then abort
-- improved homedir-locating code
-- improved "backup will occupy N CD's" calculation a bit
-- added -m (manual CD tray) flag
-
-
+$Id$
 *******************************************************************/
 
@@ -1534 +1383 @@
     /* We force ELILO usage on IA64 */
     bkpinfo->make_cd_use_lilo = TRUE;
+
+    if (bkpinfo->make_cd_use_lilo && !does_file_exist("/boot/boot.b")) {
+        paranoid_system("touch /boot/boot.b");
+    }
 #endif
 #endif
-
-    if (bkpinfo->make_cd_use_lilo && !does_file_exist("/boot/boot.b")) {
-        paranoid_system("touch /boot/boot.b");
-    }
 
     if (! bkpinfo->restore_data) {

branches/2.2.8/mondo/src/restore-scripts/mondo/format-and-kludge-vfat

@@ -54 +54 @@
 if [ "$#" -eq "2" ] ; then
     LogIt "Note: Script called with two parameters. Only one needed - the device." 1
-    LogIt "      Embleer files are gorn - please ask Hugo to update his code. ;-)" 1
+    LogIt "      Embleer files are gorn - please ask DevTeam to update his code. ;-)" 1
 elif [ "$#" -ne "1" ] ; then
     LogIt "Usage: format-and-kludge-vfat <device>" 1