tools/archiso
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[archiso2dual] Remove support for booting 64 bit kernel with 32 userspace

Browse source 
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2010-04-25 13:49:00 -03:00
parent 965e98b556
commit f86839392d
4 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
archiso2dual/Makefile
View file

@ -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

8
archiso2dual/archiso2dual
View file

@ -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"

12
archiso2dual/isolinux.cfg
View file

@ -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.

5
archiso2dual/isomounts.x86_64-i686
View file

@ -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