Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-04-25 13:53:57 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-04-25 13:53:57 -0300
commit42604e2fba0250efebca0376318e34f283f03b19 (patch)
treebe91f3d56463ee3f9e223521a3eed58a7bb3ae2f
parentf86839392de3a8c72918871185235b5cb75bcd18 (diff)
[archiso2dual] Use one isomounts file for both architectures
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-rw-r--r--archiso2dual/Makefile3
-rwxr-xr-xarchiso2dual/archiso2dual16
-rw-r--r--archiso2dual/isolinux.cfg4
-rw-r--r--archiso2dual/isomounts (renamed from archiso2dual/isomounts.x86_64)5
-rw-r--r--archiso2dual/isomounts.i6865
5 files changed, 13 insertions, 20 deletions
diff --git a/archiso2dual/Makefile b/archiso2dual/Makefile
index 95a9ef7..6d37c71 100644
--- a/archiso2dual/Makefile
+++ b/archiso2dual/Makefile
@@ -3,8 +3,7 @@ all:
install: all
install -D -m 755 archiso2dual $(DESTDIR)/usr/sbin/archiso2dual
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 $(DESTDIR)/usr/share/archiso2dual/isomounts
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 5b7163c..0cc58af 100755
--- a/archiso2dual/archiso2dual
+++ b/archiso2dual/archiso2dual
@@ -62,8 +62,7 @@ isolinuxcfg_copy() {
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} $work_dir/iso/
}
squashfs_copy() {
@@ -193,7 +192,7 @@ show_help()
echo " -o <output.iso> Path to dual target iso image"
echo
echo " general options:"
- echo " -M <isomounts> Path to isomounts files [basename]
+ echo " -M <isomounts> Path to isomounts file
(default to '${isomounts_file}'"
echo " -S <isolinux> Path to isolinux.cfg file
(default to '${isolinuxcfg_file}'"
@@ -224,7 +223,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}"
+ echo " isomounts file: ${isomounts_file}"
echo " isolinux.cfg file: ${isolinuxcfg_file}"
echo " removefiles.lst file: ${removefiles_file}"
echo " working directory: ${work_dir}"
@@ -277,13 +276,8 @@ sanity_check() {
_error="1"
fi
- if [ ! -f "${isomounts_file}.i686" ]; then
- echo "*ERROR*: ${isomounts_file}.i686 does not exist, , specify one with -M option"
- _error="1"
- fi
-
- if [ ! -f "${isomounts_file}.x86_64" ]; then
- echo "*ERROR*: ${isomounts_file}.x86_64 does not exist, , specify one with -M option"
+ if [ ! -f "${isomounts_file}" ]; then
+ echo "*ERROR*: ${isomounts_file} does not exist, , specify one with -M option"
_error="1"
fi
diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg
index 32a779d..1174d74 100644
--- a/archiso2dual/isolinux.cfg
+++ b/archiso2dual/isolinux.cfg
@@ -38,7 +38,7 @@ perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux (i686)
KERNEL /boot/i686/vmlinuz26
-APPEND initrd=/boot/i686/archiso.img archisolabel=XXX isomounts=isomounts.i686 tmpfs_size=75% locale=en_US.UTF-8
+APPEND initrd=/boot/i686/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8
IPAPPEND 0
LABEL arch64
@@ -48,7 +48,7 @@ perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux (x86_64)
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
+APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8
IPAPPEND 0
LABEL normal
diff --git a/archiso2dual/isomounts.x86_64 b/archiso2dual/isomounts
index b0fb31f..b171af8 100644
--- a/archiso2dual/isomounts.x86_64
+++ b/archiso2dual/isomounts
@@ -1,5 +1,10 @@
+i686/overlay.sqfs i686 / squashfs
x86_64/overlay.sqfs x86_64 / squashfs
+i686/core-pkgs.sqfs i686 /src/core/pkg squashfs
x86_64/core-pkgs.sqfs x86_64 /src/core/pkg squashfs
+any/usrshare.sqfs i686 / squashfs
any/usrshare.sqfs x86_64 / squashfs
+i686/libmodules.sqfs i686 / squashfs
x86_64/libmodules.sqfs x86_64 / squashfs
+i686/root-image.sqfs i686 / squashfs
x86_64/root-image.sqfs x86_64 / squashfs
diff --git a/archiso2dual/isomounts.i686 b/archiso2dual/isomounts.i686
deleted file mode 100644
index a53384c..0000000
--- a/archiso2dual/isomounts.i686
+++ /dev/null
@@ -1,5 +0,0 @@
-i686/overlay.sqfs i686 / squashfs
-i686/core-pkgs.sqfs i686 /src/core/pkg squashfs
-any/usrshare.sqfs i686 / squashfs
-i686/libmodules.sqfs i686 / squashfs
-i686/root-image.sqfs i686 / squashfs