- Arch-releng - lists.archlinux.org

[arch-releng] [PATCH 5/6] Fix doc path in motd
by Gerardo Exequiel Pozzi 05 Mar '10

05 Mar '10

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/syslinux-iso/overlay/etc/motd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configs/syslinux-iso/overlay/etc/motd b/configs/syslinux-iso/overlay/etc/motd index bbe312f..00e4775 100644 --- a/configs/syslinux-iso/overlay/etc/motd +++ b/configs/syslinux-iso/overlay/etc/motd @@ -1,7 +1,7 @@ ************************************************************** * To begin installation, run /arch/setup * * You can find documentation at * -* /arch/docs/official_installation_guide_en * +* /usr/share/aif/docs/official_installation_guide_en * * * * i18n: Use the 'km' utility to change your keyboard layout * * and console font. * -- 1.7.0.1

1 1

[arch-releng] [PATCH 3/4] Welcome back copytoram= option
by Gerardo Exequiel Pozzi 01 Mar '10

01 Mar '10

Fixes FS#17182: copytoram=y does not work with aufs The solution is simple, just use a directory outside aufs tree. * If copytoram=y, then another tmpfs is mounted but on /tmpfs.sqfs * Add a new option: tmpfs_sqfs_size= (default to 75%) * Lock cdrom drive is not locked if copytoram=y Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 27 ++++++++++++++++++++++----- archiso/install/archiso | 1 + 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 9997b38..1ac4d86 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -15,6 +15,12 @@ _mnt_squashfs() { img_name="${img_fullname%.*}" tmp_mnt="/tmpfs/mnt/${img_name}" + if [ "${copytoram}" = "y" ]; then + msg ":: Copying squashfs image to RAM" + /bin/cp "${img}" "/tmpfs.sqfs/${img_fullname}" + img="/tmpfs.sqfs/${img_fullname}" + fi + msg "::: Adding new aufs branch: ${img_name}" mkdir -p "${tmp_mnt}" /bin/mount -r -t squashfs "${img}" "${tmp_mnt}" @@ -34,6 +40,10 @@ run_hook () { tmpfs_size="75%" fi + if [ "x${tmpfs_sqfs_size}" = "x" ]; then + tmpfs_sqfs_size="75%" + fi + if [ "x${isomounts}" != "x" ]; then isomounts="/bootmnt/${isomounts}" else @@ -55,6 +65,12 @@ archiso_mount_handler() { mount -t tmpfs -o "size=${tmpfs_size}" tmpfs /tmpfs msg "done." + if [ "${copytoram}" = "y" ]; then + msg -n ":: Mounting tmpfs (for squashfs), size=${tmpfs_sqfs_size}..." + mount -t tmpfs -o "size=${tmpfs_sqfs_size}" tmpfs /tmpfs.sqfs + msg "done." + fi + msg ":: Waiting for boot device..." while ! poll_device ${archisodevice} 30; do echo "ERROR: boot device didn't show up after 30 seconds..." @@ -114,13 +130,14 @@ archiso_mount_handler() { # Bind our bootmnt dir into the live system _mnt_bind /bootmnt "${newroot}/bootmnt" - if [ "${FSTYPE}" = "iso9660" -o "${FSTYPE}" = "udf" ]; then - if [ -d /proc/sys/dev/cdrom ]; then - echo 0 > /proc/sys/dev/cdrom/lock - echo 0 > /proc/sys/dev/cdrom/autoeject + if [ "${copytoram}" != "y" ]; then + if [ "${FSTYPE}" = "iso9660" ] || [ "${FSTYPE}" = "udf" ]; then + if [ -d /proc/sys/dev/cdrom ]; then + echo 0 > /proc/sys/dev/cdrom/lock + echo 0 > /proc/sys/dev/cdrom/autoeject + fi fi fi - } # vim:ft=sh:ts=4:sw=4:et: diff --git a/archiso/install/archiso b/archiso/install/archiso index 4d36412..d01ab25 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -10,6 +10,7 @@ install () BINARIES="" FILES="" add_dir /tmpfs + add_dir /tmpfs.sqfs add_dir /bootmnt add_device /dev/loop0 b 7 0 SCRIPT="archiso" -- 1.7.0

