SliTaz Repositories

     1.1 --- a/live.cgi	Fri Oct 21 08:19:50 2016 +0200
     1.2 +++ b/live.cgi	Fri Nov 18 16:16:17 2016 +0100
     1.3 @@ -37,7 +37,7 @@
     1.4  	<menu>
     1.5  		<li><a data-icon="" href="live.cgi?liveusb" data-root>$(_ 'Create a live USB key')</a></li>
     1.6  		<li><a data-icon="" href="live.cgi#liveiso" data-root>$(_ 'Create a live CD-ROM')</a></li>
     1.7 -		<li><a data-icon="" href="live.cgi#hybrid">$(_ 'Create a hybrid ISO')</a></li>
     1.8 +		<li><a data-icon="" href="live.cgi#hybrid" data-root>$(_ 'Create a hybrid ISO')</a></li>
     1.9  		<li><a data-icon="" href="live.cgi#loram" data-root>$(_ 'Convert ISO to loram')</a></li>
    1.10  		<li><a data-icon="" href="live.cgi#meta" data-root>$(_ 'Build a meta ISO')</a></li>
    1.11  	</menu>
    1.12 @@ -104,11 +104,16 @@
    1.13  		;;
    1.14  
    1.15  	*\ hybrid\ *)
    1.16 +		custom=""
    1.17 +		[ -n "$(GET extracmdline)" ] &&
    1.18 +		custom="$custom -a \\\"$(GET extracmdline)\\\" "
    1.19 +		[ -n "$(GET extrainitrd)" ] &&
    1.20 +		custom="$custom -i \\\"$(GET extrainitrd)\\\" "
    1.21  		export output='raw'
    1.22  		DISPLAY=':0.0' XAUTHORITY='/var/run/slim.auth' \
    1.23  		$TERMINAL $TERM_OPTS \
    1.24  			-T "$(_ 'Create a hybrid ISO')" \
    1.25 -			-e "iso2exe $(GET input)" &
    1.26 +			-e iso2exe $custom$(GET input) -f &
    1.27  		;;
    1.28  esac
    1.29  
    1.30 @@ -368,6 +373,18 @@
    1.31  				$(file_chooser 'input' '' 'cd' 'application/x-cd-image')
    1.32  			</td></tr>
    1.33  		</table>
    1.34 +		<div>
    1.35 +$(_ "By the way, you can customize the ISO image to your needs.")
    1.36 +		<ul>
    1.37 +<li>$(_ "Append the kernel command line.")<span data-img="info"
    1.38 +title="$(_ "Examples: add your locales")
    1.39 +(lang=fr_FR kmap=fr-latin1 tz=Europe/Paris) $(_ "or modify the init script")
    1.40 +(rdinit=/myowninit.sh)"></span><input type="text" name="extracmdline" /></li>
    1.41 +<li>$(_ "Load an extra initrd with your settings.")<span data-img="info" 
    1.42 +title="$(_ "Examples: add your wifi/ssh/vpn keys or your applications")">
    1.43 +</span>$(file_chooser extrainitrd)</li>
    1.44 +		</ul>
    1.45 +		</div>
    1.46  
    1.47  		<footer>
    1.48  			<button type="submit" name="hybrid" data-icon="cd">$(_ 'Build a hybrid ISO')</button>