Changeset 729 in MondoRescue for trunk/mindi


Ignore:
Timestamp:
Jul 30, 2006, 4:06:39 PM (18 years ago)
Author:
Bruno Cornec
Message:

merge -r686:728 $SVN_M/branches/stable

Location:
trunk/mindi
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • 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}
Note: See TracChangeset for help on using the changeset viewer.