correct some menu entry counts

lib/util-advanced.sh

@@ -13,7 +13,7 @@
 advanced_menu() {
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 5
+        submenu 7
         DIALOG " $_InstAdvBase " --default-item ${HIGHLIGHT_SUB} \
           --menu "\n " 0 0 7 \
           "1" "$_InstDEGit" \
@@ -456,7 +456,7 @@ install_multimedia_menu() {
     while ((loopmenu)); do
         local PARENT="$FUNCNAME"
 
-        submenu 5
+        submenu 4
         DIALOG " $_InstMultMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_InstMultMenuBody\n " 0 0 4 \
           "1" "$_InstMulSnd" \
           "2" "$_InstMulCodec" \

lib/util-disk.sh

@@ -235,17 +235,17 @@ select_filesystem() {
     fs_opts=""
     CHK_NUM=0
 
-    DIALOG " $_FSTitle " --menu "\n$_FSBody\n " 0 0 12 \
+    DIALOG " $_FSTitle " --menu "\n$_FSBody\n " 0 0 10 \
       "$_FSSkip" "-" \
-        "btrfs" "mkfs.btrfs -f" \
-        "ext3" "mkfs.ext3 -q" \
-        "ext4" "mkfs.ext4 -q" \
-        "jfs" "mkfs.jfs -q" \
-        "nilfs2" "mkfs.nilfs2 -fq" \
-        "ntfs" "mkfs.ntfs -q" \
-        "reiserfs" "mkfs.reiserfs -q" \
-        "vfat" "mkfs.vfat -F32" \
-        "xfs" "mkfs.xfs -f" 2>${ANSWER} || return 1
+      "btrfs" "mkfs.btrfs -f" \
+      "ext3" "mkfs.ext3 -q" \
+      "ext4" "mkfs.ext4 -q" \
+      "jfs" "mkfs.jfs -q" \
+      "nilfs2" "mkfs.nilfs2 -fq" \
+      "ntfs" "mkfs.ntfs -q" \
+      "reiserfs" "mkfs.reiserfs -q" \
+      "vfat" "mkfs.vfat -F32" \
+      "xfs" "mkfs.xfs -f" 2>${ANSWER} || return 1
         
     case $(cat ${ANSWER}) in
         "$_FSSkip") FILESYSTEM="$_FSSkip"

lib/util-menu.sh

@@ -13,12 +13,12 @@
 main_menu() {
     declare -i loopmenu=1
     while ((loopmenu)); do
-        if [[ $HIGHLIGHT != 7 ]]; then
+        if [[ $HIGHLIGHT != 6 ]]; then
            HIGHLIGHT=$(( HIGHLIGHT + 1 ))
         fi
 
         DIALOG " $_MMTitle " --default-item ${HIGHLIGHT} \
-          --menu "\n$_MMBody\n " 0 0 7 \
+          --menu "\n$_MMBody\n " 0 0 6 \
           "1" "$_PrepMenuTitle|>" \
           "2" "$_InstBsMenuTitle|>" \
           "3" "$_ConfBseMenuTitle|>" \
@@ -57,7 +57,7 @@ prep_menu() {
     declare -i loopmenu=1
     while ((loopmenu)); do
         submenu 7
-        DIALOG " $_PrepMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_PrepMenuBody\n " 0 0 8 \
+        DIALOG " $_PrepMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_PrepMenuBody\n " 0 0 7 \
           "1" "$_VCKeymapTitle" \
           "2" "$_DevShowOpt" \
           "3" "$_PrepPartDisk" \
@@ -94,7 +94,7 @@ install_base_menu() {
     local PARENT="$FUNCNAME"
     declare -i loopmenu=1
     while ((loopmenu)); do
-        submenu 7
+        submenu 6
         DIALOG " $_InstBsMenuTitle " --default-item ${HIGHLIGHT_SUB} --menu "\n$_InstBseMenuBody\n " 0 0 6 \
           "1" "$_PrepMirror|>" \
           "2" "$_PrepPacKey" \