# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1626190658 0
# Node ID 798a84e27cc9797e2baf566925d5bafdeff41640
# Parent  d968049fa2bd5b55dc694a2ab9be466adc6b5ca0
helper: fix /etc/packages.conf

diff -r d968049fa2bd -r 798a84e27cc9 helper
--- a/helper	Fri Feb 28 18:38:34 2020 +0100
+++ b/helper	Tue Jul 13 15:37:38 2021 +0000
@@ -351,12 +351,13 @@
 	pkg=$(get_receipt $1 $2)
 	[ -n "$pkg" ] || exit
 	. $pkg
+	[ -d $2/fs/etc ] || mkdir -p $2/fs/etc
 	echo "$1 $VERSION $(md5sum $(dirname $pkg)/fs.cpio.lzma | awk '{ print $1 }')" >> $2/fs/etc/packages.conf
 	if grep -qs ^post_install $pkg; then
 		[ -s $2/vars ] && . $2/vars
 		echo "=== $pkg: $(date) ===" >> $2/post_install.log 2>&1
 		post_install $2/fs >> $2/post_install.log 2>&1
-		sed -e 's/^export/ /' -e 's/^/  /' -e '/^   suggested=/d' \
+		sed -e 's/^export/ /' -e 's/^/  /' -e '/^   suggested=/d' -e '/EXTRA_SUGGESTED=/d' \
 			< $2/vars >> $2/fs/etc/packages.conf
 	fi
 	rm -f $2/vars
diff -r d968049fa2bd -r 798a84e27cc9 index.php
--- a/index.php	Fri Feb 28 18:38:34 2020 +0100
+++ b/index.php	Tue Jul 13 15:37:38 2021 +0000
@@ -1,4 +1,4 @@
-<?php
+<?php	// needs 'www ALL=NOPASSWD: /path/to/helper' in /etc/sudoers
 include "download.php";
 $static = "http://mirror1.slitaz.org/static/";
 ?>
diff -r d968049fa2bd -r 798a84e27cc9 step5.php
--- a/step5.php	Fri Feb 28 18:38:34 2020 +0100
+++ b/step5.php	Tue Jul 13 15:37:38 2021 +0000
@@ -28,13 +28,26 @@
       if (!file_exists($_POST['tmp_dir']."out")) 
 	   shell_exec("sudo ./helper --mkimg ".$_POST['tmp_dir']);
       if (!isset($_POST['fdsize'])) $_POST['fdsize']="1474560";
-      foreach(array("737280" => "720K", "1228800" => "1.2M",
-		    "1474560" => "1.44M", "1720320" => "1.68M",
-		    "1966080" => "1.92M", "2949120" => "2.88M") as $sz => $nm) {
+      $use_optgroup=0;
+      foreach(array("360K 5¼-inch" => "", "368640" => "360K", "409600" => "400K",
+		    "720K 3½-inch" => "", "737280" => "720K", "819200" => "800K",
+      		    "1.2M 5¼-inch" => "", "1228800" => "1.2M",
+      		    "1.44M 3½-inch" => "", "1474560" => "1.44M", "1720320" => "1.68M",
+		    "1966080" => "1.92M", 
+		    "2.88M 3½-inch" => "", "2949120" => "2.88M", "5898240" => "3.36M") as $sz => $nm) {
+	if ($nm == "") {
+	  if ($use_optgroup != 0) echo "		</optgroup>\n";
+	  echo "		<optgroup label=\"$sz\">\n";
+	  $use_optgroup=1;
+	}
+	else {
 	  echo "		<option value=\"$sz\"";
 	  if ($sz == $_POST['fdsize']) echo " selected";
 	  echo ">$nm</option>\n";
-      } ?>
+	}
+      }
+      if ($use_optgroup != 0) echo "		</optgroup>\n";
+      ?>
 		</select>
 		</div>
 		<input name="download" value="DOS/EXE" type="submit"