Changeset 729 in MondoRescue
- Timestamp:
- Jul 30, 2006, 4:06:39 PM (18 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 43 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/mindi-kernel/distributions/mandriva/spec.m4
r554 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', `')dnl -
trunk/mindi-kernel/distributions/redhat/spec.m4
r554 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', `')dnl -
trunk/mindi-kernel/distributions/suse/spec.m4
r554 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 -
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 } -
trunk/mondo-doc/distributions/mandriva/spec.m4
r554 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', )dnl -
trunk/mondo-doc/distributions/redhat/spec.m4
r554 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', )dnl -
trunk/mondo-doc/distributions/rpm/mondo-doc.spec
r600 r729 2 2 # $Id$ 3 3 # 4 5 %define mrel RRR6 %define tag TTT7 4 8 5 Summary: Documentation for Mondo Rescue … … 11 8 Name: mondo-doc 12 9 Version: VVV 13 Release: %{mrel}10 Release: RRR 14 11 License: GPL 15 12 Group: GRP … … 27 24 28 25 %prep 29 %setup -q -n %name-%{version} -%{tag}26 %setup -q -n %name-%{version} 30 27 31 28 %build … … 42 39 43 40 %files 41 %defattr(-,root,root) 44 42 %doc svn.log 45 43 %doc mindi.8 mondoarchive.8 mondorestore.8 -
trunk/mondo-doc/distributions/suse/spec.m4
r554 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', `, buffer, cdrecord')dnl -
trunk/mondo-doc/images
-
Property svn:keyword
set to
Id
-
Property svn:keyword
set to
-
trunk/mondo-doc/mondoarchive.8
r588 r729 151 151 the mountlist. NB: If you exclude /dev/sdd4 then the /dev entry itself will 152 152 still be backed up, even though the mountlist entry will be suppressed. 153 NOTA: If you precise a directory with a final / its content will be archived so it won't do what you expect. 153 154 154 155 .TP -
trunk/mondo-doc/mondorescue-howto.sgml
r588 r729 1049 1049 <entry> 1050 1050 bash# cd mondo-2.xx 1051 </entry> 1052 </row> 1053 <row> 1054 <entry> 1055 bash# ./configure 1051 1056 </entry> 1052 1057 </row> -
trunk/mondo/ChangeLog
r687 r729 3 3 MONDO CHANGES 4 4 5 2. 2.0-1 (2006-06-12)5 2.3.0 (2006-07-30) 6 6 - indent on source files 7 7 - asprintf used instead of malloc_string + sprintf/strcpy/strcat without verifications. Optimisations on memory consumption (allocate only size needed + remove memory leaks) (Bruno Cornec) 8 8 - Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task) 9 9 10 2.0.9 (2006-06-26) 10 2.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) 11 15 - nfsmount option added to allow redeployment from another NFS server (Bruno Cornec) 12 16 - Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost) -
trunk/mondo/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', )dnl … … 8 8 define(`GRP', `Archiving/Backup')dnl 9 9 dnl OBS is replaced with what is being obsoleted 10 define(`OBS', `Obsoletes: libmondo <= 2.0410 define(`OBS', `Obsoletes: libmondo 11 11 Provides: libmondo')dnl -
trunk/mondo/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', )dnl -
trunk/mondo/distributions/rpm/mondo.spec
r588 r729 3 3 # 4 4 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 10 6 11 7 Summary: A program which a Linux user can utilize to create a rescue/restore CD/tape … … 16 12 Name: mondo 17 13 Version: VVV 18 Release: %{mrel}14 Release: RRR 19 15 License: GPL 20 16 Group: GRP … … 22 18 Source: SSS 23 19 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) 24 BuildRequires: newt-devel >= 0.50, slang-devel >= 1.4.1,gcc20 BuildRequires: newt-devel >= 0.50, gcc 25 21 OBS 26 22 %ifarch ia64 … … 59 55 60 56 %prep 61 %setup -q -n %name-%{version} -%{tag}57 %setup -q -n %name-%{version} 62 58 63 59 %build … … 76 72 77 73 %files 74 %defattr(-,root,root) 78 75 %doc ChangeLog svn.log 79 76 %doc INSTALL COPYING README TODO AUTHORS NEWS -
trunk/mondo/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', `, buffer, cdrecord')dnl … … 8 8 define(`GRP', `Productivity/Archiving/Backup')dnl 9 9 dnl OBS is replaced vy what is being obsoleted 10 define(`OBS', )dnl10 define(`OBS', `Obsoletes: mondo <= 2.06')dnl -
trunk/mondo/mondo/Makefile.am
r426 r729 2 2 DIST_SUBDIRS = ${SUBDIRS} 3 3 4 pkgdata_DATA = do-not-compress-these autorun 4 pkgdata_DATA = do-not-compress-these 5 scriptdir = $(pkgdatadir) 6 script_DATA = autorun 7 8 install-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 3076 3076 } else { 3077 3077 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 } 3079 3083 if (!(fin = popen(command, "r"))) { 3080 3084 log_OS_error("Unable to popen-in command"); -
trunk/mondo/mondo/common/libmondo-devices.c
r689 r729 1575 1575 if (bkpinfo->media_device != NULL) { 1576 1576 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."), 1578 1578 media_descriptor_string(bkpinfo-> 1579 1579 backup_media_type), … … 2021 2021 { 2022 2022 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;}'")); 2024 2024 /* BERLIOS : Useless 2025 2025 asprintf(&exclude_these_devices, 2026 2026 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;}'")); 2028 2028 */ 2029 2029 } … … 2072 2072 #ifdef __FreeBSD__ 2073 2073 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;}'"); 2075 2075 #else 2076 2076 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;}'"); 2078 2078 #endif 2079 2079 -
trunk/mondo/mondo/common/libmondo-filelist.c
r689 r729 1355 1355 // 2.6 has /sys as a proc-type thing -- must be excluded 1356 1356 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); 1359 1359 #else 1360 1360 // On BSD, for example, /sys is the kernel sources -- don't exclude 1361 1361 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); 1364 1364 #endif 1365 1365 system(tmp); -
trunk/mondo/mondo/mondorestore/mondo-prep.c
r689 r729 234 234 asprintf(&command, 235 235 "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); 237 237 paranoid_free(vgchange_sz); 238 238 paranoid_free(vgremove_sz); -
trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c
r688 r729 1352 1352 paranoid_free(format_str); 1353 1353 1354 if (str str(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, 1358 1358 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 } 1361 1362 } 1362 1363 paranoid_free(size_str); -
trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
r689 r729 320 320 asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir); 321 321 } 322 run_program_and_log_output("df - P -m", FALSE);322 run_program_and_log_output("df -m", FALSE); 323 323 asprintf(&tmp, 324 324 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", … … 445 445 } 446 446 close_progress_form(); 447 run_program_and_log_output("df - P -m", TRUE);447 run_program_and_log_output("df -m", TRUE); 448 448 if (retval) { 449 449 if (g_partition_table_locked_up > 0) { … … 476 476 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 477 477 } 478 run_program_and_log_output("df - P -m", 3);478 run_program_and_log_output("df -m", 3); 479 479 paranoid_free(mountlist); 480 480 return (retval); … … 766 766 FALSE); 767 767 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", 769 769 TRUE); 770 770 run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid", … … 1971 1971 sort_mountlist_by_mountpoint(mountlist, 0); 1972 1972 1973 run_program_and_log_output("df - P -m", 3);1973 run_program_and_log_output("df -m", 3); 1974 1974 mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices ")); 1975 1975 open_progress_form(_("Unmounting devices"), … … 2400 2400 paranoid_free(screen_message); 2401 2401 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 2404 2403 continue; 2405 2404 } -
trunk/mondo/mondo/restore-scripts/mondo/grub-install.patched
r588 r729 257 257 # For now, this uses the program `df' to get the device name, but is 258 258 # 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'` 260 260 261 261 if test -z "$tmp_fname"; then -
trunk/mondo/mondo/restore-scripts/mondo/label-partitions-as-necessary
r588 r729 59 59 while [ "$line" != "" ] && [ "$noof_blank_lines" -le "5" ] ; do 60 60 if [ "$line" = "" ] ; then 61 noof_blank_lines=$(($noof_blank_lines+1))61 noof_blank_lines=$(($noof_blank_lines+1)) 62 62 else 63 noof_blank_lines=064 read_partition_line "$line"63 noof_blank_lines=0 64 read_partition_line "$line" 65 65 fi 66 66 read line -
trunk/tools/build2pkg
r672 r729 69 69 log=$TMP/$p-rpm.log 70 70 71 if [ "$dfam" = "mandriva" ]; then72 echo "Generating bzip2 files ( mandriva)"71 if [ "$dfam" = "mandriva" || "$dfam" = "suse" ]; then 72 echo "Generating bzip2 files ($dfam)" 73 73 gzip -cd $src | bzip2 -c3 > SOURCES/$pv.tar.bz2 74 74 else … … 77 77 echo "Generating $p RPMS" 78 78 cd SPECS 79 tar xfz $src $p v/distributions/${ddir}-$dver/$p.spec80 mv $p v/distributions/${ddir}-$dver/$p.spec .81 rm -rf $p v79 tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec 80 mv $p-${VER}/distributions/${ddir}-$dver/$p.spec . 81 rm -rf $p-${VER} 82 82 83 83 rpmbuild -ba $p.spec 2> $log 1> $log … … 85 85 cat $log 86 86 status=-1 87 else 88 egrep '^Wrote:' $log 89 rpmlint `egrep '^Wrote:' $log | cut -d: -f2` 87 90 fi 88 egrep '^Wrote:' $log89 91 rm -rf ${TOPBUILDDIR}/BUILD/* 90 92 cd .. … … 92 94 log=$TMP/$p-gentoo.log 93 95 ln -sf $src . 94 tar xfz $src $p v/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild96 tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild 95 97 if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then 96 98 echo "Adding $TOPBUILDDIR/portage to /etc/make.conf" … … 99 101 100 102 mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p 101 mv $p v/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p102 rm -rf $p v103 mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p 104 rm -rf $p-${VER} 103 105 104 106 cd ${TOPBUILDDIR}/portage/sys-apps/$p 105 ebuild $p-${VER} -r$TAG.ebuild digest 2> $log 1> $log107 ebuild $p-${VER}.ebuild digest 2> $log 1> $log 106 108 if [ $? != 0 ]; then 107 109 cat $log 108 110 status=-1 109 111 fi 110 ebuild $p-${VER} -r$TAG.ebuild unpack 2>> $log 1>> $log112 ebuild $p-${VER}.ebuild unpack 2>> $log 1>> $log 111 113 if [ $? != 0 ]; then 112 114 cat $log 113 115 status=-1 114 116 fi 115 ebuild $p-${VER} -r$TAG.ebuild compile 2>> $log 1>> $log117 ebuild $p-${VER}.ebuild compile 2>> $log 1>> $log 116 118 if [ $? != 0 ]; then 117 119 cat $log 118 120 status=-1 119 121 fi 120 #ebuild $p-${VER} -r$TAG.ebuild install 2>> $log 1>> $log122 #ebuild $p-${VER}.ebuild install 2>> $log 1>> $log 121 123 if [ $? != 0 ]; then 122 124 cat $log … … 125 127 elif [ _"$dtype" = _"deb" ]; then 126 128 log=$TMP/$p-deb.log 129 export TMPDIR=/tmp 127 130 cd $TOPBUILDDIR 128 131 tar xfz $src 129 cd ${p v}*132 cd ${p}-${VER} 130 133 # point to the right debian conf 131 134 ln -s distributions/${ddir}-$dver debian -
trunk/tools/build2qemu
r618 r729 72 72 exit -1 73 73 fi 74 export sp=2222 74 if [ _"$sp" = _"" ]; then 75 export sp=2222 76 fi 75 77 ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu 76 78 if [ $? -ne 0 ]; then -
trunk/tools/common-env
r649 r729 10 10 export TOPDIR=${BASE}/build 11 11 mkdir -p ${TOPDIR} 12 export TMPDIR= 13 export TMP=`mktemp -d -p /tmp`12 export TMPDIR=/tmp 13 export TMP=`mktemp -d` 14 14 15 15 umask 022 -
trunk/tools/mkchangelog.pl
r672 r729 83 83 #print "**$ndate**\n"; 84 84 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"; 86 86 print OUTPUT "- Updated to $ver\n"; 87 87 } -
trunk/tools/pkg2ftp
r592 r729 58 58 pkg="$pkg ${TOPBUILDDIR}/RPMS/${ar}/$pv${suf}.${ar}.rpm" 59 59 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" 60 63 fi 61 64 done -
trunk/tools/svn2build
r672 r729 37 37 v=`cat ${SVNBRANCH}/$p/VERSION` 38 38 echo "Management of $p $v-$REVISION" 39 dest="$p-$v -$TAG"39 dest="$p-$v" 40 40 rm -fr $dest 41 41 svn export ${SVNBRANCH}/$p $dest … … 72 72 fi 73 73 echo "Using $inc customization to build SPEC file" 74 m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec75 74 76 75 $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec … … 79 78 exit -1 80 79 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 82 82 rm -f $TMP/$p.spec 83 83 elif [ "$dtype" = "ebuild" ]; then … … 116 116 if [ _"`echo $p | grep -v kernel | grep mindi`" != _"" ]; then 117 117 v1=`cat ${SVNBRANCH}/mondo-doc/VERSION` 118 if [ ! -d mondo-doc-$v1 -$TAG]; then118 if [ ! -d mondo-doc-$v1 ]; then 119 119 echo "mondo-doc should be created before $p" 120 120 exit -1 121 121 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) 123 123 rm -f $dest/rootfs/sbin/parted2fdisk-ia64 124 124 fi 125 125 if [ "`echo $p | grep -v doc | grep mondo`" != "" ]; then 126 126 v1=`cat ${SVNBRANCH}/mondo-doc/VERSION` 127 if [ ! -d mondo-doc-$v1 -$TAG]; then127 if [ ! -d mondo-doc-$v1 ]; then 128 128 echo "mondo-doc should be created before $p" 129 129 exit -1 130 130 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) 132 132 (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap) 133 133 fi -
trunk/website/docs.shtml
r404 r729 57 57 <ul> 58 58 <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-v 1.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>) 60 60 <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. 61 61 -
trunk/website/downloads.shtml
r687 r729 73 73 <ul> 74 74 <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> 78 77 </ul> 79 78 -
trunk/website/mondorescue.org.conf
r448 r729 1 1 # 2 2 # Apache Virtual Host Configuration File 3 # 3 # Replace * by IP address of the machine 4 4 NameVirtualHost * 5 5 … … 21 21 Allow from all 22 22 </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> 23 56 </VirtualHost> 24 57
Note:
See TracChangeset
for help on using the changeset viewer.