# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1479482177 -3600
# Node ID 392ce00aa117e53fb9e1026dd110398dfe330998
# Parent  338b35b6174952c25ada9856ddb8bf42af207d9c
live.cgi, ISO hybrid: add customize

diff -r 338b35b61749 -r 392ce00aa117 live.cgi
--- a/live.cgi	Fri Oct 21 08:19:50 2016 +0200
+++ b/live.cgi	Fri Nov 18 16:16:17 2016 +0100
@@ -37,7 +37,7 @@
 	<menu>
 		<li><a data-icon="" href="live.cgi?liveusb" data-root>$(_ 'Create a live USB key')</a></li>
 		<li><a data-icon="" href="live.cgi#liveiso" data-root>$(_ 'Create a live CD-ROM')</a></li>
-		<li><a data-icon="" href="live.cgi#hybrid">$(_ 'Create a hybrid ISO')</a></li>
+		<li><a data-icon="" href="live.cgi#hybrid" data-root>$(_ 'Create a hybrid ISO')</a></li>
 		<li><a data-icon="" href="live.cgi#loram" data-root>$(_ 'Convert ISO to loram')</a></li>
 		<li><a data-icon="" href="live.cgi#meta" data-root>$(_ 'Build a meta ISO')</a></li>
 	</menu>
@@ -104,11 +104,16 @@
 		;;
 
 	*\ hybrid\ *)
+		custom=""
+		[ -n "$(GET extracmdline)" ] &&
+		custom="$custom -a \\\"$(GET extracmdline)\\\" "
+		[ -n "$(GET extrainitrd)" ] &&
+		custom="$custom -i \\\"$(GET extrainitrd)\\\" "
 		export output='raw'
 		DISPLAY=':0.0' XAUTHORITY='/var/run/slim.auth' \
 		$TERMINAL $TERM_OPTS \
 			-T "$(_ 'Create a hybrid ISO')" \
-			-e "iso2exe $(GET input)" &
+			-e iso2exe $custom$(GET input) -f &
 		;;
 esac
 
@@ -368,6 +373,18 @@
 				$(file_chooser 'input' '' 'cd' 'application/x-cd-image')
 			</td></tr>
 		</table>
+		<div>
+$(_ "By the way, you can customize the ISO image to your needs.")
+		<ul>
+<li>$(_ "Append the kernel command line.")<span data-img="info"
+title="$(_ "Examples: add your locales")
+(lang=fr_FR kmap=fr-latin1 tz=Europe/Paris) $(_ "or modify the init script")
+(rdinit=/myowninit.sh)"></span><input type="text" name="extracmdline" /></li>
+<li>$(_ "Load an extra initrd with your settings.")<span data-img="info" 
+title="$(_ "Examples: add your wifi/ssh/vpn keys or your applications")">
+</span>$(file_chooser extrainitrd)</li>
+		</ul>
+		</div>
 
 		<footer>
 			<button type="submit" name="hybrid" data-icon="cd">$(_ 'Build a hybrid ISO')</button>