[arch-releng] [PATCH 1/8] [syslinux-iso] Update to latest pacman.conf in overlay tree
Signed-off-by: Gerardo Exequiel Pozzi
First install {base} group, then install rest of packages listed
at in packages file.
In this way, ensure a fully base system installed first,
avoinding errors from install scriptlets of rest of packages.
(currently there is no issue with packages listed on packages files,
but if some add more packages to customize the iso will see errors)
Signed-off-by: Gerardo Exequiel Pozzi
On Tue, 29 Jun 2010 03:03:48 -0300
Gerardo Exequiel Pozzi
First install {base} group, then install rest of packages listed at in packages file. In this way, ensure a fully base system installed first, avoinding errors from install scriptlets of rest of packages.
(currently there is no issue with packages listed on packages files, but if some add more packages to customize the iso will see errors)
Signed-off-by: Gerardo Exequiel Pozzi
--- configs/syslinux-iso/Makefile | 1 + configs/syslinux-iso/packages.i686 | 1 - configs/syslinux-iso/packages.x86_64 | 1 - 3 files changed, 1 insertions(+), 2 deletions(-) diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index 9144130..8a1c6ec 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -30,6 +30,7 @@ base-fs: root-image bootfiles initcpio overlay iso-mounts # Rules for make the root-image for base filesystem. root-image: $(WORKDIR)/root-image/.arch-chroot $(WORKDIR)/root-image/.arch-chroot: + mkarchiso -p base create $(WORKDIR) mkarchiso -p $(PACKAGES) create $(WORKDIR)
# Rule for make /boot diff --git a/configs/syslinux-iso/packages.i686 b/configs/syslinux-iso/packages.i686 index 68b3c1b..dbeff71 100644 --- a/configs/syslinux-iso/packages.i686 +++ b/configs/syslinux-iso/packages.i686 @@ -2,7 +2,6 @@ aif aufs2 aufs2-util b43-fwcutter -base crda ddrescue dialog diff --git a/configs/syslinux-iso/packages.x86_64 b/configs/syslinux-iso/packages.x86_64 index 68b3c1b..dbeff71 100644 --- a/configs/syslinux-iso/packages.x86_64 +++ b/configs/syslinux-iso/packages.x86_64 @@ -2,7 +2,6 @@ aif aufs2 aufs2-util b43-fwcutter -base crda ddrescue dialog
wouldn't it be better to just put base at the beginning of the package file? same result, smaller change, less hardcoding. Dieter
Am 29.06.2010 13:10, schrieb Dieter Plaetinck:
wouldn't it be better to just put base at the beginning of the package file? same result, smaller change, less hardcoding.
That won't change anything at all.
On 06/29/2010 03:03 AM, Gerardo Exequiel Pozzi wrote:
First install {base} group, then install rest of packages listed at in packages file. In this way, ensure a fully base system installed first, avoinding errors from install scriptlets of rest of packages.
(currently there is no issue with packages listed on packages files, but if some add more packages to customize the iso will see errors)
Signed-off-by: Gerardo Exequiel Pozzi
--- configs/syslinux-iso/Makefile | 1 + configs/syslinux-iso/packages.i686 | 1 - configs/syslinux-iso/packages.x86_64 | 1 - 3 files changed, 1 insertions(+), 2 deletions(-) diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index 9144130..8a1c6ec 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -30,6 +30,7 @@ base-fs: root-image bootfiles initcpio overlay iso-mounts # Rules for make the root-image for base filesystem. root-image: $(WORKDIR)/root-image/.arch-chroot $(WORKDIR)/root-image/.arch-chroot: + mkarchiso -p base create $(WORKDIR) mkarchiso -p $(PACKAGES) create $(WORKDIR)
# Rule for make /boot
Another patch sent [#1] to make this work with pacman 3.4 and fix cleanup step. Otherwise second step fails. This is because in "create" function from mkarchiso at cleanup step, will only delete sync database files from pacman, but does not delete *.tar.gz (newer on 3.4), then sync files are not regenerated on pacman -Sy if .*tar.gz exists => packages not found. [#1] http://mailman.archlinux.org/pipermail/arch-releng/2010-June/001116.html -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
Signed-off-by: Gerardo Exequiel Pozzi
Fixes FS#18733 http://bugs.archlinux.org/task/18733
Signed-off-by: Gerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi
Copied from http://www.archlinux.org/iso/2010.05/README
Signed-off-by: Gerardo Exequiel Pozzi
On Tue, 29 Jun 2010 03:03:52 -0300
Gerardo Exequiel Pozzi
Copied from http://www.archlinux.org/iso/2010.05/README
Signed-off-by: Gerardo Exequiel Pozzi
--- configs/syslinux-iso/instructions | 53 ++++++++++++++---------------------- 1 files changed, 21 insertions(+), 32 deletions(-) diff --git a/configs/syslinux-iso/instructions b/configs/syslinux-iso/instructions index 2ae7e9c..5998788 100644 --- a/configs/syslinux-iso/instructions +++ b/configs/syslinux-iso/instructions @@ -2,46 +2,35 @@ (..)
Lol. I didn't know this was maintained in archiso git. I guess from now on I'll push my changes into my archiso fork so they can be pulled from there. Dieter
Signed-off-by: Gerardo Exequiel Pozzi
A quick & dirty changes to test iso withs differents combinations of
I={virtio,scsi,ide} x M={disk,cdrom}
Signed-off-by: Gerardo Exequiel Pozzi
On 06/29/2010 03:03 AM, Gerardo Exequiel Pozzi wrote:
A quick& dirty changes to test iso withs differents combinations of I={virtio,scsi,ide} x M={disk,cdrom}
Signed-off-by: Gerardo Exequiel Pozzi
--- archiso/testiso | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/archiso/testiso b/archiso/testiso index 9de347a..75bedc9 100755 --- a/archiso/testiso +++ b/archiso/testiso @@ -1,7 +1,26 @@ -#!/bin/sh +#!/bin/bash
-if [ $# -ne 1 ]; then - echo "usage: testiso<iso name>" +if [ $# -eq 0 ]; then + echo "usage: testiso<isofile> [id|ic|sd|sc|vd|vc]" + echo + echo "id boot .iso as IDE disk" + echo "ic boot .iso as IDE cd-rom" + echo "sd boot .iso as SCSI disk" + echo "sc boot .iso as SCSI cd-rom" + echo "vd boot .iso as virtio disk" + echo "vc boot .iso as virtio cd-rom" exit 1 fi -qemu -boot d -kernel-kqemu -m 256 -cdrom "${1}" + +case "${2}" in + id) IF="ide"; MEDIA="disk";; + ic) IF="ide"; MEDIA="cdrom";; + sd) IF="scsi"; MEDIA="disk";; + sc) IF="scsi"; MEDIA="cdrom";; + vd) IF="virtio"; MEDIA="disk";; + vc) IF="virtio"; MEDIA="cdrom";; + *) IF="scsi"; MEDIA="cdrom";; +esac + +echo qemu -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on +qemu -m 256 -drive file=${1},if=${IF},media=${MEDIA},boot=on Small note here: virtio cd-rom is not implemented at this moment in qemu-kvm, booting with this option is like booting with virtio disk.
-- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (3)
-
Dieter Plaetinck
-
Gerardo Exequiel Pozzi
-
Thomas Bächler