Changeset 729


Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (13 years ago)
Author:
bruno
Message:

merge -r686:728 $SVN_M/branches/stable

Location:
trunk
Files:
1 added
43 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/mindi-kernel/distributions/mandriva/spec.m4

    r554 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `')dnl
  • trunk/mindi-kernel/distributions/redhat/spec.m4

    r554 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `')dnl
  • trunk/mindi-kernel/distributions/suse/spec.m4

    r554 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, syslinux')dnl
  • trunk/mindi/.config-busybox-i386.net

    r414 r729  
    33#
    44HAVE_DOT_CONFIG=y
     5
     6#
     7# Busybox Settings
     8#
    59
    610#
     
    2529#
    2630CONFIG_STATIC=y
     31# CONFIG_DISABLE_SHARED is not set
     32# CONFIG_BUILD_LIBBUSYBOX is not set
     33# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
     34# CONFIG_FEATURE_SHARED_BUSYBOX is not set
    2735CONFIG_LFS=y
    2836# USING_CROSS_COMPILER is not set
    2937CROSS_COMPILER_PREFIX=""
    3038EXTRA_CFLAGS_OPTIONS=""
     39# CONFIG_BUILD_AT_ONCE is not set
     40
     41#
     42# Debugging Options
     43#
     44# CONFIG_DEBUG is not set
     45# CONFIG_NO_DEBUG_LIB is not set
     46# CONFIG_DMALLOC is not set
     47# CONFIG_EFENCE is not set
     48CONFIG_DEBUG_YANK_SUSv2=y
    3149
    3250#
     
    3452#
    3553# CONFIG_INSTALL_NO_USR is not set
     54CONFIG_INSTALL_APPLET_SYMLINKS=y
     55# CONFIG_INSTALL_APPLET_HARDLINKS is not set
     56# CONFIG_INSTALL_APPLET_DONT is not set
    3657PREFIX="./_install"
     58
     59#
     60# Busybox Library Tuning
     61#
     62CONFIG_MD5_SIZE_VS_SPEED=2
     63
     64#
     65# Applets
     66#
    3767
    3868#
     
    5484CONFIG_FEATURE_TAR_CREATE=y
    5585CONFIG_FEATURE_TAR_BZIP2=y
     86# CONFIG_FEATURE_TAR_LZMA is not set
    5687# CONFIG_FEATURE_TAR_FROM is not set
    5788CONFIG_FEATURE_TAR_GZIP=y
     
    6192# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
    6293# CONFIG_UNCOMPRESS is not set
     94# CONFIG_UNLZMA is not set
     95# CONFIG_FEATURE_LZMA_FAST is not set
    6396# CONFIG_UNZIP is not set
    6497
     
    69102# CONFIG_FEATURE_DEB_TAR_GZ is not set
    70103# CONFIG_FEATURE_DEB_TAR_BZ2 is not set
     104# CONFIG_FEATURE_DEB_TAR_LZMA is not set
    71105
    72106#
     
    85119CONFIG_CUT=y
    86120CONFIG_DATE=y
    87 
    88 #
    89 # date (forced enabled for use with watch)
    90 #
    91121CONFIG_FEATURE_DATE_ISOFMT=y
    92122CONFIG_DD=y
     
    101131CONFIG_ENV=y
    102132CONFIG_EXPR=y
     133# CONFIG_EXPR_MATH_SUPPORT_64 is not set
    103134CONFIG_FALSE=y
    104135# CONFIG_FOLD is not set
     
    150181CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
    151182CONFIG_TEST=y
    152 
    153 #
    154 # test (forced enabled for use with shell)
    155 #
    156183# CONFIG_FEATURE_TEST_64 is not set
    157184CONFIG_TOUCH=y
     
    178205
    179206#
    180 # Common options for ls and more
     207# Common options for ls, more and telnet
    181208#
    182209CONFIG_FEATURE_AUTOWIDTH=y
     
    216243# CONFIG_START_STOP_DAEMON is not set
    217244CONFIG_WHICH=y
    218 
    219 #
    220 # Linux Ext2 FS Progs
    221 #
    222 # CONFIG_CHATTR is not set
    223 # CONFIG_E2FSCK is not set
    224 # CONFIG_FSCK is not set
    225 # CONFIG_LSATTR is not set
    226 # CONFIG_MKE2FS is not set
    227 # CONFIG_TUNE2FS is not set
    228 # CONFIG_E2LABEL is not set
    229 # CONFIG_FINDFS is not set
    230245
    231246#
     
    253268CONFIG_FIND=y
    254269CONFIG_FEATURE_FIND_MTIME=y
     270CONFIG_FEATURE_FIND_MMIN=y
    255271CONFIG_FEATURE_FIND_PERM=y
    256272CONFIG_FEATURE_FIND_TYPE=y
     
    274290# CONFIG_INIT is not set
    275291# CONFIG_FEATURE_USE_INITTAB is not set
    276 # CONFIG_FEATURE_INITRD is not set
    277 # CONFIG_FEATURE_INIT_COREDUMPS is not set
    278292# CONFIG_FEATURE_INIT_SCTTY is not set
    279293# CONFIG_FEATURE_EXTRA_QUIET is not set
     294# CONFIG_FEATURE_INIT_COREDUMPS is not set
     295# CONFIG_FEATURE_INITRD is not set
    280296CONFIG_HALT=y
    281297CONFIG_MESG=y
    282 CONFIG_POWEROFF=y
    283 CONFIG_REBOOT=y
    284298
    285299#
    286300# Login/Password Management Utilities
    287301#
     302# CONFIG_FEATURE_SHADOWPASSWDS is not set
     303# CONFIG_USE_BB_SHADOW is not set
    288304# CONFIG_USE_BB_PWD_GRP is not set
    289305# CONFIG_ADDGROUP is not set
     
    300316# CONFIG_SULOGIN is not set
    301317# CONFIG_VLOCK is not set
    302 # CONFIG_FEATURE_SHADOWPASSWDS is not set
    303 # CONFIG_USE_BB_SHADOW is not set
     318
     319#
     320# Linux Ext2 FS Progs
     321#
     322# CONFIG_CHATTR is not set
     323# CONFIG_E2FSCK is not set
     324# CONFIG_FSCK is not set
     325# CONFIG_LSATTR is not set
     326# CONFIG_MKE2FS is not set
     327# CONFIG_TUNE2FS is not set
     328# CONFIG_E2LABEL is not set
     329# CONFIG_FINDFS is not set
     330
     331#
     332# Linux Module Utilities
     333#
     334CONFIG_INSMOD=y
     335# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
     336# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
     337# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
     338# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
     339# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
     340CONFIG_RMMOD=y
     341CONFIG_LSMOD=y
     342CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
     343CONFIG_MODPROBE=y
     344CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
     345
     346#
     347# Options common to multiple modutils
     348#
     349# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
     350CONFIG_FEATURE_2_4_MODULES=y
     351CONFIG_FEATURE_2_6_MODULES=y
     352# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
     353
     354#
     355# Linux System Utilities
     356#
     357CONFIG_DMESG=y
     358# CONFIG_FBSET is not set
     359# CONFIG_FEATURE_FBSET_FANCY is not set
     360# CONFIG_FEATURE_FBSET_READMODE is not set
     361CONFIG_FDFLUSH=y
     362CONFIG_FDFORMAT=y
     363# CONFIG_FDISK is not set
     364FDISK_SUPPORT_LARGE_DISKS=y
     365# CONFIG_FEATURE_FDISK_WRITABLE is not set
     366# CONFIG_FEATURE_AIX_LABEL is not set
     367# CONFIG_FEATURE_SGI_LABEL is not set
     368# CONFIG_FEATURE_SUN_LABEL is not set
     369# CONFIG_FEATURE_OSF_LABEL is not set
     370# CONFIG_FEATURE_FDISK_ADVANCED is not set
     371CONFIG_FREERAMDISK=y
     372# CONFIG_FSCK_MINIX is not set
     373# CONFIG_MKFS_MINIX is not set
     374# CONFIG_FEATURE_MINIX2 is not set
     375# CONFIG_GETOPT is not set
     376# CONFIG_HEXDUMP is not set
     377CONFIG_HWCLOCK=y
     378CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
     379CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
     380# CONFIG_IPCRM is not set
     381# CONFIG_IPCS is not set
     382CONFIG_LOSETUP=y
     383# CONFIG_MDEV is not set
     384# CONFIG_FEATURE_MDEV_CONF is not set
     385CONFIG_MKSWAP=y
     386CONFIG_MORE=y
     387CONFIG_FEATURE_USE_TERMIOS=y
     388CONFIG_MOUNT=y
     389CONFIG_FEATURE_MOUNT_NFS=y
     390CONFIG_PIVOT_ROOT=y
     391# CONFIG_RDATE is not set
     392# CONFIG_READPROFILE is not set
     393# CONFIG_SETARCH is not set
     394CONFIG_SWAPONOFF=y
     395# CONFIG_SWITCH_ROOT is not set
     396CONFIG_UMOUNT=y
     397# CONFIG_FEATURE_UMOUNT_ALL is not set
     398
     399#
     400# Common options for mount/umount
     401#
     402CONFIG_FEATURE_MOUNT_LOOP=y
     403# CONFIG_FEATURE_MTAB_SUPPORT is not set
    304404
    305405#
     
    336436# CONFIG_MOUNTPOINT is not set
    337437CONFIG_MT=y
    338 # BB_APPLET_RUNLEVEL is not set
     438# CONFIG_RUNLEVEL is not set
    339439# CONFIG_RX is not set
    340440CONFIG_STRINGS=y
     
    344444
    345445#
    346 # Linux Module Utilities
    347 #
    348 CONFIG_INSMOD=y
    349 CONFIG_FEATURE_2_4_MODULES=y
    350 CONFIG_FEATURE_2_6_MODULES=y
    351 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
    352 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
    353 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
    354 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
    355 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
    356 CONFIG_LSMOD=y
    357 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
    358 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
    359 CONFIG_MODPROBE=y
    360 CONFIG_RMMOD=y
    361 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
    362 
    363 #
    364446# Networking Utilities
    365447#
    366448# CONFIG_FEATURE_IPV6 is not set
    367449# CONFIG_ARPING is not set
     450# CONFIG_DNSD is not set
    368451# CONFIG_ETHER_WAKE is not set
    369452# CONFIG_FAKEIDENTD is not set
     
    379462# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
    380463# CONFIG_FEATURE_HTTPD_CGI is not set
     464# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
    381465# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
    382466# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
     
    533617CONFIG_KLOGD=y
    534618CONFIG_LOGGER=y
    535 
    536 #
    537 # Linux System Utilities
    538 #
    539 CONFIG_DMESG=y
    540 # CONFIG_FBSET is not set
    541 # CONFIG_FEATURE_FBSET_FANCY is not set
    542 # CONFIG_FEATURE_FBSET_READMODE is not set
    543 CONFIG_FDFLUSH=y
    544 CONFIG_FDFORMAT=y
    545 # CONFIG_FDISK is not set
    546 FDISK_SUPPORT_LARGE_DISKS=y
    547 # CONFIG_FEATURE_FDISK_WRITABLE is not set
    548 # CONFIG_FEATURE_AIX_LABEL is not set
    549 # CONFIG_FEATURE_SGI_LABEL is not set
    550 # CONFIG_FEATURE_SUN_LABEL is not set
    551 # CONFIG_FEATURE_OSF_LABEL is not set
    552 # CONFIG_FEATURE_FDISK_ADVANCED is not set
    553 CONFIG_FREERAMDISK=y
    554 # CONFIG_FSCK_MINIX is not set
    555 # CONFIG_MKFS_MINIX is not set
    556 # CONFIG_FEATURE_MINIX2 is not set
    557 # CONFIG_GETOPT is not set
    558 # CONFIG_HEXDUMP is not set
    559 CONFIG_HWCLOCK=y
    560 CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
    561 CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
    562 # CONFIG_IPCRM is not set
    563 # CONFIG_IPCS is not set
    564 CONFIG_LOSETUP=y
    565 CONFIG_MKSWAP=y
    566 CONFIG_MORE=y
    567 CONFIG_FEATURE_USE_TERMIOS=y
    568 CONFIG_PIVOT_ROOT=y
    569 # CONFIG_SWITCH_ROOT is not set
    570 # CONFIG_RDATE is not set
    571 # CONFIG_READPROFILE is not set
    572 CONFIG_SWAPONOFF=y
    573 CONFIG_MOUNT=y
    574 CONFIG_FEATURE_MOUNT_NFS=y
    575 CONFIG_UMOUNT=y
    576 
    577 #
    578 # Common options for mount/umount
    579 #
    580 CONFIG_FEATURE_MOUNT_LOOP=y
    581 # CONFIG_FEATURE_MTAB_SUPPORT is not set
    582 
    583 #
    584 # Debugging Options
    585 #
    586 # CONFIG_DEBUG is not set
    587 # CONFIG_NO_DEBUG_LIB is not set
    588 # CONFIG_DMALLOC is not set
    589 # CONFIG_EFENCE is not set
  • trunk/mindi/analyze-my-lvm

    r687 r729  
    259259    echo "# echo y | $LVMCMD pvcreate -ff $i"
    260260done
    261 echo "# $LVMCMD vgscan; echo"
     261echo "# $LVMCMD vgscan"
    262262echo ""
    263263echo "Create and activate the VG's (volume groups)."
  • trunk/mindi/distributions/mandriva/spec.m4

    r561 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, which, grep >= 2.5')dnl
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Archiving/Backup')dnl
     9dnl OBS is replaced with what is being obsoleted
     10define(`OBS', `')dnl
  • trunk/mindi/distributions/redhat/spec.m4

    r561 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, which, grep >= 2.5')dnl
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Applications/Archiving')dnl
     9dnl OBS is replaced with what is being obsoleted
     10define(`OBS', )dnl
  • trunk/mindi/distributions/rpm/mindi.spec

    r600 r729  
    22# $Id$
    33#
    4 %define mrel    RRR
    5 %define tag     TTT
    6 
    74Summary:    Mindi creates emergency boot disks/CDs using your kernel, tools and modules
    85Name:       mindi
    96Version:    VVV
    10 Release:    %mrel
     7Release:    RRR
    118License:    GPL
    129Group:      GRP
     
    1512BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    1613Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools DDD
     14OBS
    1715# Not on all systems
    1816#Conflicts: bonnie++
     
    2523
    2624%prep
    27 %setup -n %name-%{version}-%{tag}
     25%setup -n %name-%{version}
    2826
    2927%build
     
    5250
    5351%files
     52%defattr(-,root,root)
    5453%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    5554%config(noreplace) %{_sysconfdir}/mindi/deplist.d/*
  • trunk/mindi/distributions/suse/spec.m4

    r561 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, syslinux')dnl
    77dnl GRP is replaced by the RPM group of apps
    88define(`GRP', `Productivity/Archiving/Backup')dnl
     9dnl OBS is replaced with what is being obsoleted
     10define(`OBS', `')dnl
  • trunk/mindi/mindi

    r687 r729  
    124124FLOPPY_MODS="ide-floppy floppy"
    125125TAPE_MODS="ht st osst ide-tape ide_tape"
    126 SCSI_MODS="3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
     126SCSI_MODS="3w-xxxx 53c7,8xx a100u2w a320raid aacraid advansys aha152x aha1542 aha1740 aic79xx aic79xx_mod aic7xxx aic7xxx_mod aic7xxx_old AM53C974 atp870u BusLogic cciss cpqfc dmx3191d dpt_i2o dtc eata eata_dma eata_pio fdomain gdth g_NCR5380 i2o_block i2o_core ide-scsi ieee1394 imm in2000 initio ips iscsi isp megaraid mptbase mptscsih NCR53c406a ncr53c8xx nsp32 pas16 pci2000 pci2220i pcmcia ppa psi240i qla1280 qla2200 qla2300 qlogicfas qlogicfc qlogicisp raw1394 scsi_debug scsi_mod sd_mod seagate sg sim710 sr_mod sym53c416 sym53c8xx sym53c8xx_2 t128 tmscsim u14-34f ultrastor wd7000 vmhgfs"
    127127
    128128# ide-probe-mod
     
    821821    done
    822822    if  [ "$incoming" = "LVMFILES:" ] ; then
    823     incoming=`ReadLine`
    824     lvmversion=""
     823        incoming=`ReadLine`
     824        lvmversion=""
    825825    while [ "$incoming" != "" ] ; do
    826826        if echo "$incoming" | grep -x " *#.*" &> /dev/null ; then
    827 #       echo "Skipping '$incoming'"
    828         incoming=`ReadLine`
    829         continue
     827            incoming=`ReadLine`
     828            continue
    830829        fi
    831830        filelist=`GenerateListForFile "$incoming"`
     
    833832            lvmresolved=`ResolveSoftlink $tool`
    834833            if [ "$tool" == "$lvmresolved" ]; then
    835             echo "$tool" >> $tempfile
     834                echo "$tool" >> $tempfile
    836835            elif echo "$lvmresolved" | grep "lvmiopversion" &> /dev/null ; then
    837             if [ "$lvmversion" = "" ] ; then
    838             lvmversion=`$lvmresolved`
    839             echo "$lvmresolved" >> $tempfile
    840             fi
    841             toolstripped=`echo $tool | $AWK -F / '{print $NF;}'`
    842             if [ "$lvmversion" == "200" ]; then
    843             # pvdata and lvmcreate_initrd don't exist in LVM2
    844             case "$toolstripped" in
    845                 "pvdata")
    846                 continue
    847                 ;;
    848                 "lvmcreate_initrd")
    849                 continue
    850                 ;;
    851             esac
    852             fi
    853             toolpath="/sbin/lvm-"$lvmversion"/"$toolstripped
    854             if [ -e "$toolpath" ] ; then
    855             echo "$toolpath" >> $tempfile
    856             echo "$tool" >> $tempfile
    857             else
    858             toolpath="/lib/lvm-"$lvmversion"/"$toolstripped
    859             fi
    860             if [ -e "$toolpath" ] ; then
    861             echo "$toolpath" >> $tempfile
    862             echo "$tool" >> $tempfile
    863             else
    864             echo "Where are your LVM-Tools? Couldn't find $tool"
    865             fi
    866         else
    867             echo "$tool" >> $tempfile
    868         fi
     836                if [ "$lvmversion" = "" ] ; then
     837                    lvmversion=`$lvmresolved`
     838                    echo "$lvmresolved" >> $tempfile
     839                fi
     840                toolstripped=`echo $tool | $AWK -F / '{print $NF;}'`
     841                if [ "$lvmversion" == "200" ]; then
     842                    # pvdata and lvmcreate_initrd don't exist in LVM2
     843                    case "$toolstripped" in
     844                    "pvdata")
     845                        continue
     846                        ;;
     847                    "lvmcreate_initrd")
     848                        continue
     849                        ;;
     850                    esac
     851                fi
     852                toolpath="/sbin/lvm-"$lvmversion"/"$toolstripped
     853                if [ -e "$toolpath" ] ; then
     854                    echo "$toolpath" >> $tempfile
     855                    echo "$tool" >> $tempfile
     856                else
     857                    toolpath="/lib/lvm-"$lvmversion"/"$toolstripped
     858                fi
     859                if [ -e "$toolpath" ] ; then
     860                    echo "$toolpath" >> $tempfile
     861                    echo "$tool" >> $tempfile
     862                else
     863                    echo "Where are your LVM-Tools? Couldn't find $tool"
     864                fi
     865            else
     866                echo "$tool" >> $tempfile
     867            fi
    869868        done
    870869        progress=$(($progress+1))
     
    13891388    [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`"
    13901389    printf "        %-15s %-15s %-15s %-15s\n" DEVICE MOUNTPOINT FORMAT "SIZE (MB)"
     1390    useless_dev="/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw /dev/scd /dev/ram :/ /dev/sr0 /dev/sr1 /dev/cdrom1"
    13911391    for c_p in $all_partitions ; do
    13921392#        echo "c_p = $c_p" > /dev/stderr
    1393         [ "`echo "/dev/floppy /dev/fd0h1440 /dev/fd0H1440 /dev/cdrom /dev/cdrom/cdrom /dev/cdrom/cdrom1 /dev/cdrom/cdrom2 /dev/cdrom0 /dev/cdrom1 /dev/cdrom2 /dev/cdrom3 /dev/cdrw" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep -F "/dev/scd"`" != "" ] || [ "`echo "$c_p" | grep -F "/dev/ram"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] || [ "`echo "$c_p" | grep -F ":/"`" != "" ] && continue
    1394         [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | grep -F "$c_p"`" ] && continue
     1393        [ "`echo "$useless_dev" | grep -F "$c_p"`" != "" ] || [ "`echo "$c_p" | grep ":"`" != "" ] && continue
    13951394        [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue
    13961395        if [ -h "$c_p" ] && [ "`echo "$c_p" | grep -F "/dev/hd"`" = "" ] && [ "`echo "$c_p" | grep -F "/dev/sd"`" = "" ] && [ "`echo "$c_p" | grep -F "/dev/md"`" = "" ] ; then
    13971396            current_partition=`ResolveSoftlink $c_p`
    13981397            [ "`echo "$current_partition" | grep -F "/dev/mapper"`" != "" ] && current_partition="$c_p"
    1399             [ "`echo "/dev/scd0 /dev/scd1 /dev/sr0 /dev/sr1 /dev/cdrom /dev/cdrom1" | grep -F "$current_partition"`" ] && continue
     1398            [ "`echo "$useless_dev" | grep -F "$current_partition"`" ] && continue
    14001399        else
    14011400            current_partition="$c_p"
    14021401        fi
    14031402        [ "$c_p" = "none" ] && continue
     1403        redhat_label=""
    14041404        absolute_partition=`ResolveSoftlink $c_p`
    14051405        partition_mountpt=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $2}' | head -n1`
     1406
     1407        # Detects noauto partitions not mounted and exclude them
     1408        partition_option=`tr -s '\t' ' ' < $MY_FSTAB | /bin/grep -w "$current_partition" | /bin/grep -vx " *#.*" | $AWK '{print $4}' | head -n1`
     1409        if [ "`echo "$partition_option" | grep -i noauto`" != "" ] && [ "`mount | grep -w "$partition_mountpt"`" =  "" ] ; then
     1410            continue
     1411        fi
    14061412
    14071413        # This part tries to retrieve the correct device from a LABEL line in /etc/fstab
     
    14121418            actual_dev=""
    14131419   
    1414         # 1st try : blkid, the good way
    1415         if [ -x "/sbin/blkid" ]; then
    1416             actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1`
    1417         fi
    1418 
    1419         # 2nd try, which works on a standard partition (ext2/3), but not on swap
    1420         if [ "x$actual_dev" = "x" ]; then
    1421             actual_dev=`/bin/mount -l | /bin/grep "\[$redhat_label\]" | /bin/cut -d' ' -f1`
    1422         fi
    1423 
    1424         # 3rd try, with vol_id (which works with swap)
    1425         if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
     1420            # 1st try : blkid, the good way
     1421            if [ -x "/sbin/blkid" ]; then
     1422                actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1`
     1423            fi
     1424   
     1425            # 2nd try, which works on a standard partition (ext2/3), but not on swap
     1426            if [ "x$actual_dev" = "x" ]; then
     1427                actual_dev=`/bin/mount -l | /bin/grep "\[$redhat_label\]" | /bin/cut -d' ' -f1`
     1428            fi
     1429   
     1430            # 3rd try, with vol_id (which works with swap)
     1431            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
    14261432                list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' `
    14271433                for dev_swap in $list_swaps ; do
     
    14321438                    fi
    14331439                done
    1434         fi
    1435 
    1436         # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
    1437         if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -i 'LABEL=SWAP'`" != _"" ]; then
     1440            fi
     1441
     1442            # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda5
     1443            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -i 'LABEL=SWAP'`" != _"" ]; then
    14381444                try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
    14391445                present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
     
    14411447                    actual_dev="/dev/$try_dev"
    14421448                fi
    1443         fi
    1444 
    1445         # Check if one of all those tries has known success
    1446         if [ "x$actual_dev" != "x" ]; then
     1449            fi
     1450
     1451            # Check if one of all those tries has known success
     1452            if [ "x$actual_dev" != "x" ]; then
    14471453                current_partition=$actual_dev
     1454            else
     1455                Die "Your system uses a labelled swap partition, but you lack the tool to support it.\nPlease replace swap labels with their correct devices in /etc/fstab or install blkid|vol_id\n"
     1456            fi
    14481457        else
    1449             Die "Your system uses a labelled swap partition, but you lack the tool to support it.\nPlease replace swap labels with their correct devices in /etc/fstab\n"
    1450         fi
    1451     else
    1452         str_to_find_fmt_with=$current_partition
    1453     fi
     1458            str_to_find_fmt_with=$current_partition
     1459        fi
    14541460
    14551461    partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB`
     
    15521558    elif [ "$partition_mountpt" = "" ] && [ -f "/etc/raidtab" ] ; then
    15531559        if [ "`grep -F device /etc/raidtab 2>/dev/null | grep -F $current_partition`" ] ; then
    1554         partition_mountpt=raid
    1555         partition_format=raid
     1560            partition_mountpt=raid
     1561            partition_format=raid
    15561562            printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label"
    1557                 printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
     1563            printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist
    15581564        else
    1559         echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
     1565            echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE
    15601566        fi
    15611567        elif [ "$partition_format" = "" ] ; then
  • trunk/mindi/parted2fdisk.pl

    r588 r729  
    4444    $arch = $ENV{ARCH};
    4545} else {
    46     $arch = `"uname -m"`;
     46    $arch = `uname -m`;
    4747    chomp($arch);
    4848}
  • trunk/mondo-doc/distributions/mandriva/spec.m4

    r554 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
  • trunk/mondo-doc/distributions/redhat/spec.m4

    r554 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
  • trunk/mondo-doc/distributions/rpm/mondo-doc.spec

    r600 r729  
    22# $Id$
    33#
    4 
    5 %define mrel    RRR
    6 %define tag     TTT
    74
    85Summary:    Documentation for Mondo Rescue
     
    118Name:       mondo-doc
    129Version:    VVV
    13 Release:    %{mrel}
     10Release:    RRR
    1411License:    GPL
    1512Group:      GRP
     
    2724
    2825%prep
    29 %setup -q -n %name-%{version}-%{tag}
     26%setup -q -n %name-%{version}
    3027
    3128%build
     
    4239
    4340%files
     41%defattr(-,root,root)
    4442%doc svn.log
    4543%doc mindi.8 mondoarchive.8 mondorestore.8
  • trunk/mondo-doc/distributions/suse/spec.m4

    r554 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, buffer, cdrecord')dnl
  • trunk/mondo-doc/images

    • Property svn:keyword set to Id
  • trunk/mondo-doc/mondoarchive.8

    r588 r729  
    151151the mountlist. NB: If you exclude /dev/sdd4 then the /dev entry itself will
    152152still be backed up, even though the mountlist entry will be suppressed.
     153NOTA: If you precise a directory with a final / its content will be archived so it won't do what you expect.
    153154
    154155.TP
  • trunk/mondo-doc/mondorescue-howto.sgml

    r588 r729  
    10491049<entry>
    10501050bash# cd mondo-2.xx
     1051        </entry>
     1052</row>
     1053<row>
     1054<entry>
     1055        bash# ./configure
    10511056        </entry>
    10521057</row>
  • trunk/mondo/ChangeLog

    r687 r729  
    33MONDO CHANGES
    44
    5 2.2.0-1 (2006-06-12)
     52.3.0 (2006-07-30)
    66- indent on source files
    77- asprintf used instead of malloc_string + sprintf/strcpy/strcat without verifications. Optimisations on memory consumption (allocate only size needed + remove memory leaks) (Bruno Cornec)
    88- Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task)
    99
    10 2.0.9 (2006-06-26)
     102.0.9 (2006-07-30)
     11- Fix various screen corruption for 'Configure LVM'/RAID sync (Andree Leidenfrost)
     12- SuSE RPMS now use bzip2 (Lars Rupp/Bruno Cornec)
     13- Exclude mvfs type of filesystem (ClearCase) from mondo backup (Bruno Cornec)
     14- Improved .spec Requires (Fedora/SuSE feedbacks) (Bruno Cornec)
    1115- nfsmount option added to allow redeployment from another NFS server (Bruno Cornec)
    1216- Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost)
  • trunk/mondo/distributions/mandriva/spec.m4

    r561 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.bz2')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
     
    88define(`GRP', `Archiving/Backup')dnl
    99dnl OBS is replaced with what is being obsoleted
    10 define(`OBS', `Obsoletes:   libmondo <= 2.04
     10define(`OBS', `Obsoletes:   libmondo
    1111Provides:   libmondo')dnl
  • trunk/mondo/distributions/redhat/spec.m4

    r561 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', )dnl
  • trunk/mondo/distributions/rpm/mondo.spec

    r588 r729  
    33#
    44
    5 %define mrel    RRR
    6 %define tag     TTT
    7 # if mandriva official build (rpm --with is_official)
    8 %{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
    9 %define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1 DDD
     5%define addreq  mindi >= 1.0.7, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, DDD
    106
    117Summary:    A program which a Linux user can utilize to create a rescue/restore CD/tape
     
    1612Name:       mondo
    1713Version:    VVV
    18 Release:    %{mrel}
     14Release:    RRR
    1915License:    GPL
    2016Group:      GRP
     
    2218Source:     SSS
    2319BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
    24 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
     20BuildRequires:  newt-devel >= 0.50, gcc
    2521OBS
    2622%ifarch ia64
     
    5955
    6056%prep
    61 %setup -q -n %name-%{version}-%{tag}
     57%setup -q -n %name-%{version}
    6258
    6359%build
     
    7672
    7773%files
     74%defattr(-,root,root)
    7875%doc ChangeLog svn.log
    7976%doc INSTALL COPYING README TODO AUTHORS NEWS
  • trunk/mondo/distributions/suse/spec.m4

    r561 r729  
    22dnl
    33dnl SSS is replaced by the source package format
    4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-%{tag}.tar.gz')dnl
     4define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl
    55dnl DDD is replaced by the list of dependencies specific to that distro
    66define(`DDD', `, buffer, cdrecord')dnl
     
    88define(`GRP', `Productivity/Archiving/Backup')dnl
    99dnl OBS is replaced vy what is being obsoleted
    10 define(`OBS', )dnl
     10define(`OBS', `Obsoletes: mondo <= 2.06')dnl
  • trunk/mondo/mondo/Makefile.am

    r426 r729  
    22DIST_SUBDIRS   = ${SUBDIRS}
    33
    4 pkgdata_DATA   = do-not-compress-these autorun
     4pkgdata_DATA   = do-not-compress-these
     5scriptdir      = $(pkgdatadir)
     6script_DATA    = autorun
     7
     8install-data-hook:
     9    @for prog in $(script_DATA); do \
     10      chmod +x $(scriptdir)/$$prog; \
     11    done
  • trunk/mondo/mondo/common/libmondo-archive.c

    r689 r729  
    30763076    } else {
    30773077        file_to_openin = biggie_filename;
    3078         asprintf(&command, "md5sum '%s'", biggie_filename);
     3078        if (strchr(biggie_filename,'\'') != NULL) {
     3079            asprintf(&command, "md5sum \"%s\"", biggie_filename);
     3080        } else {
     3081            asprintf(&command, "md5sum '%s'", biggie_filename);
     3082        }
    30793083        if (!(fin = popen(command, "r"))) {
    30803084            log_OS_error("Unable to popen-in command");
  • trunk/mondo/mondo/common/libmondo-devices.c

    r689 r729  
    15751575            if (bkpinfo->media_device != NULL) {
    15761576                asprintf(&tmp,
    1577                         _("I think I've found your %s burner at SCSI node %s; am I right on the money?"),
     1577                        _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
    15781578                        media_descriptor_string(bkpinfo->
    15791579                                                backup_media_type),
     
    20212021{
    20222022    return(call_program_and_get_last_line_of_output
    2023            ("mount -t coda,ncpfs,nfs,smbfs,cifs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2023           ("mount -t coda,ncpfs,nfs,smbfs,cifs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
    20242024    /* BERLIOS : Useless
    20252025    asprintf(&exclude_these_devices,
    20262026           call_program_and_get_last_line_of_output
    2027            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
     2027           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
    20282028           */
    20292029}
     
    20722072#ifdef __FreeBSD__
    20732073    tmp = call_program_and_get_last_line_of_output
    2074            ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
     2074           ("df -m -P -t nonfs,msdosfs,ntfs,smbfs,smb,cifs,mvfs | tr -s '\t' ' ' | grep -vE \"none|Filesystem\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
    20752075#else
    20762076    tmp = call_program_and_get_last_line_of_output
    2077            ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
     2077           ("df -m -P -x nfs -x vfat -x ntfs -x smbfs -x smb -x cifs -x mvfs | sed 's/                  /devdev/' | tr -s '\t' ' ' | grep -vE \"none|Filesystem|/dev/shm\" | awk '{printf \"%s %s\\n\", $4, $6;}' | sort -n | tail -n1 | awk '{print $NF;}'");
    20782078#endif
    20792079
  • trunk/mondo/mondo/common/libmondo-filelist.c

    r689 r729  
    13551355        // 2.6 has /sys as a proc-type thing -- must be excluded
    13561356        asprintf(&tmp,
    1357                  "find %s -maxdepth %d -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
    1358                  dir, MAX_SKEL_DEPTH, skeleton_filelist);
     1357                "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
     1358                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
    13591359#else
    13601360        // On BSD, for example, /sys is the kernel sources -- don't exclude
    13611361        asprintf(&tmp,
    1362                  "find %s -maxdepth %d -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
    1363                  dir, MAX_SKEL_DEPTH, skeleton_filelist);
     1362                "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
     1363                 dir, MAX_SKEL_DEPTH, g_skeleton_filelist);
    13641364#endif
    13651365        system(tmp);
  • trunk/mondo/mondo/mondorestore/mondo-prep.c

    r689 r729  
    234234    asprintf(&command,
    235235            "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> "
    236             MONDO_LOGFILE "; done; %s -a n", vgscan_sz, vgchange_sz, vgremove_sz, vgremove_sz);
     236            MONDO_LOGFILE "; done", vgscan_sz, vgchange_sz, vgremove_sz);
    237237    paranoid_free(vgchange_sz);
    238238    paranoid_free(vgremove_sz);
  • trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

    r688 r729  
    13521352    paranoid_free(format_str);
    13531353
    1354     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
    1355         || !strcmp(mountlist->el[currline].mountpoint, "image")) {
    1356         mountlist->el[currline].size =
    1357             calculate_raid_device_size(mountlist, raidlist,
     1354    if (strcmp(mountlist->el[currline].mountpoint, "image")) {
     1355        if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
     1356            mountlist->el[currline].size =
     1357                calculate_raid_device_size(mountlist, raidlist,
    13581358                                       mountlist->el[currline].device);
    1359     } else {
    1360         mountlist->el[currline].size = atol(size_str) * 1024;
     1359        } else {
     1360            mountlist->el[currline].size = atol(size_str) * 1024;
     1361        }
    13611362    }
    13621363    paranoid_free(size_str);
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r689 r729  
    320320            asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir);
    321321        }
    322         run_program_and_log_output("df -P -m", FALSE);
     322        run_program_and_log_output("df -m", FALSE);
    323323        asprintf(&tmp,
    324324                "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
     
    445445    }
    446446    close_progress_form();
    447     run_program_and_log_output("df -P -m", TRUE);
     447    run_program_and_log_output("df -m", TRUE);
    448448    if (retval) {
    449449        if (g_partition_table_locked_up > 0) {
     
    476476        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    477477    }
    478     run_program_and_log_output("df -P -m", 3);
     478    run_program_and_log_output("df -m", 3);
    479479    paranoid_free(mountlist);
    480480    return (retval);
     
    766766                               FALSE);
    767767    run_program_and_log_output("cd " MNT_RESTORING
    768                                "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done",
     768                               "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done",
    769769                               TRUE);
    770770    run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid",
     
    19711971    sort_mountlist_by_mountpoint(mountlist, 0);
    19721972
    1973     run_program_and_log_output("df -P -m", 3);
     1973    run_program_and_log_output("df -m", 3);
    19741974    mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices      "));
    19751975    open_progress_form(_("Unmounting devices"),
     
    24002400                paranoid_free(screen_message);
    24012401
    2402                 if (raidlist->el[i].progress == -1) // delayed while another partition inits
    2403                 {
     2402                if (raidlist->el[i].progress == -1) { // delayed while another partition inits
    24042403                    continue;
    24052404                }
  • trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched

    r588 r729  
    257257    # For now, this uses the program `df' to get the device name, but is
    258258    # this really portable?
    259     tmp_fname=`df -P $1/ | sed -n 's%.*\(/dev/[^    ]*\).*%\1%p'`
     259    tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^   ]*\).*%\1%p'`
    260260
    261261    if test -z "$tmp_fname"; then
  • trunk/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary

    r588 r729  
    5959while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do
    6060    if [ "$line" = "" ] ; then
    61     noof_blank_lines=$(($noof_blank_lines+1))
     61        noof_blank_lines=$(($noof_blank_lines+1))
    6262    else
    63     noof_blank_lines=0
    64     read_partition_line "$line"
     63        noof_blank_lines=0
     64        read_partition_line "$line"
    6565    fi
    6666    read line
  • trunk/tools/build2pkg

    r672 r729  
    6969        log=$TMP/$p-rpm.log
    7070
    71         if [ "$dfam" = "mandriva" ]; then
    72             echo "Generating bzip2 files (mandriva)"
     71        if [ "$dfam" = "mandriva" || "$dfam" = "suse" ]; then
     72            echo "Generating bzip2 files ($dfam)"
    7373            gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2
    7474        else
     
    7777        echo "Generating $p RPMS"
    7878        cd SPECS
    79         tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
    80         mv $pv/distributions/${ddir}-$dver/$p.spec .
    81         rm -rf $pv
     79        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec
     80        mv $p-${VER}/distributions/${ddir}-$dver/$p.spec .
     81        rm -rf $p-${VER}
    8282
    8383        rpmbuild -ba $p.spec 2> $log 1> $log
     
    8585            cat $log
    8686            status=-1
     87        else
     88            egrep '^Wrote:' $log
     89            rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
    8790        fi
    88         egrep '^Wrote:' $log
    8991        rm -rf ${TOPBUILDDIR}/BUILD/*
    9092        cd ..
     
    9294        log=$TMP/$p-gentoo.log
    9395        ln -sf $src .
    94         tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
     96        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
    9597        if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
    9698            echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
     
    99101
    100102        mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
    101         mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
    102         rm -rf $pv
     103        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
     104        rm -rf $p-${VER}
    103105
    104106        cd ${TOPBUILDDIR}/portage/sys-apps/$p
    105         ebuild $p-${VER}-r$TAG.ebuild digest 2> $log 1> $log
     107        ebuild $p-${VER}.ebuild digest 2> $log 1> $log
    106108        if [ $? != 0 ]; then
    107109            cat $log
    108110            status=-1
    109111        fi
    110         ebuild $p-${VER}-r$TAG.ebuild unpack 2>> $log 1>> $log
     112        ebuild $p-${VER}.ebuild unpack 2>> $log 1>> $log
    111113        if [ $? != 0 ]; then
    112114            cat $log
    113115            status=-1
    114116        fi
    115         ebuild $p-${VER}-r$TAG.ebuild compile 2>> $log 1>> $log
     117        ebuild $p-${VER}.ebuild compile 2>> $log 1>> $log
    116118        if [ $? != 0 ]; then
    117119            cat $log
    118120            status=-1
    119121        fi
    120         #ebuild $p-${VER}-r$TAG.ebuild install 2>> $log 1>> $log
     122        #ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
    121123        if [ $? != 0 ]; then
    122124            cat $log
     
    125127    elif [  _"$dtype" = _"deb" ]; then
    126128        log=$TMP/$p-deb.log
     129        export TMPDIR=/tmp
    127130        cd $TOPBUILDDIR
    128131        tar xfz $src
    129         cd ${pv}*
     132        cd ${p}-${VER}
    130133        # point to the right debian conf
    131134        ln -s distributions/${ddir}-$dver debian
  • trunk/tools/build2qemu

    r618 r729  
    7272            exit -1
    7373    fi
    74     export sp=2222
     74    if [ _"$sp" = _"" ]; then
     75        export sp=2222
     76    fi
    7577    ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
    7678    if [ $? -ne 0 ]; then
  • trunk/tools/common-env

    r649 r729  
    1010export TOPDIR=${BASE}/build
    1111mkdir -p ${TOPDIR}
    12 export TMPDIR=
    13 export TMP=`mktemp -d -p /tmp`
     12export TMPDIR=/tmp
     13export TMP=`mktemp -d`
    1414
    1515umask 022
  • trunk/tools/mkchangelog.pl

    r672 r729  
    8383    #print "**$ndate**\n";
    8484    if ($dtype eq "rpm") {
    85         print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> $ver\n";
     85        print OUTPUT "* $ndate Bruno Cornec <bruno\@mondorescue.org> VVV-RRR\n";
    8686        print OUTPUT "- Updated to $ver\n";
    8787        }
  • trunk/tools/pkg2ftp

    r592 r729  
    5858        pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm"
    5959        spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv${suf}.src.rpm"
     60    elif [  _"$dtype" = "_deb" ]; then
     61        pkg="$pkg ${TOPBUILDDIR}/$p_*.rpm"
     62        spkg="$spkg ${TOPBUILDDIR}/$p_*.dsc ${TOPBUILDDIR}/$p_*.tar.gz"
    6063    fi
    6164done
  • trunk/tools/svn2build

    r672 r729  
    3737    v=`cat ${SVNBRANCH}/$p/VERSION`
    3838    echo "Management of $p $v-$REVISION"
    39     dest="$p-$v-$TAG"
     39    dest="$p-$v"
    4040    rm -fr $dest
    4141    svn export ${SVNBRANCH}/$p $dest
     
    7272            fi
    7373            echo "Using $inc customization to build SPEC file"
    74             m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
    7574
    7675            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
     
    7978                exit -1
    8079            fi
    81             cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
     80            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $TMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
     81
    8282            rm -f $TMP/$p.spec
    8383        elif [ "$dtype" = "ebuild" ]; then
     
    116116    if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then
    117117        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    118         if [ ! -d mondo-doc-$v1-$TAG ]; then
     118        if [ ! -d mondo-doc-$v1 ]; then
    119119            echo "mondo-doc should be created before $p"
    120120            exit -1
    121121        fi
    122         (cd mondo-doc-$v1-$TAG ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
     122        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
    123123        rm -f $dest/rootfs/sbin/parted2fdisk-ia64
    124124    fi
    125125    if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
    126126        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
    127         if [ ! -d mondo-doc-$v1-$TAG ]; then
     127        if [ ! -d mondo-doc-$v1 ]; then
    128128            echo "mondo-doc should be created before $p"
    129129            exit -1
    130130        fi
    131         (cd mondo-doc-$v1-$TAG ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
     131        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
    132132        (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
    133133    fi
  • trunk/website/docs.shtml

    r404 r729  
    5757  <ul>
    5858          <li>A Mondo Rescue <a href="/docs/mondo-intro.pdf" target="_blank">introduction</a> (in French) made by Gallig Renaud.
    59           <li>A Mondo Rescue <a href="/docs/mondo-presentation-v1.pdf" target="_blank">presentation</a> made by Bruno Cornec.
     59          <li>A Mondo Rescue <a href="/docs/mondo-presentation-v2.pdf" target="_blank">presentation</a> made by Bruno Cornec. (Older versions also available: <a href="/docs/mondo-presentation-v1.pdf" target="_blank">v1</a>)
    6060          <li>A Mondo Rescue hardware migration <a href="/docs/HOWTO-_Deploy_Linux_from_SCSI_to_SATA.pdf" target="_blank">guide</a> made by François-Xavier Horel.
    6161
  • trunk/website/downloads.shtml

    r687 r729  
    7373<ul>
    7474    <li>tarballs are available under <a href="ftp://ftp.mondorescue.org/src">ftp://ftp.mondorescue.org/src</a></li>
    75     <li>Subversion browing available at <a href="http://svn.berlios.de/viewcvs/mondorescue">http://svn.berlios.de/viewcvs/mondorescue</a></li>
    76     <li>Anonymous HTTP Subversion check out of the project available with the following instruction set: <pre><tt>svn checkout http://svn.berlios.de/svnroot/repos/mondorescue/branches/stable</tt></pre></li>
    77     <li>Anonymous SVN Subversion check out of the project available with the following instruction set: <pre><tt>svn checkout svn://svn.berlios.de/mondorescue/branches/stable</tt></pre></li>
     75    <li>Subversion browing available at <a href="http://www.mondorescue.org/cgi-bin/trac.cgi/browser/">http://www.mondorescue.org/cgi-bin/trac.cgi/browser/</a></li>
     76    <li>Anonymous SVN Subversion check out of the project available with the following instruction set: <pre><tt>svn checkout svn://svn.mondorescue.org/mondorescue/branches/stable</tt></pre></li>
    7877</ul>
    7978
  • trunk/website/mondorescue.org.conf

    r448 r729  
    11#
    22# Apache Virtual Host Configuration File
    3 #
     3# Replace * by IP address of the machine
    44NameVirtualHost *
    55
     
    2121        Allow from all
    2222    </Directory>
     23    <Directory "/mondo/www/cgi-bin">
     24        AllowOverride All
     25        Options ExecCGI FollowSymLinks
     26        Order allow,deny
     27        Allow from all
     28    </Directory>
     29
     30    ScriptAlias /cgi-bin/ "/mondo/www/cgi-bin/"
     31
     32    # fix mdk bug #16298
     33    PassEnv LC_ALL
     34    PassEnv LANG
     35
     36    # fix mdk bug #16298
     37    <Directory "/usr/share/trac/htdocs/">
     38        Options Indexes MultiViews
     39        AllowOverride None
     40        Order allow,deny
     41        Allow from All
     42    </Directory>
     43   
     44    Alias /trac/ "/usr/share/trac/htdocs/"
     45    <Location "/cgi-bin/trac.cgi">
     46        SetEnv TRAC_ENV "/mondo/trac/mondorescue.env"
     47    </Location>
     48
     49    # You need something like this to authenticate users
     50    <Location "/cgi-bin/trac.cgi/login">
     51        AuthType Basic
     52        AuthName "MondoRescue"
     53        AuthUserFile /etc/trac.htpasswd
     54        Require valid-user
     55    </Location>
    2356</VirtualHost>
    2457
Note: See TracChangeset for help on using the changeset viewer.