Changeset 1408 in MondoRescue
- Timestamp:
- May 7, 2007, 2:07:32 PM (17 years ago)
- Location:
- branches/stable
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mindi/distributions/debian/rules
r996 r1408 26 26 dh_installdirs 27 27 # Build the installation tree: 28 ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export PREFIX=/usr && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh ) 28 export PREFIX=/usr 29 ( export RPMBUILDMINDI=true && export HEAD=$(CURDIR)/debian/$(PACKAGE_NAME) && export CONFDIR=/etc && export MANDIR=$(PREFIX)/share/man && export LIBDIR=$(PREFIX)/lib && export DOCDIR=$(PREFIX)/share/doc && ./install.sh ) 29 30 30 31 # Build architecture-independent files here. -
branches/stable/mindi/mindi
r1350 r1408 473 473 echo -en "." 474 474 reason="" 475 vanilla_lib_name=`echo "$optimized_lib_name" | sed s/i[5-7]86//| tr -s '/' '/'`475 vanilla_lib_name=`echo "$optimized_lib_name" | sed -e 's/i[5-7]86//' -e 's/cmov//' | tr -s '/' '/'` 476 476 echo "$vanilla_lib_name" >> $filelist 477 477 resolved=$vanilla_lib_name … … 940 940 local module_list module fname oss r kern 941 941 oss="/root/oss/modules" 942 module_list=" `lsmod | sed -n '2,$s/ .*//'`"942 module_list="$MODULES" 943 943 # Remove unwanted modules from list 944 944 for i in $DENY_MODS; do … … 977 977 if echo $fname | grep lvm &> /dev/null ; then 978 978 echo "This warning only affects you if you are using LVM." >> $LOGFILE 979 if lsmod| grep lvm &> /dev/null ; then979 if echo "$MODULES" | grep lvm &> /dev/null ; then 980 980 echo "I think you are, so please take heed!" >> $LOGFILE 981 981 else … … 1084 1084 echo -en "for outerloop in 1 2 3 4 5 ; do\necho -en \".\"\n" >> $outfile 1085 1085 # BERLIOS: That code is duplicated - Should be done once only 1086 list_to_echo=" `lsmod | sed -n '2,$s/ .*//'`"1086 list_to_echo="$MODULES" 1087 1087 # Remove unwanted modules from list 1088 1088 for i in $DENY_MODS; do … … 2696 2696 fi 2697 2697 2698 lsmod > tmp/original-lsmod.txt2699 2700 2698 cp --parents -Rdf /dev/fd0*[1,2][4,7,8]* . 2> /dev/null 2701 2699 cd $old_pwd … … 2814 2812 WhichOfTheseModulesAreLoaded() { 2815 2813 local modname loaded_modules 2816 loaded_modules=" `lsmod | tr -s ' ' '\t' | cut -f1 | grep -Fvx "Modules" | tr '\n' ' '`"2814 loaded_modules="$MODULES" 2817 2815 for modname in $1 ; do 2818 2816 [ "`echo "$loaded_modules" | grep -F " $modname "`" ] && echo "$modname" … … 2869 2867 Die "MINDI_CACHE undefined" 2870 2868 fi 2871 rm -rf $MINDI_CACHE 2> /dev/null2869 rm -rf $MINDI_CACHE/* 2> /dev/null 2872 2870 mkdir -p $MINDI_CACHE 2873 2871 … … 3037 3035 echo "-------------" >> $LOGFILE 3038 3036 lsmod >> $LOGFILE 3037 MODULES="`cat /proc/modules | awk '{print $1}'`" 3039 3038 echo "-------------" >> $LOGFILE 3040 3039 echo "Liste of extra modules is:" >> $LOGFILE … … 3288 3287 [ "$YOUR_KERNEL_SUCKS" ] && [ ! "$FAILSAFE_KVER" ] && Die "Please install mindi-kernel package. You need it.\nGo to http://www.mondorescue.org and download it, then install it." 3289 3288 3290 rm -f $MINDI_CACHE/{*img,*gz,*iso}3291 3292 3289 PrepareDataDiskImages $MINDI_CACHE 3293 3290 noof_disks=$? -
branches/stable/mindi/rootfs/sbin/init
r1351 r1408 523 523 openvt 8 /usr/bin/tail -f $LOGFILE 524 524 525 # Log some useful info 526 echo "init (from mindi v$MINDI_VER-r${MINDI_REV}" >> $LOGFILE 527 echo "/proc/cmdline is:" >> $LOGFILE 528 cat /proc/cmdline >> $LOGFILE 529 echo "Start date : `date`" >> $LOGFILE 530 echo "df result:" >> $LOGFILE 531 echo "----------" >> $LOGFILE 532 df >> $LOGFILE 533 echo "-------------" >> $LOGFILE 534 echo "mount result:" >> $LOGFILE 535 echo "-------------" >> $LOGFILE 536 mount >> $LOGFILE 537 echo "-------------" >> $LOGFILE 538 echo "lsmod result:" >> $LOGFILE 539 echo "-------------" >> $LOGFILE 540 lsmod >> $LOGFILE 541 echo "-------------" >> $LOGFILE 542 525 543 #------------------------------- 526 544 #ABSORBENTANDYELLOWANDPOROUSISHE#;# --- don't touch this either :) 527 545 #------------------------------- 528 529 lsmod > /tmp/ramdisk-lsmod.txt 2> /dev/null530 cut -d' ' -f1 /tmp/original-lsmod.txt /tmp/original-lsmod.txt /tmp/ramdisk-lsmod.txt | sort | uniq -d > /tmp/missing-modules.txt531 echo "Warning - these modules did not make it onto the ramdisk" >> $LOGFILE532 cat /tmp/missing-modules.txt >> $LOGFILE533 546 534 547 #ctrlaltdel soft -
branches/stable/mondo/src/common/libmondo-archive.c
r1365 r1408 2763 2763 if (!does_file_exist("/var/cache/mindi/mindi-kern.1722.img")) 2764 2764 #else 2765 /* BERLIOS: To be improved */ 2765 2766 if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img") 2766 2767 && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img") 2767 2768 && !does_file_exist("/var/cache/mindi/mindi-boot.2880.img") 2768 && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img")) 2769 && !does_file_exist("/var/cache/mindi/mindi-boot.5760.img") 2770 && !does_file_exist("/var/cache/mindi/mindi-boot.8192.img")) 2769 2771 #endif 2770 2772 { -
branches/stable/mondo/src/common/libmondo-devices.c
r1365 r1408 1979 1979 log_it("scratchdir = '%s'", bkpinfo->scratchdir); 1980 1980 log_it("tmpdir = '%s'", bkpinfo->tmpdir); 1981 log_it("image_devs = '%s'", bkpinfo->image_devs); 1981 1982 log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, 1982 1983 bkpinfo->boot_loader); -
branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
r1384 r1408 2223 2223 } 2224 2224 } else { 2225 mr_msg(2, 2225 /* BERLIOS : Useless ? */ 2226 /* That boot image doesn't always exist where the following method always works 2227 log_msg(2, 2226 2228 "gcffa --- looking at mounted CD for mindi-boot.2880.img"); 2227 /* BERLIOS : Useless ?2228 2229 mr_asprintf(&command, 2229 2230 "mount " MNT_CDROM … … 2232 2233 mr_asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file); 2233 2234 if (!does_file_exist(mounted_cfgf_path)) { 2234 mr_msg(2,2235 "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");2235 log_msg(2, 2236 "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz"); 2236 2237 mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary 2237 2238 run_program_and_log_output(command, TRUE);
Note:
See TracChangeset
for help on using the changeset viewer.