Changeset 1928 in MondoRescue

Timestamp:

Apr 18, 2008, 3:14:36 PM (16 years ago)

Author:

Bruno Cornec

Message:

• CopyImageToDisk in mindi removed as useless
• some comments improved in mondo

Location:

branches/2.2.6

Files:

• mindi/deplist.txt (modified) (2 diffs)
• mindi/mindi (modified) (1 diff)
• mondo/src/common/my-stuff.h (modified) (4 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.6/mindi/deplist.txt

@@ -42 +42 @@
 fdisk hdparm parted uname
 loadkeys
-# This line require absolute paths now !
+# These lines require absolute paths now !
 /bin/mount
 /sbin/mount.nfs /sbin/mount.nfs4 
@@ -49 +49 @@
 /sbin/mount.smb /sbin/mount.smb3
 /sbin/mount.smbfs /sbin/mount.smbfs3
-devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
 # helps for debugging
 /usr/bin/ldd
 /usr/bin/strace
+
+#
+devfsd burnBX burnK6 burnK7 burnMMX burnP5 burnP6 lucifer tiobench tiotest bonnie++ mprime ide-smart
 
 # For udev

branches/2.2.6/mindi/mindi

@@ -293 +293 @@
         incoming=`ReadLine`
     done
-}
-
-
-CopyImageToDisk() {
-    local image dev procno res comment
-    image=$1
-    dev=$2
-    comment=$3
-    [ ! -f "$image" ] && [ ! -b "$image" ] && Die "Image $image does not exist. Did you run out of disk space?"
-    Prompt "About to write $comment. Please press ENTER."
-    echo -en "Formatting disk..."
-    if which fdformat > /dev/null ; then
-        fdformat -n $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
-    elif which superformat > /dev/null ; then
-        superformat $dev > /dev/null 2> /dev/null || Die "Cannot format $dev - is your Linux distro broken?"
-    else
-        Die "Please install either fdformat or superformat."
-    fi
-    echo -en "\nWriting $comment"
-    if echo $image | grep "mindi-[r|b]oot\.1440" &> /dev/null ; then
-        cat $image > $dev &
-    else
-        dd if=$image of=$dev &> /dev/null &
-    fi
-    procno=$!
-    ps $procno > /dev/null 2> /dev/null
-    while [ "$?" -eq "0" ] ; do
-        sleep 3
-        echo -en "."
-        ps $procno > /dev/null 2> /dev/null
-    done
-    echo -e "$DONE"
-    LogIt "$comment has been written."
 }
 

branches/2.2.6/mondo/src/common/my-stuff.h

@@ -1 +1 @@
 /* my-stuff.h
    $Id$
-.
-
-
-07/14
-- ARCH_THREADS is now 2; buffers, 4
-
-07/10
-- added acl, xattr stuff
-
-06/19
-- added AUX_VER
-
-06/14
-- added DO_MBR_PLEASE
-
-04/17
-- replaced INTERNAL_TAPE_BLK_SIZE with g_internal_tape_block_size
-  and DEFAULT_INTERNAL_TAPE_BLOCK_SIZE
-
-04/13
-- log_msg is now calling standard_log_debug_msg, not the alias (log_debug_msg)
-
-04/03/2004
-- added star and SELINUX support
-
-11/20/2003
-- boot from isolinux.bin, not mindi-boot.2880.img
-
-11/15
-- reduced SLICE_SIZE from 8192 to 4096
-
-10/08
-- set p-i-h volsize to 1GB
-
-10/21
-- added MNT_CDROM and FREELOADER
-
-10/11
-- added DEFAULT_DVD_DISK_SIZE
-- added PARTIMAGE_DEBUG_LEVEL
-
-09/27
-- better logging
-
-09/24
-- added MR_LOGFILE="/tmp/mondo-restore.log"
-
-09/22
-- added bool, FALSE, TRUE
-
-09/20
-- increasd PPCFG_RAMDISK_SIZE to 150
-
-09/12
-- reduced MAX_STR_LEN from 512 to 460
-
-09/10
-- moved PPCFG_RAMDISK_SIZE here
-
-09/05
-- better config.h stuff
-
-06/05
-- changed fgrep to grep
-
-05/19
-- added CP_BIN
-
-05/05
-- added #include <sys/param.h> and sys/sem.h and ioctl.h
-
-05/03
-- added kill_anything_like_this()
-
-04/24/2003
-- added *STUB #define's
-
-11/22/2002
-- added INTERNAL_TAPE_BLK_SIZE
-
-10/10
-- use #define to create XMondo-friendly log file name if appropriate
-
-08/30
-- changed ARBITRARY_MAXIMUM to 512
-
-08/26
-- set MAX_STR_LEN at 512 but halved it within many _structures_
-- changed ARBITRARY_MAXIMUM to 128
-
-08/08
-- added '#include <signal.h>'
-- added WELCOME_STRING
-
-06/19
-- changed tape block size from 8192 to 65536
-
-04/08
-- added manual_cd_tray flag to bkpinfo
-
-03/31
-- added restore_path to struct s_bkpinfo
-
-03/21
-- updated version# to 1.42
-
-02/20
-- added bkpinfo->using_cdstream
-
-02/06
-- added MONDO_VERSION
-
-02/02
-- added MONDO_CFG_FILE
-- added SLICE_SIZE
-
-01/31
-- removed MINDI_HOME: it is unnecessary
-- replaced MONDO_HOME with variable g_mondo_home
-
-01/25
-- added MONDO_HOME, MINDI_HOME
-
-01/21
-- added s_node{} structure
-
-01/17
-- added sys/shm.h, types.h, ipc.h
-
-01/02/2002
-- added that groovy bkpinfo{} stuff
-
-11/29/2001
-- added raidlist{} struct
-
-08/27
-- stuff
 */
 
@@ -343 +206 @@
  * @c mkisofs command to generate a bootable CD using LILO, except for -o option and the directory to image.
  */
-// -b images/mindi-boot.2880.img
 #define MONDO_MKISOFS_REGULAR_LILO      "mkisofs -boot-info-table -no-emul-boot -b isolinux.bin -c boot.cat -boot-load-size 4 -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
 
@@ -349 +211 @@
  * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
  */
-// -b images/mindi-boot.2880.img
 // Should replace 8192 by IA64_BOOT_SIZE
 #define MONDO_MKISOFS_REGULAR_ELILO      "mkisofs -no-emul-boot -b images/mindi-bootroot.8192.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_"
@@ -365 +226 @@
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
-     */// -b images/mindi-boot.2880.img
+     */
 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-boot.2880.img -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 
 /**
  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
-     */// -b images/mindi-boot.2880.img
+     */
 #define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b isolinux.bin -c boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
 

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

@@ -2396 +2396 @@
             }
         } 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");
-            sprintf(command,
-                    "mount " MNT_CDROM
-                    "/images/mindi-boot.2880.img -o loop %s", mountpt);
-            sprintf(mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
-            if (!does_file_exist(mounted_cfgf_path)) {
-            */
                 log_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");