Changeset 729 in MondoRescue for trunk/mindi
- Timestamp:
- Jul 30, 2006, 4:06:39 PM (18 years ago)
- Location:
- trunk/mindi
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mindi/.config-busybox-i386.net
r414 r729 3 3 # 4 4 HAVE_DOT_CONFIG=y 5 6 # 7 # Busybox Settings 8 # 5 9 6 10 # … … 25 29 # 26 30 CONFIG_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 27 35 CONFIG_LFS=y 28 36 # USING_CROSS_COMPILER is not set 29 37 CROSS_COMPILER_PREFIX="" 30 38 EXTRA_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 48 CONFIG_DEBUG_YANK_SUSv2=y 31 49 32 50 # … … 34 52 # 35 53 # CONFIG_INSTALL_NO_USR is not set 54 CONFIG_INSTALL_APPLET_SYMLINKS=y 55 # CONFIG_INSTALL_APPLET_HARDLINKS is not set 56 # CONFIG_INSTALL_APPLET_DONT is not set 36 57 PREFIX="./_install" 58 59 # 60 # Busybox Library Tuning 61 # 62 CONFIG_MD5_SIZE_VS_SPEED=2 63 64 # 65 # Applets 66 # 37 67 38 68 # … … 54 84 CONFIG_FEATURE_TAR_CREATE=y 55 85 CONFIG_FEATURE_TAR_BZIP2=y 86 # CONFIG_FEATURE_TAR_LZMA is not set 56 87 # CONFIG_FEATURE_TAR_FROM is not set 57 88 CONFIG_FEATURE_TAR_GZIP=y … … 61 92 # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set 62 93 # CONFIG_UNCOMPRESS is not set 94 # CONFIG_UNLZMA is not set 95 # CONFIG_FEATURE_LZMA_FAST is not set 63 96 # CONFIG_UNZIP is not set 64 97 … … 69 102 # CONFIG_FEATURE_DEB_TAR_GZ is not set 70 103 # CONFIG_FEATURE_DEB_TAR_BZ2 is not set 104 # CONFIG_FEATURE_DEB_TAR_LZMA is not set 71 105 72 106 # … … 85 119 CONFIG_CUT=y 86 120 CONFIG_DATE=y 87 88 #89 # date (forced enabled for use with watch)90 #91 121 CONFIG_FEATURE_DATE_ISOFMT=y 92 122 CONFIG_DD=y … … 101 131 CONFIG_ENV=y 102 132 CONFIG_EXPR=y 133 # CONFIG_EXPR_MATH_SUPPORT_64 is not set 103 134 CONFIG_FALSE=y 104 135 # CONFIG_FOLD is not set … … 150 181 CONFIG_FEATURE_TEE_USE_BLOCK_IO=y 151 182 CONFIG_TEST=y 152 153 #154 # test (forced enabled for use with shell)155 #156 183 # CONFIG_FEATURE_TEST_64 is not set 157 184 CONFIG_TOUCH=y … … 178 205 179 206 # 180 # Common options for ls and more207 # Common options for ls, more and telnet 181 208 # 182 209 CONFIG_FEATURE_AUTOWIDTH=y … … 216 243 # CONFIG_START_STOP_DAEMON is not set 217 244 CONFIG_WHICH=y 218 219 #220 # Linux Ext2 FS Progs221 #222 # CONFIG_CHATTR is not set223 # CONFIG_E2FSCK is not set224 # CONFIG_FSCK is not set225 # CONFIG_LSATTR is not set226 # CONFIG_MKE2FS is not set227 # CONFIG_TUNE2FS is not set228 # CONFIG_E2LABEL is not set229 # CONFIG_FINDFS is not set230 245 231 246 # … … 253 268 CONFIG_FIND=y 254 269 CONFIG_FEATURE_FIND_MTIME=y 270 CONFIG_FEATURE_FIND_MMIN=y 255 271 CONFIG_FEATURE_FIND_PERM=y 256 272 CONFIG_FEATURE_FIND_TYPE=y … … 274 290 # CONFIG_INIT is not set 275 291 # CONFIG_FEATURE_USE_INITTAB is not set 276 # CONFIG_FEATURE_INITRD is not set277 # CONFIG_FEATURE_INIT_COREDUMPS is not set278 292 # CONFIG_FEATURE_INIT_SCTTY is not set 279 293 # CONFIG_FEATURE_EXTRA_QUIET is not set 294 # CONFIG_FEATURE_INIT_COREDUMPS is not set 295 # CONFIG_FEATURE_INITRD is not set 280 296 CONFIG_HALT=y 281 297 CONFIG_MESG=y 282 CONFIG_POWEROFF=y283 CONFIG_REBOOT=y284 298 285 299 # 286 300 # Login/Password Management Utilities 287 301 # 302 # CONFIG_FEATURE_SHADOWPASSWDS is not set 303 # CONFIG_USE_BB_SHADOW is not set 288 304 # CONFIG_USE_BB_PWD_GRP is not set 289 305 # CONFIG_ADDGROUP is not set … … 300 316 # CONFIG_SULOGIN is not set 301 317 # 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 # 334 CONFIG_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 340 CONFIG_RMMOD=y 341 CONFIG_LSMOD=y 342 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y 343 CONFIG_MODPROBE=y 344 CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y 345 346 # 347 # Options common to multiple modutils 348 # 349 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set 350 CONFIG_FEATURE_2_4_MODULES=y 351 CONFIG_FEATURE_2_6_MODULES=y 352 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set 353 354 # 355 # Linux System Utilities 356 # 357 CONFIG_DMESG=y 358 # CONFIG_FBSET is not set 359 # CONFIG_FEATURE_FBSET_FANCY is not set 360 # CONFIG_FEATURE_FBSET_READMODE is not set 361 CONFIG_FDFLUSH=y 362 CONFIG_FDFORMAT=y 363 # CONFIG_FDISK is not set 364 FDISK_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 371 CONFIG_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 377 CONFIG_HWCLOCK=y 378 CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y 379 CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y 380 # CONFIG_IPCRM is not set 381 # CONFIG_IPCS is not set 382 CONFIG_LOSETUP=y 383 # CONFIG_MDEV is not set 384 # CONFIG_FEATURE_MDEV_CONF is not set 385 CONFIG_MKSWAP=y 386 CONFIG_MORE=y 387 CONFIG_FEATURE_USE_TERMIOS=y 388 CONFIG_MOUNT=y 389 CONFIG_FEATURE_MOUNT_NFS=y 390 CONFIG_PIVOT_ROOT=y 391 # CONFIG_RDATE is not set 392 # CONFIG_READPROFILE is not set 393 # CONFIG_SETARCH is not set 394 CONFIG_SWAPONOFF=y 395 # CONFIG_SWITCH_ROOT is not set 396 CONFIG_UMOUNT=y 397 # CONFIG_FEATURE_UMOUNT_ALL is not set 398 399 # 400 # Common options for mount/umount 401 # 402 CONFIG_FEATURE_MOUNT_LOOP=y 403 # CONFIG_FEATURE_MTAB_SUPPORT is not set 304 404 305 405 # … … 336 436 # CONFIG_MOUNTPOINT is not set 337 437 CONFIG_MT=y 338 # BB_APPLET_RUNLEVEL is not set438 # CONFIG_RUNLEVEL is not set 339 439 # CONFIG_RX is not set 340 440 CONFIG_STRINGS=y … … 344 444 345 445 # 346 # Linux Module Utilities347 #348 CONFIG_INSMOD=y349 CONFIG_FEATURE_2_4_MODULES=y350 CONFIG_FEATURE_2_6_MODULES=y351 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set352 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set353 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set354 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set355 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set356 CONFIG_LSMOD=y357 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y358 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set359 CONFIG_MODPROBE=y360 CONFIG_RMMOD=y361 # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set362 363 #364 446 # Networking Utilities 365 447 # 366 448 # CONFIG_FEATURE_IPV6 is not set 367 449 # CONFIG_ARPING is not set 450 # CONFIG_DNSD is not set 368 451 # CONFIG_ETHER_WAKE is not set 369 452 # CONFIG_FAKEIDENTD is not set … … 379 462 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set 380 463 # CONFIG_FEATURE_HTTPD_CGI is not set 464 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set 381 465 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set 382 466 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set … … 533 617 CONFIG_KLOGD=y 534 618 CONFIG_LOGGER=y 535 536 #537 # Linux System Utilities538 #539 CONFIG_DMESG=y540 # CONFIG_FBSET is not set541 # CONFIG_FEATURE_FBSET_FANCY is not set542 # CONFIG_FEATURE_FBSET_READMODE is not set543 CONFIG_FDFLUSH=y544 CONFIG_FDFORMAT=y545 # CONFIG_FDISK is not set546 FDISK_SUPPORT_LARGE_DISKS=y547 # CONFIG_FEATURE_FDISK_WRITABLE is not set548 # CONFIG_FEATURE_AIX_LABEL is not set549 # CONFIG_FEATURE_SGI_LABEL is not set550 # CONFIG_FEATURE_SUN_LABEL is not set551 # CONFIG_FEATURE_OSF_LABEL is not set552 # CONFIG_FEATURE_FDISK_ADVANCED is not set553 CONFIG_FREERAMDISK=y554 # CONFIG_FSCK_MINIX is not set555 # CONFIG_MKFS_MINIX is not set556 # CONFIG_FEATURE_MINIX2 is not set557 # CONFIG_GETOPT is not set558 # CONFIG_HEXDUMP is not set559 CONFIG_HWCLOCK=y560 CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y561 CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y562 # CONFIG_IPCRM is not set563 # CONFIG_IPCS is not set564 CONFIG_LOSETUP=y565 CONFIG_MKSWAP=y566 CONFIG_MORE=y567 CONFIG_FEATURE_USE_TERMIOS=y568 CONFIG_PIVOT_ROOT=y569 # CONFIG_SWITCH_ROOT is not set570 # CONFIG_RDATE is not set571 # CONFIG_READPROFILE is not set572 CONFIG_SWAPONOFF=y573 CONFIG_MOUNT=y574 CONFIG_FEATURE_MOUNT_NFS=y575 CONFIG_UMOUNT=y576 577 #578 # Common options for mount/umount579 #580 CONFIG_FEATURE_MOUNT_LOOP=y581 # CONFIG_FEATURE_MTAB_SUPPORT is not set582 583 #584 # Debugging Options585 #586 # CONFIG_DEBUG is not set587 # CONFIG_NO_DEBUG_LIB is not set588 # CONFIG_DMALLOC is not set589 # CONFIG_EFENCE is not set -
trunk/mindi/analyze-my-lvm
r687 r729 259 259 echo "# echo y | $LVMCMD pvcreate -ff $i" 260 260 done 261 echo "# $LVMCMD vgscan ; echo"261 echo "# $LVMCMD vgscan" 262 262 echo "" 263 263 echo "Create and activate the VG's (volume groups)." -
trunk/mindi/distributions/mandriva/spec.m4
r561 r729 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}- %{tag}.tar.bz2')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl 5 5 dnl DDD is replaced by the list of dependencies specific to that distro 6 6 define(`DDD', `, which, grep >= 2.5')dnl 7 7 dnl GRP is replaced by the RPM group of apps 8 8 define(`GRP', `Archiving/Backup')dnl 9 dnl OBS is replaced with what is being obsoleted 10 define(`OBS', `')dnl -
trunk/mindi/distributions/redhat/spec.m4
r561 r729 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}- %{tag}.tar.gz')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.gz')dnl 5 5 dnl DDD is replaced by the list of dependencies specific to that distro 6 6 define(`DDD', `, which, grep >= 2.5')dnl 7 7 dnl GRP is replaced by the RPM group of apps 8 8 define(`GRP', `Applications/Archiving')dnl 9 dnl OBS is replaced with what is being obsoleted 10 define(`OBS', )dnl -
trunk/mindi/distributions/rpm/mindi.spec
r600 r729 2 2 # $Id$ 3 3 # 4 %define mrel RRR5 %define tag TTT6 7 4 Summary: Mindi creates emergency boot disks/CDs using your kernel, tools and modules 8 5 Name: mindi 9 6 Version: VVV 10 Release: %mrel7 Release: RRR 11 8 License: GPL 12 9 Group: GRP … … 15 12 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) 16 13 Requires: bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools DDD 14 OBS 17 15 # Not on all systems 18 16 #Conflicts: bonnie++ … … 25 23 26 24 %prep 27 %setup -n %name-%{version} -%{tag}25 %setup -n %name-%{version} 28 26 29 27 %build … … 52 50 53 51 %files 52 %defattr(-,root,root) 54 53 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt 55 54 %config(noreplace) %{_sysconfdir}/mindi/deplist.d/* -
trunk/mindi/distributions/suse/spec.m4
r561 r729 2 2 dnl 3 3 dnl SSS is replaced by the source package format 4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}- %{tag}.tar.gz')dnl4 define(`SSS', `ftp://ftp.mondorescue.org/src/%{name}-%{version}-TTT.tar.bz2')dnl 5 5 dnl DDD is replaced by the list of dependencies specific to that distro 6 6 define(`DDD', `, syslinux')dnl 7 7 dnl GRP is replaced by the RPM group of apps 8 8 define(`GRP', `Productivity/Archiving/Backup')dnl 9 dnl OBS is replaced with what is being obsoleted 10 define(`OBS', `')dnl -
trunk/mindi/mindi
r687 r729 124 124 FLOPPY_MODS="ide-floppy floppy" 125 125 TAPE_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 i de-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"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 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" 127 127 128 128 # ide-probe-mod … … 821 821 done 822 822 if [ "$incoming" = "LVMFILES:" ] ; then 823 incoming=`ReadLine`824 lvmversion=""823 incoming=`ReadLine` 824 lvmversion="" 825 825 while [ "$incoming" != "" ] ; do 826 826 if echo "$incoming" | grep -x " *#.*" &> /dev/null ; then 827 # echo "Skipping '$incoming'" 828 incoming=`ReadLine` 829 continue 827 incoming=`ReadLine` 828 continue 830 829 fi 831 830 filelist=`GenerateListForFile "$incoming"` … … 833 832 lvmresolved=`ResolveSoftlink $tool` 834 833 if [ "$tool" == "$lvmresolved" ]; then 835 echo "$tool" >> $tempfile834 echo "$tool" >> $tempfile 836 835 elif echo "$lvmresolved" | grep "lvmiopversion" &> /dev/null ; then 837 if [ "$lvmversion" = "" ] ; then838 lvmversion=`$lvmresolved`839 echo "$lvmresolved" >> $tempfile840 fi841 toolstripped=`echo $tool | $AWK -F / '{print $NF;}'`842 if [ "$lvmversion" == "200" ]; then843 # pvdata and lvmcreate_initrd don't exist in LVM2844 case "$toolstripped" in845 "pvdata")846 continue847 ;;848 "lvmcreate_initrd")849 continue850 ;;851 esac852 fi853 toolpath="/sbin/lvm-"$lvmversion"/"$toolstripped854 if [ -e "$toolpath" ] ; then855 echo "$toolpath" >> $tempfile856 echo "$tool" >> $tempfile857 else858 toolpath="/lib/lvm-"$lvmversion"/"$toolstripped859 fi860 if [ -e "$toolpath" ] ; then861 echo "$toolpath" >> $tempfile862 echo "$tool" >> $tempfile863 else864 echo "Where are your LVM-Tools? Couldn't find $tool"865 fi866 else867 echo "$tool" >> $tempfile868 fi836 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 869 868 done 870 869 progress=$(($progress+1)) … … 1389 1388 [ "$IMAGE_DEVS" != "" ] && all_partitions="`echo "$all_partitions $IMAGE_DEVS" | tr ' ' '\n' | sort -u | tr '\n ' ' '`" 1390 1389 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" 1391 1391 for c_p in $all_partitions ; do 1392 1392 # 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 1395 1394 [ "`echo "$c_p" | grep -x "/dev/cdroms.*"`" ] && continue 1396 1395 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 1397 1396 current_partition=`ResolveSoftlink $c_p` 1398 1397 [ "`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"`" ] && continue1398 [ "`echo "$useless_dev" | grep -F "$current_partition"`" ] && continue 1400 1399 else 1401 1400 current_partition="$c_p" 1402 1401 fi 1403 1402 [ "$c_p" = "none" ] && continue 1403 redhat_label="" 1404 1404 absolute_partition=`ResolveSoftlink $c_p` 1405 1405 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 1406 1412 1407 1413 # This part tries to retrieve the correct device from a LABEL line in /etc/fstab … … 1412 1418 actual_dev="" 1413 1419 1414 # 1st try : blkid, the good way1415 if [ -x "/sbin/blkid" ]; then1416 actual_dev=`/sbin/blkid | /bin/grep "$current_partition" | /bin/cut -d':' -f1`1417 fi1418 1419 # 2nd try, which works on a standard partition (ext2/3), but not on swap1420 if [ "x$actual_dev" = "x" ]; then1421 actual_dev=`/bin/mount -l | /bin/grep "\[$redhat_label\]" | /bin/cut -d' ' -f1`1422 fi1423 1424 # 3rd try, with vol_id (which works with swap)1425 if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then1420 # 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 1426 1432 list_swaps=`cat /proc/swaps | /bin/grep "/dev/" | /bin/awk '{ print $1 }' ` 1427 1433 for dev_swap in $list_swaps ; do … … 1432 1438 fi 1433 1439 done 1434 fi1435 1436 # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice. e.g. : LABEL=SWAP-hda51437 if [ "x$actual_dev" = "x" -a _"`echo $current_partition | /bin/grep -i 'LABEL=SWAP'`" != _"" ]; then1440 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 1438 1444 try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`" 1439 1445 present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`" … … 1441 1447 actual_dev="/dev/$try_dev" 1442 1448 fi 1443 fi1444 1445 # Check if one of all those tries has known success1446 if [ "x$actual_dev" != "x" ]; then1449 fi 1450 1451 # Check if one of all those tries has known success 1452 if [ "x$actual_dev" != "x" ]; then 1447 1453 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 1448 1457 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 1454 1460 1455 1461 partition_format=`$AWK '$1 == "'"$str_to_find_fmt_with"'" {print $3}' $MY_FSTAB` … … 1552 1558 elif [ "$partition_mountpt" = "" ] && [ -f "/etc/raidtab" ] ; then 1553 1559 if [ "`grep -F device /etc/raidtab 2>/dev/null | grep -F $current_partition`" ] ; then 1554 partition_mountpt=raid1555 partition_format=raid1560 partition_mountpt=raid 1561 partition_format=raid 1556 1562 printf "\t%-15s %-15s %-15s %7s %-15s\n" $current_partition $partition_mountpt $partition_format $psz "$redhat_label" 1557 1563 printf "%s %s %s %s %s\n" $current_partition $partition_mountpt $partition_format $partition_size "$redhat_label" >> $mountlist 1558 1564 else 1559 echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE1565 echo "Unknown mountpoint (outstring = $unofficial_outstring)" >> $LOGFILE 1560 1566 fi 1561 1567 elif [ "$partition_format" = "" ] ; then -
trunk/mindi/parted2fdisk.pl
r588 r729 44 44 $arch = $ENV{ARCH}; 45 45 } else { 46 $arch = ` "uname -m"`;46 $arch = `uname -m`; 47 47 chomp($arch); 48 48 }
Note:
See TracChangeset
for help on using the changeset viewer.