[arch-releng] [PATCH 5/6] [archiso2dual] Remove support for booting 64 bit kernel with 32 userspace

[Gerardo Exequiel Pozzi]

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 archiso2dual/Makefile              |    1 -
 archiso2dual/archiso2dual          |    8 +-------
 archiso2dual/isolinux.cfg          |   12 +-----------
 archiso2dual/isomounts.x86_64-i686 |    5 -----
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 archiso2dual/isomounts.x86_64-i686

diff --git a/archiso2dual/Makefile b/archiso2dual/Makefile
index eaa031d..95a9ef7 100644
--- a/archiso2dual/Makefile
+++ b/archiso2dual/Makefile
@@ -5,7 +5,6 @@ install: all
 	install -d -m 755 $(DESTDIR)/usr/share/archiso2dual/
 	install -D -m 644 isomounts.i686 $(DESTDIR)/usr/share/archiso2dual/isomounts.i686
 	install -D -m 644 isomounts.x86_64 $(DESTDIR)/usr/share/archiso2dual/isomounts.x86_64
-	install -D -m 644 isomounts.x86_64-i686 $(DESTDIR)/usr/share/archiso2dual/isomounts.x86_64-i686
 	install -D -m 644 isolinux.cfg $(DESTDIR)/usr/share/archiso2dual/isolinux.cfg
 	install -D -m 644 removefiles.lst $(DESTDIR)/usr/share/archiso2dual/removefiles.lst
 
diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual
index 376761f..5b7163c 100755
--- a/archiso2dual/archiso2dual
+++ b/archiso2dual/archiso2dual
@@ -64,7 +64,6 @@ isomounts_copy() {
     echo "Executing: ${FUNCNAME}"
     cp ${_v} ${isomounts_file}.i686 $work_dir/iso/
     cp ${_v} ${isomounts_file}.x86_64 $work_dir/iso/
-    cp ${_v} ${isomounts_file}.x86_64-i686 $work_dir/iso/
 }
 
 squashfs_copy() {
@@ -225,7 +224,7 @@ show_config() {
     echo "    source iso i686 image:   ${isofile_i686}"
     echo "  source iso x86_64 image:   ${isofile_x86_64}"
     echo "         target iso image:   ${imgname}"
-    echo "           isomounts file:   ${isomounts_file}.{i686,x86_64,x86_64-i686}"
+    echo "           isomounts file:   ${isomounts_file}.{i686,x86_64}"
     echo "        isolinux.cfg file:   ${isolinuxcfg_file}"
     echo "     removefiles.lst file:   ${removefiles_file}"
     echo "        working directory:   ${work_dir}"
@@ -288,11 +287,6 @@ sanity_check() {
         _error="1"
     fi
 
-    if [ ! -f "${isomounts_file}.x86_64-i686" ]; then
-      echo "*ERROR*: ${isomounts_file}.x86_64-i686 does not exist, , specify one with -M option"
-        _error="1"
-    fi
-
     if [ ! -f "${isolinuxcfg_file}" ]; then
       echo "*ERROR*: ${isolinuxcfg_file} does not exist, specify one with -S option"
         _error="1"
diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg
index 772a5e1..32a779d 100644
--- a/archiso2dual/isolinux.cfg
+++ b/archiso2dual/isolinux.cfg
@@ -11,7 +11,7 @@ F3 help.txt
 
 MENU WIDTH 78
 MENU MARGIN 4
-MENU ROWS 8
+MENU ROWS 7
 MENU VSHIFT 10
 MENU TIMEOUTROW 13
 MENU TABMSGROW 11
@@ -51,16 +51,6 @@ KERNEL /boot/x86_64/vmlinuz26
 APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX isomounts=isomounts.x86_64 tmpfs_size=75% locale=en_US.UTF-8
 IPAPPEND 0
 
-LABEL arch64-32
-TEXT HELP
-Boot the Arch Linux (x86_64 kernel / i686 userspace ) live medium. It allows you to install Arch Linux or
-perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Arch Linux (x86_64/i686)
-KERNEL /boot/x86_64/vmlinuz26
-APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX isomounts=isomounts.x86_64-i686 tmpfs_size=75% locale=en_US.UTF-8
-IPAPPEND 0
-
 LABEL normal
 TEXT HELP
 Continue normal booting procedure.
diff --git a/archiso2dual/isomounts.x86_64-i686 b/archiso2dual/isomounts.x86_64-i686
deleted file mode 100644
index 54e0698..0000000
--- a/archiso2dual/isomounts.x86_64-i686
+++ /dev/null
@@ -1,5 +0,0 @@
-x86_64/overlay.sqfs x86_64 / squashfs
-x86_64/core-pkgs.sqfs x86_64 /src/core/pkg squashfs
-any/usrshare.sqfs x86_64 / squashfs
-x86_64/libmodules.sqfs x86_64 / squashfs
-i686/root-image.sqfs x86_64 / squashfs
-- 
1.7.0.6