Changeset 3148


Ignore:
Timestamp:
Jun 19, 2013, 8:50:28 AM (6 years ago)
Author:
bruno
Message:

2nd phase for svn merge -r 2935:3146 ../3.0

Location:
branches/3.1
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • branches/3.1/mindi/mindi

    r3147 r3148  
    22342234            # Used by ia64
    22352235            if [ "`gzip -cd $fname | strings 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
    2236                 LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
     2236                LogFile "Have you recompiled your kernel \"$fname\" w/o rebooting? Naughty but I'll allow it..."
    22372237                duff_kernels="$fname $duff_kernels"
    22382238            else
     
    22422242        else
    22432243            if [ "`strings $fname 2> /dev/null | grep -F "$kdate"`" = "" ] ; then
    2244                 LogAll "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
     2244                LogFile "Have you recompiled your kernel \"$fname\" w/o rebooting?\n Naughty but I'll allow it..."
    22452245                duff_kernels="$fname $duff_kernels"
    22462246            else
     
    25412541            echo $i >> $MINDI_TMP/cp.lis
    25422542        fi
     2543        if [ -L $mountpoint/$i ] && [ `echo "$i" | grep "\.ko$"` ]; then
     2544            echo "Replacing module symlink ($i) with actual file"
     2545            rm -f $mountpoint/$i
     2546            cp -Lf $i $mountpoint/$i
     2547            ls -l $mountpoint/$i
     2548        fi
    25432549    done
    25442550
     
    27202726fi
    27212727
    2722 > $LOGFILE
    27232728LogFile "mindi v$MINDI_VERSION"
    27242729LogFile "$ARCH architecture detected"
     
    27282733LogFile "-----------------------------"
    27292734
     2735[ -e "/sbin/mkdosfs" ] && [ ! -e "/sbin/mkfs.vfat" ] && LogAll "/sbin/mkfs.vfat is missing!"
     2736
    27302737# Log some capital variables
    27312738[ "$MINDI_PREFIX" = "XXX" ] && Die "Mindi has not been installed correctly."
    27322739[ "$MINDI_CONF" = "YYY" ] && Die "Mindi has not been installed correctly."
    2733 LogFile "MONDO_SHARE = $MONDO_SHARE" 
     2740LogFile "MONDO_SHARE = $MONDO_SHARE"
    27342741LogFile "MINDI_DATA = $MINDI_DATA"
    2735 LogFile "MINDI_SBIN = $MINDI_SBIN" 
    2736 LogFile "MINDI_CONF = $MINDI_CONF" 
     2742LogFile "MINDI_SBIN = $MINDI_SBIN"
     2743LogFile "MINDI_CONF = $MINDI_CONF"
    27372744if [ -f $MINDI_CONFIG ]; then
    27382745    LogFile "-----------------------------"
     
    28352842    LogFile "No file /etc/mdadm.conf"
    28362843fi
    2837 LogFile "-------------" 
    2838 LogFile "cat $CMDLINE" 
    2839 LogFile "-------------" 
     2844LogFile "-------------"
     2845LogFile "cat $CMDLINE"
     2846LogFile "-------------"
    28402847cat $CMDLINE >> $LOGFILE
    2841 LogFile "-------------" 
    2842 LogFile "cat /proc/swaps:" 
    2843 LogFile "-------------" 
     2848LogFile "-------------"
     2849LogFile "cat /proc/swaps:"
     2850LogFile "-------------"
    28442851cat /proc/swaps >> $LOGFILE
    28452852LogFile "-------------"
     
    31233130    LogIt "Mindi-`$MINDI_LIB/rootfs/bin/busybox 2>&1 | head -1`"
    31243131else
    3125     LogIt "ERROR: No mindi-busybox installed"
     3132    LogIt "WARNING: No mindi-busybox installed"
    31263133fi
    31273134
  • branches/3.1/mondo/src/common/libmondo-archive.c

    r3147 r3148  
    721721    }
    722722    log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
     723    if (bootldr_ver != NULL) {
     724        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
     725        log_to_screen(tmp);
     726        mr_free(tmp);
     727    }
    723728    if (bootldr_ver != NULL) {
    724729        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
     
    18801885    FILE *fin = NULL;
    18811886    char *q;
     1887    char *q;
    18821888
    18831889    /*@ buffers ******************************************** */
  • branches/3.1/mondo/src/common/libmondo-cli.c

    r3147 r3148  
    508508                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
    509509                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
     510                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
     511                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
    510512                } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
    511513                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
     
    517519                if (strstr(bkpinfo->netfs_proto, "sshfs")) {
    518520                    mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
     521                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
     522                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
    519523                } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
    520524                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
  • branches/3.1/mondo/src/common/libmondo-devices.c

    r3147 r3148  
    332332    char *tmp = NULL;
    333333    char *p;
     334    char *p;
    334335
    335336    /*@ ints ******************************************************* */
     
    983984    char *command = NULL;
    984985    char *format_sz = NULL;
     986    char *p;
    985987    char *p;
    986988
  • branches/3.1/mondo/src/common/libmondo-filelist.c

    r3147 r3148  
    398398    FILE *pattr = NULL;
    399399    char *tmp = NULL;
     400
     401    char *p;
    400402
    401403    char *p;
  • branches/3.1/mondo/src/common/libmondo-files.c

    r3147 r3148  
    5151    /*@ pointers **************************************************** */
    5252    char *p = NULL;
     53    char *q;
    5354    char *q;
    5455    FILE *fin;
     
    128129    char *incoming = NULL;
    129130    char *q;
     131    char *q;
    130132
    131133    /*@ long ******************************************************** */
     
    206208    char *tmp = NULL;
    207209    char *incoming = NULL;
     210    char *q;
    208211    char *q;
    209212
     
    475478    char *command = NULL;
    476479    char *p = NULL;
     480    char *p = NULL;
    477481
    478482    /*@ pointers **************************************************** */
     
    544548    char *curr_cksum = NULL;
    545549    char *tmp = NULL;
     550    char *q;
    546551    char *q;
    547552
     
    684689    /*@ buffers **************************************************** */
    685690    char *incoming = NULL;
     691    char *p = NULL;
    686692    char *p = NULL;
    687693
  • branches/3.1/mondo/src/common/libmondo-fork.c

    r3147 r3148  
    4242    char *newcall = NULL;
    4343    char *tmp = NULL;
     44    char *p;
    4445    char *p;
    4546
  • branches/3.1/mondo/src/common/newt-specific.c

    r3147 r3148  
    171171        /*@ buffer *********************************************************** */
    172172        char *tmp = NULL;
     173        char *p;
    173174        char *p;
    174175        int i;
     
    781782        /*@ buffers *********************************************************** */
    782783        char *prompt = NULL;
     784        char *q;
    783785        char *q;
    784786
     
    11491151        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
    11501152        char *outstr = NULL;
     1153        char *p;
    11511154        char *p;
    11521155        t_bkptype backup_type;
     
    13481351        char *tmp = NULL;
    13491352        char *p;
     1353        char *p;
    13501354        char *tmp1 = NULL;
    13511355        FILE *fin, *fout;
  • branches/3.1/mondo/src/mondoarchive/mondoarchive.c

    r3147 r3148  
    279279        finish(0);
    280280    }
     281    if (argc >= 2 && !strcmp(argv[1], "mkraidtab")) {
     282        g_loglevel = 10;
     283        g_text_mode = TRUE;
     284        setup_newt_stuff();
     285#undef MDSTAT_FILE
     286#define MDSTAT_FILE "/tmp/mdstat"
     287        if (!(fin = fopen(MDSTAT_FILE, "r"))) {
     288            log_msg(1, "Could not open %s.\n", MDSTAT_FILE);
     289                finish(1);
     290        }
     291
     292        create_raidtab_from_mdstat(MDSTAT_FILE,"/tmp/raidtab");
     293        finish(0);
     294    }
    281295
    282296    if (argc > 2 && !strcmp(argv[1], "find-cd")) {
  • branches/3.1/mondo/src/mondorestore/mondo-prep.c

    r3147 r3148  
    14211421    char *tmp1 = NULL;
    14221422    char *tmp1 = NULL;
     1423    char *tmp1 = NULL;
    14231424
    14241425    /** end *************************************************************/
     
    22632264    } else if (strcmp(format, "btrfs") == 0) {
    22642265              strcpy(program, "mkfs.btrfs");
     2266    } else if (strcmp(format, "btrfs") == 0) {
     2267              strcpy(program, "mkfs.btrfs");
    22652268    } else if (strcmp(format, "minix") == 0) {
    22662269        mr_asprintf(program, "mkfs.minix");
  • branches/3.1/mondo/src/mondorestore/mondo-rstr-tools.c

    r3147 r3148  
    8080char *incoming = NULL;
    8181char *question = NULL;
     82char *q;
    8283char *q;
    8384
     
    13991400    bool done;
    14001401    int res = 0;        /*  FALSE */
     1402    bool mntlistchg = FALSE;
     1403    FILE *fin = NULL;
    14011404    bool mntlistchg = FALSE;
    14021405    FILE *fin = NULL;
     
    18771880    char *incoming = NULL;
    18781881    char *q;
     1882    char *q;
    18791883
    18801884    assert_string_is_neither_NULL_nor_zerolength(output_file);
Note: See TracChangeset for help on using the changeset viewer.