Changeset 2603 in MondoRescue
- Timestamp:
- Mar 22, 2010, 1:56:30 PM (14 years ago)
- Location:
- branches/2.2.10
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mindi/mindi
r2599 r2603 900 900 outfile=$1 901 901 > $outfile 902 [ "$BACKUP_MEDIA_TYPE" ] && echo "backup-media-type $BACKUP_MEDIA_TYPE" >> $outfile 902 903 [ "$TAPESIZE" ] && echo "media-size $TAPESIZE" >> $outfile 903 904 [ "$TAPEDEV" ] && echo "media-dev $TAPEDEV" >> $outfile … … 1377 1378 old_pwd=`pwd` 1378 1379 cd $MINDI_TMP/iso 1380 LogFile "-------------------" 1381 LogFile "Content of the ISO:" 1382 LogFile "-------------------" 1383 ls -Rla >> $LOGFILE 1384 LogFile "-------------------" 1385 1379 1386 if [ "$ARCH" != "ia64" ] ; then 1380 1387 if [ _"$MONDO_SHARE" != _"" ]; then … … 1510 1517 cat $MINDI_TMP/usb/syslinux.cfg |tee -a $LOGFILE 1511 1518 LogAll "------------------------------------------" 1519 LogFile "--------------------------" 1520 LogFile "Content of the USB device:" 1521 LogFile "--------------------------" 1522 (cd $MINDI_TMP/usb ; ls -Rla) >> $LOGFILE 1523 LogFile "--------------------------" 1524 1512 1525 umount $MINDI_TMP/usb 1513 1526 if [ "$ARCH" != "ia64" ] ; then … … 1808 1821 Die "You have $res files present in dependency list\nbut absent from filesystem." 1809 1822 fi 1810 FindAndAddUserKeyboardMappingFile 1823 FindAndAddUserKeyboardMappingFile 1811 1824 mkdir -p $bigdir/tmp 1812 1825 [ -d "/mnt/.boot.d" ] && echo "Oh Jebus" > $bigdir/tmp/DUMBASS-GENTOO … … 2126 2139 # ln.lis will contain the list of files to link to existing files 2127 2140 # rm.lis will contain the list of files to remove after the copies 2141 2142 # Get kbd conf from data disk preparation 2143 echo $MINDI_CACHE/KEYMAP-LIVES-HERE >> $MINDI_TMP/cp.lis 2128 2144 # AL04Oct08: Check whether /lib64 is a link and if so explicitly create one in rootfs 2129 2145 if [ -h "/lib64" ]; then … … 2251 2267 MakeMondoConfigFile $MINDI_CACHE/mondorestore.cfg 2252 2268 echo $MINDI_CACHE/mondorestore.cfg >> $MINDI_TMP/cp.lis 2269 LogFile "-----------------------------------" 2270 LogFile "Content of mondorestore.cfg: " 2271 LogFile "-----------------------------------" 2272 cat $MINDI_CACHE/mondorestore.cfg >> $LOGFILE 2273 LogFile "-----------------------------------" 2253 2274 fi 2254 2275 echo proc >> $MINDI_TMP/mkdir.lis … … 2661 2682 USE_GZIP="${19}" 2662 2683 USE_LZMA="${20}" 2684 BACKUP_MEDIA_TYPE="${21}" 2663 2685 [ "$USE_COMP" = "" ] && USE_COMP=yes 2664 2686 [ "$USE_GZIP" = "" ] && USE_GZIP=no -
branches/2.2.10/mindi/rootfs/sbin/hack-cfg-if-necessary
r2591 r2603 17 17 18 18 if [ -f $MINDI_CACHE/mondorestore.cfg ]; then 19 if [ ! grep "backup-media-type iso" $MINDI_CACHE/mondorestore.cfg 2 > /dev/null] ; then 19 grep -q "backup-media-type iso" $MINDI_CACHE/mondorestore.cfg 2> /dev/null 20 if [ $? -ne 0 ] ; then 20 21 LogIt "Config file is fine, BTW." 21 22 exit 0 22 23 fi 23 fi24 25 if [ -f $MINDI_CACHE/mondorestore.cfg ]; then26 24 LogIt "Re-jigging mondorestore.cfg because you backed up to ISOs and then burned them to CDs" 1 27 25 sed -i 's/backup-media-type iso/backup-media-type cdr/' $MINDI_CACHE/mondorestore.cfg -
branches/2.2.10/mindi/rootfs/sbin/init
r2597 r2603 91 91 openvt -l /bin/sh /sbin/wait-for-petris 92 92 openvt -l /usr/bin/tail -f $LOGFILE 93 serial="/foo" 93 94 # By default first serial line is configured as tty 94 95 # Required to have a correct serial console support (MP on ia64 or VSP with iLO2 e.g.) 95 for i in `cat /proc/cmdline` ; do96 for i in `cat $CMDLINE` ; do 96 97 echo $i | grep -qi serial= && serial=`echo $i | cut -d= -f2` 97 98 done … … 376 377 377 378 StartLvms() { 378 if [ "`grep -i nolvm /proc/cmdline`" ]; then379 if [ "`grep -i nolvm $CMDLINE`" ]; then 379 380 return; 380 381 fi … … 497 498 local raid_devices i 498 499 499 if [ "`grep -i noraid /proc/cmdline`" ]; then500 if [ "`grep -i noraid $CMDLINE`" ]; then 500 501 return; 501 502 fi … … 512 513 done 513 514 elif which mdrun > /dev/null 2> /dev/null ; then 514 if [ "`grep -i nomd /proc/cmdline`" ]; then515 if [ "`grep -i nomd $CMDLINE`" ]; then 515 516 return; 516 517 fi … … 518 519 mdrun 519 520 elif which mdadm > /dev/null 2> /dev/null ; then 520 if [ "`grep -i nomd /proc/cmdline`" ]; then521 if [ "`grep -i nomd $CMDLINE`" ]; then 521 522 return; 522 523 fi … … 636 637 ModprobeAllModules() { 637 638 638 lismod=`find /lib/modules -name '*\.ko*' -o -name '*\.o*'` 639 echo "Preparing to install modules..." 640 # Create a cache first time 641 if [ ! -f /tmp/lismod.txt ]; then 642 find /lib/modules -name '*\.ko*' -o -name '*\.o*' > /tmp/lismod.txt 643 fi 644 lismod=`cat /tmp/lismod.txt` 639 645 # loading forced modules first 640 646 for m in $lismod; do … … 650 656 k=`basename $m | sed 's/\.ko.*$//'` 651 657 j=`basename $k | sed 's/\.o.*$//'` 658 lsmod | grep -qE '^$j$' 659 if [ $? -eq 0 ];then 660 # Already loaded 661 continue 662 fi 652 663 echo "$DENY_MODS" | grep -q "$j " 653 664 if [ $? -eq 0 ]; then … … 730 741 export FORCE_MODS=" " 731 742 fi 732 if [ "`grep -i excludedevs /proc/cmdline`" ]; then733 export MINDI_EXCLUDE_DEVS="`cat /proc/cmdline| sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone"743 if [ "`grep -i excludedevs $CMDLINE`" ]; then 744 export MINDI_EXCLUDE_DEVS="`cat $CMDLINE | sed 's~.*excludedevs=\"\(.*\)\".*~\1~'` mondonone" 734 745 for d in $MINDI_EXCLUDE_DEVS ; do 735 746 echo "Mountlist exclusion == $d" -
branches/2.2.10/mondo/configure.in
r2602 r2603 49 49 AC_DEFINE_UNQUOTED(MAX_NOOF_MEDIA, $max_noof_media, [Maximum number of media]) 50 50 AC_DEFINE_UNQUOTED(EXTTAPE, $exttape, [Tape blocksize]) 51 52 # We need to know where is mindi conf dir in order to add content to it 53 if [ "_$MINDI_CONF" != "_" ]; then 54 export MINDI_CONF 55 else 56 export MINDI_CONF=/usr/local/etc/mindi 57 fi 58 51 59 52 60 # ( which automake 2>/dev/null >/dev/null && ( automake --version 2>&1 | grep -q 1.5 || automake --version 2>&1 | grep -q 1.7 || AC_MSG_ERROR([Automake must be version 1.5 or 1.7, if you have it at all]) ) ) -
branches/2.2.10/mondo/deplist.d/Makefile.am
r2602 r2603 1 mindiconfdir = `mindi --printvar MINDI_CONF`2 deplistdir = $( mindiconfdir)/deplist.d1 conf=`if [ "_$(MINDI_CONF)" = "_" ]; then echo $(sysconfdir)/mindi; else echo $(MINDI_CONF); fi` 2 deplistdir = $(conf)/deplist.d 3 3 4 deplist dir_DATA = mondo.conf4 deplist_DATA = mondo.conf -
branches/2.2.10/mondo/src/common/libmondo-archive.c
r2601 r2603 757 757 fatal_error("Unknown backup_media_type"); 758 758 } 759 mr_free(value);760 759 761 760 if ((bkpinfo->backup_media_type == usb) && (bkpinfo->media_device)) { … … 808 807 use_gzip_sz, // parameter #19 (STRING) 809 808 use_lzma_sz, // parameter #20 (STRING) 809 value, // parameter #21 (STRING) 810 810 MONDO_LOGFILE); 811 811 812 mr_free(value); 812 813 mr_free(tmp2); 813 814 mr_free(tape_device); -
branches/2.2.10/mondo/src/mondorestore/mondo-prep.c
r2508 r2603 214 214 #endif 215 215 216 tmp = call_program_and_get_last_line_of_output("cat /proc/cmdline");216 tmp = call_program_and_get_last_line_of_output("cat "CMDLINE); 217 217 if (strstr(tmp, "nolvm")) { 218 218 mr_free(tmp);
Note:
See TracChangeset
for help on using the changeset viewer.