[arch-releng] [PATCH 1/8] [syslinux-iso] Update to latest pacman.conf in overlay tree
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- configs/syslinux-iso/overlay/etc/pacman.conf | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configs/syslinux-iso/overlay/etc/pacman.conf b/configs/syslinux-iso/overlay/etc/pacman.conf index de7e17d..911c23d 100644 --- a/configs/syslinux-iso/overlay/etc/pacman.conf +++ b/configs/syslinux-iso/overlay/etc/pacman.conf @@ -17,8 +17,9 @@ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl %u > %o +#XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled +Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = @@ -41,6 +42,7 @@ SyncFirst = pacman # - repositories listed first will take precedence when packages # have identical names, regardless of version number # - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture # # Repository entries are of the format: # [repo-name]
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 vmlinuz386@yahoo.com.ar --- 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
On Tue, 29 Jun 2010 03:03:48 -0300 Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar 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 vmlinuz386@yahoo.com.ar
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 Pozzivmlinuz386@yahoo.com.ar
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
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- configs/syslinux-iso/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile index 8a1c6ec..e719075 100644 --- a/configs/syslinux-iso/Makefile +++ b/configs/syslinux-iso/Makefile @@ -45,6 +45,7 @@ bootfiles: root-image cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/isolinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/isolinux/ cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/isolinux/ + cp $(WORKDIR)/root-image/usr/lib/syslinux/gpxelinux.0 $(WORKDIR)/iso/boot/isolinux/
# Rules for initcpio images
Fixes FS#18733 http://bugs.archlinux.org/task/18733
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- configs/syslinux-iso/download-repo.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configs/syslinux-iso/download-repo.sh b/configs/syslinux-iso/download-repo.sh index 800d49a..8655a8d 100755 --- a/configs/syslinux-iso/download-repo.sh +++ b/configs/syslinux-iso/download-repo.sh @@ -43,7 +43,7 @@ PKGS=$(/usr/bin/pacman -Sl $REPO | cut -d' ' -f1,2 | tr ' ' '/') if [ -n "$PKGS" ]; then baseurl="" cachedir="/var/cache/pacman/pkg" - for url in $(/usr/bin/pacman -Sp $PKGS | grep '://'); do + for url in $(/usr/bin/pacman -Sdp $PKGS | grep '://'); do baseurl="$(dirname "$url")" #save for later pkgname="$(basename "$url")" cachedpkg="$cachedir/$pkgname"
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- configs/syslinux-iso/overlay/etc/rc.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configs/syslinux-iso/overlay/etc/rc.conf b/configs/syslinux-iso/overlay/etc/rc.conf index 8b1c9bc..ff18456 100644 --- a/configs/syslinux-iso/overlay/etc/rc.conf +++ b/configs/syslinux-iso/overlay/etc/rc.conf @@ -13,7 +13,7 @@ HARDWARECLOCK="$(cmdline_param clock ${CLOCK_DEFAULT})" TIMEZONE="$(cmdline_param timezone ${TIMEZONE_DEFAULT})" KEYMAP="$(cmdline_param keymap ${KEYMAP_DEFAULT})" CONSOLEFONT="$(cmdline_param consolefont)" -CONSOLEMAP="$(cmdline_param consolefont)" +CONSOLEMAP="$(cmdline_param consolemap)" USECOLOR="yes"
MOD_AUTOLOAD="yes"
Copied from http://www.archlinux.org/iso/2010.05/README
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar --- 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 @@ Installation and Live-CDs ----------------------------
-All CDs and USB images are installation mediums and Live CDs -which can be used as maintenance and rescue systems. +All images give you a live console environment in which you can do +a manual or automatic installation and which can be used as maintenance and rescue systems.
-FTP-ISOs/Images: ----------------- -These are the preferred install mediums for Arch Linux. -You can always get up to date packages using these mediums. +All iso files can also be written to hard disks/usbkeys.
- archlinux-2009.02-ftp-i686.iso i686/32bit CD-ISO - archlinux-2009.02-ftp-i686.img i686/32bit USB-Image - archlinux-2009.02-ftp-x86_64.iso x86_64/64bit CD-ISO - archlinux-2009.02-ftp-x86_64.img x86_64/64bit USB-Image +Flavors: +-------- +Netinstall images are the preferred install media for Arch Linux. +You can always get up to date packages using these media. +Core images contain a snapshot of the core repository, which makes them ideal +for offline installations when no Internet access is available +to install the base system. (you can do a netinstall with these also)
-For those who have problems with GRUB not loading, we offer the following -ISOs with the isolinux bootloader: +Both come in i686, x86_64 or dual variant. The latter contains both and lets you choose +an architecture at boot.
- archlinux-2009.02-isolinux-ftp-i686.iso i686/32bit CD-ISO - archlinux-2009.02-isolinux-ftp-x86_64.iso x86_64/64bit CD-ISO - -Core-ISOs/Images: ------------------ -These are for offline installations when no Internet access is available -to install the base system. - - archlinux-2009.02-core-i686.iso i686/32bit CD-ISO - archlinux-2009.02-core-i686.img i686/32bit USB-Image - archlinux-2009.02-core-x86_64.iso x86_64/64bit CD-ISO - archlinux-2009.02-core-x86_64.img x86_64/64bit USB-Image - -How to use these installation images: +How to obtain and use these installation images: ------------------------------------- -Please ensure the sha1sum for your downloaded file matches the checksum -in the the SHA1SUMS file in this directory. +Torrents are preferred (they are webseed enabled), but you can also just get the images +from an Arch mirror.
-See section in the "Arch Linux Install Guide": +The Official Arch Linux Install Guide gives you more info: http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide -For the USB-Images see: - http://wiki.archlinux.org/index.php/Install_from_USB_stick + +More info / getting in touch: +---------------------------- +http://bugs.archlinux.org/ +http://mailman.archlinux.org/mailman/listinfo/arch-releng
Happy installing! Happy ARCHing! - Arch Linux Release Engineering team -
On Tue, 29 Jun 2010 03:03:52 -0300 Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar wrote:
Copied from http://www.archlinux.org/iso/2010.05/README
Signed-off-by: Gerardo Exequiel Pozzi vmlinuz386@yahoo.com.ar
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 vmlinuz386@yahoo.com.ar --- TODO | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/TODO b/TODO index 6848fb0..5636478 100644 --- a/TODO +++ b/TODO @@ -1,17 +1,3 @@ -* Fix xfce and default config directories. - -* Add lots and lots of help to the grub menus... also add the - graphics to all submenus - -* possible auto-detection of installed systems via nifty grub tricks? +* Add lots and lots of help to the syslinux menu
* Switch to squashfs-lzma - -* Add 'needsupdate' function to check if a squashfs image in the - iso dir is up to date, if so, skip it; else rebuild it. No more - need for the -f flag - -* Remove the need for the -f flag overall. We should be able to do - all this intelligently - -* Make the bootloader flag work with usb images too
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 vmlinuz386@yahoo.com.ar --- 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
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 Pozzivmlinuz386@yahoo.com.ar
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.
participants (3)
-
Dieter Plaetinck
-
Gerardo Exequiel Pozzi
-
Thomas Bächler