Changeset 205

Show
Ignore:
Timestamp:
02/14/07 15:16:21 (2 years ago)
Author:
ludo
Message:

better detection for LVM based images (from r4012)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/webmin/lbs-cd/debian/changelog

    r183 r205  
    1 webmin-lbs-cd (1.7.1) stable; urgency=low 
     1webmin-lbs-cd (1.7.2) stable; urgency=low 
    22 
    33  * New release. see SVN logs 

  • trunk/webmin/lbs-cd/index.cgi

    r160 r205  
    224224        my $buff; 
    225225         
    226         open F,$in{'dir'}."CONF"; 
     226        open F,$in{'dir'}."conf.txt"; 
    227227        while (<F>) {$buff .= $_;} 
    228228        close(F); 
    229229 
    230         $t->assign('OLDCD', $text{'oldcd'}); 
    231         $t->parse('form.oldcd'); 
    232  
     230        my $countlvm = 0; 
     231        while ($buff =~ /PATH\/Lvm/g) { $countlvm++ } 
     232         
     233        if ($countlvm <= 1) { 
     234            $t->assign('OLDCD', $text{'oldcd'}); 
     235            $t->parse('form.oldcd'); 
     236        } 
    233237        $t->assign('CONTAIN', $buff); 
    234238        $t->assign('URL', $in{'dir'}); 

  • trunk/webmin/lbs-cd/module.info

    r183 r205  
    33desc_fr=LRS : Génération de CD bootable 
    44depends=0.92 lbs_common  
    5 version=1.7.1 
     5version=1.7.2 

  • trunk/webmin/lbs-cd/templates/lbs-cd.tmpl

    r160 r205  
    2424        <h2>{CONFFILECONTAINS}</h2> 
    2525        <table width=100% border> 
    26         <tr {CB}><td><pre> 
    27         {CONTAIN} 
    28         </pre></td></tr> 
     26        <tr {CB}><td><pre>{CONTAIN}</pre></td></tr> 
    2927        </table><br> 
    3028