1 1

[arch-releng] archiso2dual.sh: join both i686 and x86_64 iso in one
by Gerardo Exequiel Pozzi 23 Feb '10

23 Feb '10

This is only just for "start point" and is a DRAFT that works (just setup correct directories and images names). Nothing is stripped, I working on it. Size of iso generated is 782237696 bytes (746MB) http://github.com/djgera/archiso2dual -- Gerardo Exequiel Pozzi ( djgera ) http://www.djgera.com.ar KeyID: 0x1B8C330D Key fingerprint = 0CAA D5D4 CD85 4434 A219 76ED 39AB 221B 1B8C 330D

3 7

[arch-releng] dual arch CDs [was: A TODO draft for next installation media]
by Aaron Griffin 23 Feb '10

23 Feb '10

On Thu, Feb 11, 2010 at 1:29 PM, Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> wrote: >> Is there an existing bug report on the dual architecture stuff? > > I think that dual, will be for next release, there is nothing finished for > that. There is a report on it, but I don't know it offhand. The current idea I had was that we simply do all the massaging in the archiso hooks. That is, we create one CD with two different base images and two kernels. The menu items would indicate i686 or x86_64 kernels, and would choose the right aufs image for that architecture. Yes, this effectively doubles the size of these CDs, but I'm not too sure I want to ship the dual arch CDs regularly. What do you guys think?

8 29

Re: [arch-releng] [arch-general] [patch] AIF, discover repos on iso.
by Aaron Griffin 19 Feb '10

19 Feb '10

