Changeset 1570 in MondoRescue
- Timestamp:
- Jul 26, 2007, 1:35:59 AM (18 years ago)
- Location:
- branches/stable
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mindi-busybox/TAG
r1447 r1570 1 stable 1 1 -
branches/stable/mindi/Makefile.parted2fdisk
r235 r1570 1 ARCH=$(shell /bin/ arch| sed 's/686/386/')1 ARCH=$(shell /bin/uname -m | sed 's/686/386/') 2 2 PRG=parted2fdisk 3 3 PERLV=$(shell perl -v | grep 'perl,' | awk '{print $$4}' | cut -c2-) -
branches/stable/mindi/README.ia64
r569 r1570 19 19 Note that parted2fdisk.pl supports currently only the -l and -s options as well as the commands p,n,d,w,t,a,q 20 20 21 On Itanium systems you won't generally find an installed isolinux.bin file which is required by mindi to create the bootable images. You'll generally have to take an i386 package for your distribution and install it on your itanium system so that you provide the required missing file. 22 23 On SLES 10, fdisk is nor provided anymore. You'll have to rebuild the util-linux package by desactivating fdisk removal in the spec file. 24 21 25 Please report any problem around that tool to bruno@mondorescue.org 22 26 Bruno. -
branches/stable/mindi/aux-tools/sbin/format-and-kludge-vfat
r305 r1570 94 94 exit 1 95 95 fi 96 if [ "` arch`" != "ia64" ] ; then96 if [ "`uname -m`" != "ia64" ] ; then 97 97 LogIt "Fixing the boot block of $device with ms-sys" 2 98 98 ms-sys -w $device 2> /tmp/fakv.log > /dev/null -
branches/stable/mindi/deplist.txt
r1047 r1570 23 23 hosts host.conf resolv.conf hosts.allow hosts.deny 24 24 klogd sysklogd 25 fdisk hdparm parted arch25 fdisk hdparm parted uname 26 26 loadkeys 27 27 mount -
branches/stable/mindi/install.sh
r1513 r1570 40 40 MINDIVER=`cat VERSION` 41 41 MINDIREV=`cat REVISION` 42 ARCH=`/bin/uname -m` 42 43 echo "mindi ${MINDIVER}-r${MINDIREV} will be installed under $local" 43 44 … … 58 59 fi 59 60 if [ _"$LIBDIR" = _"" ]; then 60 ARCH=`/bin/arch`61 61 echo $ARCH | grep -E '^i[0-9]86$' &> /dev/null && ARCH=i386 && locallib=$local/lib 62 62 echo $ARCH | grep -E '^x86_64$' &> /dev/null && locallib=$local/lib64 -
branches/stable/mindi/mindi
r1544 r1570 14 14 15 15 ### Which arch are we on (useful for ia64 port) 16 ARCH=`/bin/ arch`16 ARCH=`/bin/uname -m` 17 17 18 18 #RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt" … … 880 880 [ ! -f $lvKernelImage ] && Die "File $lvKernelImage not found. Terminating." 881 881 882 # get offet of gzip magic "1f8b0800" in file 883 lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "1f8b0800")}'` 884 [ $lvOffset -eq 0 ] && Die "gzip magic not found in file $lvKernelImage. Terminating." 885 lvOffset=`expr $lvOffset / 2` 886 echo " GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset.\n" >> $LOGFILE 887 888 # scan kernel image for initrd filessystem support 889 lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"` 882 # Kernel may be gzip compressed 883 file $lvKernelImage 2>&1 | grep -q gzip 884 if [ $? -eq 0 ]; then 885 lvScanRes=`gzip -cd $lvKernelImage | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"` 886 else 887 # get offet of gzip magic "1f8b0800" in file 888 lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "1f8b0800")}'` 889 [ $lvOffset -eq 0 ] && Die "gzip magic not found in file $lvKernelImage. Terminating." 890 lvOffset=`expr $lvOffset / 2` 891 echo " GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset.\n" >> $LOGFILE 892 893 # scan kernel image for initrd filessystem support 894 lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"` 895 fi 890 896 891 897 # determine which filesystem to use for initrd image: ext2fs, gzip'ed cpio (initramfs ) or cramfs … … 3341 3347 3342 3348 echo "Ramdisk will be $ramdisk_size KB" >> $LOGFILE 3343 if [ "$USE_LILO" = "yes" ] ; then 3344 if [ "$ARCH" = "ia64" ] ; then 3345 PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image." 3346 else 3347 if ! PrepareBootDiskImage_LILO $MINDI_CACHE 2880 $kernelpath $ramdisk_size ; then 3348 LogIt "WARNING - failed to create 2.88MB floppy disk image." 3349 LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk." 3350 PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image." 3351 fi 3352 fi 3349 if [ "$ARCH" = "ia64" ] ; then 3350 PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image." 3353 3351 else 3354 if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 2880 $kernelpath $ramdisk_size ; then 3355 LogIt "WARNING - failed to create 2.88MB floppy disk image." 3356 LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk." 3357 PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image." 3352 if [ "$USE_LILO" = "yes" ] ; then 3353 PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE MB disk image." 3354 fi 3355 else 3356 PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE MB disk image." 3358 3357 fi 3359 3358 fi -
branches/stable/mindi/parted2fdisk.pl
r725 r1570 7 7 # 8 8 # Aims to be architecture independant (i386/ia64) 9 # Tested on RHAS 2.1 ia64 - Mandrake 9.0 ia64 - RHAS 3.0 ia64 9 # Tested on RHAS 2.1 ia64 - Mandrake 9.0 ia64 - RHAS 3.0 ia64 - SLES 10 10 10 # 11 11 # (c) Bruno Cornec <Bruno.Cornec@hp.com> … … 36 36 my %end; 37 37 my %type; 38 my %flags;39 38 my $arch; 40 39 my $fake = 0; … … 74 73 "ext2" => "83", 75 74 "ext3" => "83", 75 "reiserfs" => "83", 76 76 "linux-swap" => "82", 77 77 "LVM" => "8e", … … 194 194 if ($cylend =~ /^\+/) { 195 195 $cylend =~ s/^\+//; 196 if ($cylend =~ /K$/) { 197 $cylend =~ s/K$//; 198 $cylend *= 1024; 199 } elsif ($cylend =~ /M$/) { 200 $cylend =~ s/M$//; 201 $cylend *= 1048576; 202 } elsif ($cylend =~ /G$/) { 203 $cylend =~ s/G$//; 204 $cylend *= 1073741824; 205 } 196 # Handles suffixes; return bytes 197 $cylend = decode_Bsuf($cylend,1); 206 198 # This gives the number of cyl 207 199 $cylend /= $un; … … 342 334 "ext2" => "Linux", 343 335 "ext3" => "Linux", 336 "reiserfs" => "Linux", 344 337 "linux-swap" => "Linux swap", 345 338 "LVM" => "Linux LVM", … … 356 349 my $cmt; 357 350 format FLOG1 = 358 @<<<<<<<<<<<< @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<<351 @<<<<<<<<<<<< @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<< 359 352 $part, $mstart, $mend, $length, $pid, $cmt 360 353 . … … 362 355 @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 363 356 $part, 364 @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<<357 @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<< 365 358 $mstart, $mend, $length, $pid, $cmt 366 359 . 367 360 format STDOUT1 = 368 @<<<<<<<<<<<< @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<<361 @<<<<<<<<<<<< @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<< 369 362 $part, $mstart, $mend, $length, $pid, $cmt 370 363 . … … 372 365 @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 373 366 $part, 374 @>>>>>>>> @>>>>>>>> @>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<<367 @>>>>>>>>>> @>>>>>>>>>> @>>>>>>>>>> @>>> @<<<<<<<<<<<<<<<<<<<<<<<<<<<< 375 368 $mstart, $mend, $length, $pid, $cmt 376 369 . 377 #/dev/hda1 1 77579 39099374+ ee EFI GPT 370 # Device Boot Start End Blocks Id System 371 #/dev/hda1 1 77579 39099374+ ee EFI GPT 372 378 373 379 374 # … … 386 381 387 382 # This will return MB 388 get_parted ($device,$start,$end,\%type ,\%flags);383 get_parted ($device,$start,$end,\%type); 389 384 390 385 while (($n,$d) = each %type) { … … 395 390 $mstart = sprintf("%d",$$start{$n}*1048576/$un); 396 391 $mstart = 1 if ($mstart < 1); 392 $mstart = $endmax if ($mstart > $endmax); 397 393 $mend = sprintf("%d",$$end{$n}*1048576/$un - 1); 398 394 $mend = $endmax if ($mend > $endmax); 395 $mend = 1 if ($mend < 1); 399 396 # length is in 1K blocks 400 397 $length = sprintf("%d",($mend-$mstart+1)*$un/1024); … … 486 483 # 487 484 # Parted gives info in MB 485 # (depending on versions - 1.6.25.1 provides suffixes) 488 486 # 489 487 sub get_parted { … … 493 491 my $end = shift; 494 492 my $type = shift; 495 my $ flags = shift;493 my $void; 496 494 my $d; 497 495 my $n; 496 my $ret; 497 my $mode; 498 my $size; 499 500 open (PARTED, "$parted -v |") || die "Unable to read from $parted"; 501 $d = <PARTED>; 502 print FLOG "$d"; 503 close(PARTED); 498 504 499 505 open (PARTED, "$parted -s $device print |") || die "Unable to read from $parted"; … … 502 508 $d = <PARTED>; 503 509 $d = <PARTED>; 510 511 # depending on parted version, information given change: 512 if ($d =~ /\bSize\b/) { 513 # SLES 10 parted >= 1.6.25 514 $mode=1; 515 } else { 516 # RHEL 3 parted <= 1.6.3 517 $mode=0; 518 } 519 print FLOG "mode: $mode\n"; 504 520 print FLOG "Got from parted: \n"; 505 print FLOG "Minor Start End Filesystem Flags\n";521 print FLOG "Minor Start End Filesystem\n"; 506 522 # Get info from each partition line 507 523 while (($n,$d) = split(/\s/, <PARTED>,2)) { … … 510 526 $d =~ s/^\s*//; 511 527 $d =~ s/\s+/ /g; 512 ($$start{$n},$$end{$n},$$type{$n},$$flags{$n}) = split(/ /,$d); 528 if ($mode == 0) { 529 ($$start{$n},$$end{$n},$$type{$n},$void) = split(/ /,$d); 530 } elsif ($mode == 1) { 531 ($$start{$n},$$end{$n},$size,$$type{$n},$void) = split(/ /,$d); 532 } else { 533 die "Undefined mode $mode"; 534 } 513 535 $$start{$n} = "" if (not defined $$start{$n}); 514 536 $$end{$n} = "" if (not defined $$end{$n}); 515 537 $$type{$n} = "" if (not defined $$type{$n}); 516 $$flags{$n} = "" if (not defined $$flags{$n}); 517 print FLOG "$n $$start{$n} $$end{$n} $$type{$n} $$flags{$n}\n"; 538 # Handles potential suffixes in latest parted version. Return MB 539 $ret = decode_Bsuf($$start{$n},1048576); 540 $$start{$n} = $ret; 541 $ret = decode_Bsuf($$end{$n},1048576); 542 $$end{$n} = $ret; 543 print FLOG "$n $$start{$n} $$end{$n} $$type{$n}\n"; 518 544 } 519 545 close(PARTED); 520 546 } 547 548 sub decode_Bsuf { 549 550 my $size = shift; 551 my $unit = shift; 552 my $ret = 0; 553 554 #print FLOG "decode_Bsuf input: $size / $unit "; 555 if ($size =~ /KB$/i) { 556 $size =~ s/KB$//i; 557 $size *= 1024; 558 } elsif ($size =~ /MB$/i) { 559 $size =~ s/MB$//i; 560 $size *= 1048576; 561 } elsif ($size =~ /GB$/i) { 562 $size =~ s/GB$//i; 563 $size *= 1073741824; 564 } elsif ($size =~ /TB$/i) { 565 $size =~ s/TB$//i; 566 $size *= 1099511627776; 567 } else { 568 # Nothing to do 569 } 570 $ret = $size / $unit; 571 #print FLOG " - output : $size => $ret\n"; 572 return($ret); 573 } 574 521 575 522 576 # Based on Version 2.4 27-Sep-1996 Charles Bailey bailey@genetics.upenn.edu -
branches/stable/mondo/src/common/libmondo-archive.c
r1564 r1570 745 745 run_program_and_log_output 746 746 ("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf", 747 5); 748 } 749 if (!does_file_exist("/etc/elilo.conf") 750 && does_file_exist("/boot/efi/efi/debian/elilo.conf")) { 751 run_program_and_log_output 752 ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf", 753 5); 754 if (!does_file_exist("/etc/elilo.conf") 755 && does_file_exist("/boot//efi/debian/elilo.conf")) { 756 run_program_and_log_output 757 ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf", 747 758 5); 748 759 } -
branches/stable/mondo/src/restore-scripts/mondo/stabelilo-me
r1564 r1570 29 29 LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf" 2 30 30 old_eliloconf="/mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf" 31 return 0 32 elif [ -f "/mnt/RESTORING/boot/efi/efi/debian/elilo.conf" ] ; then 33 LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/debian/elilo.conf" 2 34 old_eliloconf="/mnt/RESTORING/boot/efi/efi/debian/elilo.conf" 35 return 0 36 elif [ -f "/mnt/RESTORING/boot/efi/debian/elilo.conf" ] ; then 37 LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/debian/elilo.conf" 2 38 old_eliloconf="/mnt/RESTORING/boot/efi/debian/elilo.conf" 31 39 return 0 32 40 else -
branches/stable/tools/build2pkg
r1513 r1570 179 179 fi 180 180 cd $TOPBUILDDIR/build-${p} 181 ar=` arch`181 ar=`uname -m` 182 182 pkg1=$p-${PVER}-${ar}-${TAG}mr.tgz 183 183 echo "Running sudo /sbin/makepkg -p -l y -c y $pkg1" -
branches/stable/tools/qemu-env
r1467 r1570 14 14 export iph=10.0.2.2 15 15 16 ARCH=`/bin/ arch`16 ARCH=`/bin/uname -m` 17 17 if [ $ARCH = "x86_64" ]; then 18 18 qemucmd32=/usr/bin/qemu-system-i386
Note:
See TracChangeset
for help on using the changeset viewer.