On Fri, Feb 19, 2010 at 3:26 PM, Mark Pustjens <pustjens(a)dds.nl> wrote: > Hi List, > > The attached patch fixes a TODO in lib-pacman of aif. > Instead of hardcoding that `core' is always available locally and falling > back to net for others, it now checks /src/ for repos. > > It assumes repos are stored at /src/$repo/pkg/. All these repos are added as > cache dirs. > > While preparing pacman, a number of repo names are provided to be prepared. > > All those repos which were requested are added as actual repo. If this repo > is available locally, the url points to disk. Otherwise it falls back to the > mirrorlist. CCing to the arch-releng list

1 0

[arch-releng] [PATCH 5/6] Implement mount hook function in archiso hook.
by Gerardo Exequiel Pozzi 18 Feb '10

18 Feb '10

Next version of mkinitcpio > 0.6.2 implements mount hook functionality. So can avoid skipping normal flow of main init script, and removing common end code with it. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 34 +++++++++++++--------------------- archiso/install/archiso | 1 - 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 434fd39..7b4d756 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -2,15 +2,15 @@ _mnt_bind() { msg "::: Binding ${1} to ${2}" - mkdir -p /real_root${2} - /bin/mount -o bind ${1} /real_root${2} + mkdir -p $newroot${2} + /bin/mount -o bind ${1} $newroot${2} } # args: /path/to/image_file _mnt_squashfs() { /sbin/modprobe -q loop > /dev/null 2>&1 - + img="${1}" base_img="${img##*/}"; mnt="${2}" @@ -34,7 +34,7 @@ _mnt_squashfs() fi /bin/mount -r -t squashfs "/dev/loop${LOOP_NUM}" "/tmpfs/mnt/loop${LOOP_NUM}" if [ "${mnt}" = "/" ]; then - /bin/mount -t aufs -o remount,append:/tmpfs/mnt/loop${LOOP_NUM}=ro none "/real_root" + /bin/mount -t aufs -o remount,append:/tmpfs/mnt/loop${LOOP_NUM}=ro none "$newroot" else _mnt_bind "/tmpfs/mnt/loop${LOOP_NUM}" "${mnt}" fi @@ -61,6 +61,13 @@ run_hook () archisodevice="/dev/archiso" fi + # set mount handler for archiso + mount_handler="archiso_mount_handler" +} + +archiso_mount_handler() { + newroot="$1" + msg -n ":: Mounting tmpfs, size=${tmpfs_size}..." mount -t tmpfs -o "size=${tmpfs_size}" tmpfs /tmpfs msg "done." @@ -70,7 +77,7 @@ run_hook () echo "ERROR: boot device didn't show up after 30 seconds..." echo " Falling back to interactive prompt" echo " You can try to fix the problem manually, log out when you are finished" - PS1="ramfs$ " /bin/sh -i + launch_interactive_shell done FSTYPE=$(blkid -o value -s TYPE ${archisodevice} 2> /dev/null) @@ -91,7 +98,7 @@ run_hook () fi msg ":: Mounting root (aufs) filesystem" - /bin/mount -t aufs -o dirs=/tmpfs=rw none /real_root + /bin/mount -t aufs -o dirs=/tmpfs=rw none $newroot if [ $? -ne 0 ]; then echo "ERROR: while mounting root (aufs) filesystem." exit 1 @@ -124,21 +131,6 @@ run_hook () fi fi - if [ "${break}" = "y" ]; then - echo ":: Break requested, type 'exit' to resume operation" - PS1="ramfs$ " /bin/sh -i - fi - - #Special handling if udev is running - udevpid=$(/bin/pidof udevd) - if [ -n "${udevpid}" ]; then - /bin/kill -9 ${udevpid} > /dev/null 2>&1 - /bin/sleep 0.01 - fi - msg ":: Passing control to Arch Linux Initscripts...Please Wait" - /bin/umount /sys - /bin/umount /proc - exec /sbin/switch_root -c /dev/console /real_root /sbin/init ${CMDLINE} } # vim:ft=sh:ts=4:sw=4:et: diff --git a/archiso/install/archiso b/archiso/install/archiso index 77fddc3..5978f33 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -9,7 +9,6 @@ install () BINARIES="" FILES="" - add_dir /real_root add_dir /tmpfs add_dir /bootmnt SCRIPT="archiso" -- 1.6.6.1

4 12

[arch-releng] [PATCH 11/11] Rename archiso-early hook to archiso_early
by Gerardo Exequiel Pozzi 18 Feb '10

18 Feb '10

To make compatible with disablehooks= param. Since "hook_archiso-early" is not a valid variable name. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/Makefile | 4 ++-- archiso/hooks/archiso-early | 8 -------- archiso/hooks/archiso_early | 8 ++++++++ archiso/install/archiso-early | 9 --------- archiso/install/archiso_early | 9 +++++++++ configs/syslinux-iso/mkinitcpio.conf | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 archiso/hooks/archiso-early create mode 100644 archiso/hooks/archiso_early delete mode 100644 archiso/install/archiso-early create mode 100644 archiso/install/archiso_early diff --git a/archiso/Makefile b/archiso/Makefile index 3fd7ae3..2f30175 100644 --- a/archiso/Makefile +++ b/archiso/Makefile @@ -7,9 +7,9 @@ install: all install -D -m 755 testiso $(DESTDIR)/usr/bin/testiso # hooks/install are needed by mkinitcpio install -D -m 644 hooks/archiso $(DESTDIR)/lib/initcpio/hooks/archiso - install -D -m 644 hooks/archiso-early $(DESTDIR)/lib/initcpio/hooks/archiso-early + install -D -m 644 hooks/archiso_early $(DESTDIR)/lib/initcpio/hooks/archiso_early install -D -m 644 install/archiso $(DESTDIR)/lib/initcpio/install/archiso - install -D -m 644 install/archiso-early $(DESTDIR)/lib/initcpio/install/archiso-early + install -D -m 644 install/archiso_early $(DESTDIR)/lib/initcpio/install/archiso_early # install docs and examples install -d -m 644 $(DESTDIR)/usr/share/archiso/ cp -r ../configs $(DESTDIR)/usr/share/archiso/configs diff --git a/archiso/hooks/archiso-early b/archiso/hooks/archiso-early deleted file mode 100644 index edd554b..0000000 --- a/archiso/hooks/archiso-early +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - if [ -n "${archisolabel}" ]; then - echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules - echo "ENV{ID_FS_LABEL_ENC}==\"${archisolabel}\", SYMLINK+=\"archiso\"" >> /lib/udev/rules.d/00-archiso-device.rules - fi -} diff --git a/archiso/hooks/archiso_early b/archiso/hooks/archiso_early new file mode 100644 index 0000000..edd554b --- /dev/null +++ b/archiso/hooks/archiso_early @@ -0,0 +1,8 @@ +# vim: set ft=sh: +run_hook () +{ + if [ -n "${archisolabel}" ]; then + echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules + echo "ENV{ID_FS_LABEL_ENC}==\"${archisolabel}\", SYMLINK+=\"archiso\"" >> /lib/udev/rules.d/00-archiso-device.rules + fi +} diff --git a/archiso/install/archiso-early b/archiso/install/archiso-early deleted file mode 100644 index 66b8579..0000000 --- a/archiso/install/archiso-early +++ /dev/null @@ -1,9 +0,0 @@ -install () -{ - MODULES="" - BINARIES="" - FILES="" - SCRIPT="archiso-early" -} - -# vim:ft=sh:ts=4:sw=4:et: diff --git a/archiso/install/archiso_early b/archiso/install/archiso_early new file mode 100644 index 0000000..818fc7b --- /dev/null +++ b/archiso/install/archiso_early @@ -0,0 +1,9 @@ +install () +{ + MODULES="" + BINARIES="" + FILES="" + SCRIPT="archiso_early" +} + +# vim:ft=sh:ts=4:sw=4:et: diff --git a/configs/syslinux-iso/mkinitcpio.conf b/configs/syslinux-iso/mkinitcpio.conf index fbd72ed..6445456 100644 --- a/configs/syslinux-iso/mkinitcpio.conf +++ b/configs/syslinux-iso/mkinitcpio.conf @@ -2,5 +2,5 @@ MODULES="" BINARIES="" FILES="" -HOOKS="base archiso-early udev archiso pata scsi sata usb fw pcmcia filesystems usbinput" +HOOKS="base archiso_early udev archiso pata scsi sata usb fw pcmcia filesystems usbinput" COMPRESSION="lzma" -- 1.7.0

1 0

[arch-releng] [PATCH 10/10] Removed a non-working option: copytoram
by Gerardo Exequiel Pozzi 17 Feb '10

17 Feb '10

Keep the code clean. For more reference see FS#17182 to view what is the issue Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index ad86764..9997b38 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -15,13 +15,6 @@ _mnt_squashfs() { img_name="${img_fullname%.*}" tmp_mnt="/tmpfs/mnt/${img_name}" - # FIX: This options does not work (see FS#17182) - if [ "${copytoram}" = "y" ]; then - msg ":: Copying squashfs image to RAM" - /bin/cat ${img} > "/tmpfs/${base_img}" - img="/tmpfs/${base_img}" - fi - msg "::: Adding new aufs branch: ${img_name}" mkdir -p "${tmp_mnt}" /bin/mount -r -t squashfs "${img}" "${tmp_mnt}" -- 1.6.6.1

1 0

[arch-releng] [PATCH 06/10] Drop to recovery shell when mounting main media filesystem fails.
by Gerardo Exequiel Pozzi 17 Feb '10

17 Feb '10

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 7b4d756..aac2d21 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -85,16 +85,24 @@ archiso_mount_handler() { if mount -r -t "${FSTYPE}" ${archisodevice} /bootmnt > /dev/null 2>&1; then if [ -e "${isomounts}" ]; then echo "SUCCESS: Mounted archiso volume successfully." + fserror="0" else echo "ERROR: Mounting was successful, but the ${isomounts} file does not exist." - exit 1 + fserror="1" fi else echo "ERROR; Failed to mount ${archisodevice} (FS is ${FSTYPE})" - exit 1 + fserror="1" fi else echo "ERROR: ${archisodevice} found, but the filesystem type is unknown." + fserror="1" + fi + + if [ "${fserror}" = "1" ]; then + echo " Falling back to interactive prompt" + echo " You can try to fix the problem manually, log out when you are finished" + launch_interactive_shell fi msg ":: Mounting root (aufs) filesystem" -- 1.6.6.1

1 3

[arch-releng] [PATCH] Update archiso hooks to work with next mkinitcpio 0.6
by Gerardo Exequiel Pozzi 12 Feb '10

12 Feb '10

Some basic changes to make archiso hooks work with the next mkinitcpio 0.6 Tested under KVM, a ""2010.02"" and works fine with it. NOTE: current mkinitcpio-0.5.99.2-2 does not include "losetup", maybe will be included in next version, see #[1]. For now must be added manually. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 22 ++++++++++++---------- archiso/hooks/archiso-early | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index bed8f7a..5b102d7 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -9,7 +9,7 @@ _mnt_bind() # args: /path/to/image_file _mnt_squashfs() { - /bin/modprobe -q loop >/dev/null 2>&1 + /sbin/modprobe -q loop >/dev/null 2>&1 img="${1}" base_img="${img##*/}"; @@ -27,7 +27,7 @@ _mnt_squashfs() while [ ! -e "/dev/loop${LOOP_NUM}" ]; do sleep 1 done - if ! /bin/losetup "/dev/loop${LOOP_NUM}" ${img}; then + if ! /sbin/losetup "/dev/loop${LOOP_NUM}" ${img}; then echo "ERROR: Cannot mount loop device /dev/loop${LOOP_NUM}" break fi @@ -70,7 +70,7 @@ run_hook () PS1="ramfs$ " /bin/sh -i done - eval $(fstype < /dev/archiso 2>/dev/null) + FSTYPE=$(blkid -o value -s TYPE /dev/archiso 2>/dev/null) if [ -n "${FSTYPE}" ]; then if [ "${FSTYPE}" = "unknown" ]; then # First try mounting then with vfat, maybe someone put the image on @@ -98,8 +98,8 @@ run_hook () echo "ERROR: /dev/archiso found, but the filesystem type is unknown." fi - /bin/modprobe -q squashfs >/dev/null 2>&1 - /bin/modprobe -q aufs >/dev/null 2>&1 + /sbin/modprobe -q squashfs >/dev/null 2>&1 + /sbin/modprobe -q aufs >/dev/null 2>&1 msg ":: Mounting root (aufs) filesystem" /bin/mount -t aufs -o dirs=/tmpfs=rw none /real_root @@ -137,17 +137,19 @@ run_hook () if [ "${break}" = "y" ]; then echo ":: Break requested, type 'exit' to resume operation" - echo " NOTE: klibc contains no 'ls' binary, use 'echo *' instead" PS1="ramfs$ " /bin/sh -i fi - udevpid=$(/bin/minips -C udevd -o pid=) - [ "x${udevpid}" != "x" ] && /bin/kill -9 $udevpid 2>&1 >/dev/null - #Yep, we're bailing out here. We don't need kinit. + #Special handling if udev is running + udevpid=$(/bin/pidof udevd) + if [ -n "${udevpid}" ]; then + /bin/kill -9 ${udevpid} > /dev/null 2>&1 + /bin/sleep 0.01 + fi msg ":: Passing control to Arch Linux Initscripts...Please Wait" /bin/umount /sys /bin/umount /proc - exec /bin/run-init -c /dev/console /real_root /sbin/init ${CMDLINE} + exec /sbin/switch_root -c /dev/console /real_root /sbin/init ${CMDLINE} } # vim:ft=sh:ts=4:sw=4:et: diff --git a/archiso/hooks/archiso-early b/archiso/hooks/archiso-early index d57b73b..edd554b 100644 --- a/archiso/hooks/archiso-early +++ b/archiso/hooks/archiso-early @@ -2,7 +2,7 @@ run_hook () { if [ -n "${archisolabel}" ]; then - echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"vol_id --export \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules + echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules echo "ENV{ID_FS_LABEL_ENC}==\"${archisolabel}\", SYMLINK+=\"archiso\"" >> /lib/udev/rules.d/00-archiso-device.rules fi } -- 1.6.6.1

3 9