May 2011 - Arch-releng - lists.archlinux.org

[arch-releng] [PATCH] Experimental support for unionfs-fuse
by Gerardo Exequiel Pozzi 17 May '11

17 May '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 40 +++++++++++++++++--- archiso/install/archiso | 3 +- configs/baseline/boot-files/syslinux/syslinux.cfg | 2 +- .../overlay/etc/rc.d/functions.d/omit_kill_unionfs | 6 +++ 4 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 configs/baseline/overlay/etc/rc.d/functions.d/omit_kill_unionfs diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index a129b20..408ad08 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -7,6 +7,14 @@ _mnt_aufs() { /bin/mount -t aufs -o remount,append:"${src}"=ro none "${mnt}" } +# args: source, mountpoint (ignored) +_mnt_fuse() { + src="${1}" + mnt="${2}" + msg "::: Adding new unionfs-fuse branch: ${src} to ${mnt}" + fuse_branchs="${fuse_branchs}:${src}=RO" +} + # args: source, mountpoint _mnt_bind() { src="${1}" @@ -43,7 +51,11 @@ _mnt_squashfs() { fi if [ "/${mnt#/*/}" = "/" ]; then - _mnt_aufs "${tmp_mnt}" "${mnt}" + if [ "${fuse}" = "y" ]; then + _mnt_fuse "${tmp_mnt}" "${mnt}" + else + _mnt_aufs "${tmp_mnt}" "${mnt}" + fi else _mnt_bind "${tmp_mnt}" "${mnt}" fi @@ -126,11 +138,13 @@ archiso_mount_handler() { mount -t tmpfs -o "size=${rw_branch_size}",mode=0755 rw_branch /rw_branch msg "done." - msg ":: Mounting root (aufs) filesystem" - /bin/mount -t aufs -o dirs=/rw_branch=rw union "${newroot}" - if [ $? -ne 0 ]; then - echo "ERROR: while mounting root (aufs) filesystem." - launch_interactive_shell + if [ "${fuse}" != "y" ]; then + msg ":: Mounting root (aufs) filesystem" + /bin/mount -t aufs -o dirs=/rw_branch=rw union "${newroot}" + if [ $? -ne 0 ]; then + echo "ERROR: while mounting root (aufs) filesystem." + launch_interactive_shell + fi fi msg ":: Mounting images" @@ -149,6 +163,20 @@ archiso_mount_handler() { fi done < "${isomounts}" + if [ "${fuse}" = "y" ]; then + /sbin/modprobe fuse + msg ":: Mounting root (unionfs-fuse) filesystem" + FUSE_OPTS="allow_other,use_ino,suid,dev,nonempty" + UNION_OPTS="cow,max_files=32768,statfs_omit_ro" + /usr/bin/unionfs -o ${FUSE_OPTS} -o ${UNION_OPTS} "/rw_branch=RW${fuse_branchs}" "${newroot}" + if [ $? -ne 0 ]; then + echo "ERROR: while mounting root (unionfs-fuse) filesystem." + launch_interactive_shell + else + pidof unionfs > /run/unionfs.pid + fi + fi + if [ "${copytoram}" = "y" ]; then /bin/umount /bootmnt else diff --git a/archiso/install/archiso b/archiso/install/archiso index 7ad9d06..f97e634 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -1,6 +1,6 @@ install () { - MODULES="cdrom ide-cd_mod ide-core ide-generic aufs squashfs isofs loop $(all_modules '/kernel/fs' | grep -v "nls") " + MODULES="cdrom ide-cd_mod ide-core ide-generic aufs fuse squashfs isofs loop $(all_modules '/kernel/fs' | grep -v "nls") " MODULES="${MODULES} $(checked_modules "/usb/host" | grep -ve "_cs" -e "sl811-hcd" -e "isp116x-hcd")" MODULES=$(echo ${MODULES}) #trim whitespace if [ "x${MODULES}" != "x" ]; then @@ -18,6 +18,7 @@ install () add_device /lib/udev/devices/loop0 b 7 0 add_binary /lib/udev/cdrom_id + add_binary /usr/bin/unionfs add_file /lib/udev/rules.d/60-cdrom_id.rules diff --git a/configs/baseline/boot-files/syslinux/syslinux.cfg b/configs/baseline/boot-files/syslinux/syslinux.cfg index a69e424..e5a03e6 100644 --- a/configs/baseline/boot-files/syslinux/syslinux.cfg +++ b/configs/baseline/boot-files/syslinux/syslinux.cfg @@ -1,3 +1,3 @@ LABEL arch LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26 -APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% +APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% fuse=y diff --git a/configs/baseline/overlay/etc/rc.d/functions.d/omit_kill_unionfs b/configs/baseline/overlay/etc/rc.d/functions.d/omit_kill_unionfs new file mode 100644 index 0000000..40685be --- /dev/null +++ b/configs/baseline/overlay/etc/rc.d/functions.d/omit_kill_unionfs @@ -0,0 +1,6 @@ +omit_kill_unionfs() { + add_omit_pids $(cat /run/unionfs.pid) +} + +add_hook shutdown_prekillall omit_kill_unionfs +add_hook single_prekillall omit_kill_unionfs -- 1.7.5.1

1 1

[arch-releng] our core-dual images are too big
by Dieter Plaetinck 16 May '11

16 May '11

the size of core-dual iso has been over 700MB for a while. the last one is 738MB. See http://releng.archlinux.org/isos/2011.04.30/ what would be the best way to fix this? different archiso2dual parameters? different compression somewhere? revised packagelist? moving some packages out of core? [is anyone aware of noticeable size increases of the core repo or core packages?] Dieter

9 17

Re: [arch-releng] our core-dual images are too big
by Pierre Schmitz 16 May '11

16 May '11

On Sun, 15 May 2011 12:25:18 +0200, Dieter Plaetinck wrote: > On Fri, 06 May 2011 15:28:29 +0200 > Pierre Schmitz <pierre(a)archlinux.de> wrote: > >> On Fri, 06 May 2011 17:45:13 +1000, Allan McRae wrote: >> > On 06/05/11 17:31, Dieter Plaetinck wrote: >> >> On Thu, 05 May 2011 21:38:14 -0300 >> >> adding exceptions in download-repo.sh to work around limitations in our >> >> repo scripts is not the way to go imho. let's get those packages out >> >> of core the proper way, and let's see if/how we can cut another 10MB. >> >> >> > >> > That limitation in the devtools/db-scripts has been around ever since >> > split packages became available in pacman/makepkg. I would not bank >> > on it getting fixed in the short term (or even in the long term...) >> >> I wont got into details here but putting split packages into different >> repos is a "wont implement". It's more a limitation of how we use svn >> and the repos. There was a thread about the details on the mailing list. > > I can't find that thread. Where exactly was this discussed? > I understand this is probably hard to fix, on the other hand: > 1) this is a violation of what the core repository is for (and we had a very > extensive discussion on that recently). see > https://wiki.archlinux.org/index.php/Official_repositories#.5Bcore.5D > 2) it makes the core repo bigger than it should be, which makes my > job harder. > > Dieter I have to admit my response as probably too short. The thread I meant was http://mailman.archlinux.org/pipermail/arch-dev-public/2011-February/019268… and some other related ones which I didn't find quickly. The problem is how we store PKGBUILDs in svn and assign them to different repos and arches. (e.g. /pkgname/repos/extra-i686) This layout wont work with several use cases we'd like to have: split packages with different architectures and repositories. Later in that thread I have proposed a possible solution. But I haven't a solid concept yet and it will be a major break and would probably need changes in makepkg etc.. In short: There is no simple patch to solve this as this us an design issue. Trying to add it to our current repo layout would be an ugly hack, complex and in fact this would be a bigger violation of our "philosophy". However: I know about these issue and they will probably solved in some way in the future. But you shouldn't wait for it to happen. Greetings, Pierre -- Pierre Schmitz, https://users.archlinux.de/~pierre

1 0

[arch-releng] [PATCH 1/2] releng: Place helptext closer to its option list
by Tom Willemsen 15 May '11

15 May '11

Place all the elements with the helptext class that follow a <ul> closer to the <ul>. Signed-off-by: Tom Willemsen <ryuslash(a)gmail.com> --- media/archweb.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/media/archweb.css b/media/archweb.css index 504c827..9832d58 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -264,6 +264,7 @@ ul.admin-actions li { display: inline; padding-left: 1.5em; } #releng-feedback label { width: auto; display: inline; font-weight: normal; } #releng-feedback ul { padding-left: 1em; } #releng-feedback li { list-style: none; } +#releng-feedback ul+.helptext { position: relative; top: -0.9em; } /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a { color: white !important; } -- 1.7.5.1

3 6

[arch-releng] [PATCH 1/2] releng: clarify some text and options
by Dieter Plaetinck 10 May '11

10 May '11

Signed-off-by: Dieter Plaetinck <dieter(a)plaetinck.be> --- releng/fixtures/installtype.json | 2 +- releng/fixtures/source.json | 4 ++-- releng/views.py | 6 ++++-- templates/releng/add.html | 15 +++++++++++---- templates/releng/results.html | 4 ++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/releng/fixtures/installtype.json b/releng/fixtures/installtype.json index 7fa21fc..07d17f2 100644 --- a/releng/fixtures/installtype.json +++ b/releng/fixtures/installtype.json @@ -24,7 +24,7 @@ "pk": 4, "model": "releng.installtype", "fields": { - "name": "automatic install custom config (specify in comments)" + "name": "automatic install custom config (if special, specify in comments)" } } ] diff --git a/releng/fixtures/source.json b/releng/fixtures/source.json index 2622f4c..9d1950a 100644 --- a/releng/fixtures/source.json +++ b/releng/fixtures/source.json @@ -3,14 +3,14 @@ "pk": 1, "model": "releng.source", "fields": { - "name": "net install manual networking config (Check that it works + rc.conf, resolv.conf, mirrorlist)" + "name": "net install manual networking config (verify network, rc.conf, resolv.conf, mirrorlist)" } }, { "pk": 2, "model": "releng.source", "fields": { - "name": "net install dhcp (Check that it works + rc.conf)" + "name": "net install dhcp (verify network, rc.conf, mirrorlist)" } }, { diff --git a/releng/views.py b/releng/views.py index ae9c868..70aaaf5 100644 --- a/releng/views.py +++ b/releng/views.py @@ -23,10 +23,12 @@ class TestForm(forms.ModelForm): source = standard_field(Source) clock_choice = standard_field(ClockChoice) filesystem = standard_field(Filesystem, - help_text="Check the installed system, including fstab.") + help_text="verify /etc/fstab, `df -hT` output and commands like " \ + "lvdisplay for special modules") modules = forms.ModelMultipleChoiceField(queryset=Module.objects.all(), help_text="", widget=forms.CheckboxSelectMultiple(), required=False) - bootloader = standard_field(Bootloader) + bootloader = standard_field(Bootloader, + help_text="Verify that the entries in the bootloader config look ok") rollback_filesystem = standard_field(Filesystem, help_text="If you did a rollback followed by a new attempt to setup " \ "your lockdevices/filesystems, select which option you took here.", diff --git a/templates/releng/add.html b/templates/releng/add.html index 3678532..9be5f4c 100644 --- a/templates/releng/add.html +++ b/templates/releng/add.html @@ -6,10 +6,17 @@ <div class="box"> <h2>Arch Releng Testbuild Feedback Entry</h2> - <p>This page allows you to submit feedback after testing and using a - release engineering install ISO. If you do not currently have feedback to - submit, you may want to take a look at the current - <a href="{% url releng-test-overview %}">results page</a>.</p> + <p>This page allows you to submit feedback after testing an Arch Linux installation + using a release engineering testbuild. Mark all the options you used during the + installation; at the end you can specify whether everything went OK. Be + sure to only denote a successfull install after having checked the + installation properly. Some options require you to check several things (such as + config files), this will be mentioned alongside the option.</p> + <p>There is also an overview of all feedback on the + <a href="{% url releng-test-overview %}">results page</a>. Once we have + builds that are properly tested (enough successfull feedback for all + important features of the iso or a slightly earlier iso), we can release new + official media.</p> <div id="releng-feedback"> <form action="" method="post">{% csrf_token %} {{ form.as_p }} diff --git a/templates/releng/results.html b/templates/releng/results.html index 4aca1f1..d7708cb 100644 --- a/templates/releng/results.html +++ b/templates/releng/results.html @@ -13,6 +13,10 @@ if you have tested and used any ISOs. Both successful and failed results are encouraged and welcome.</p> + <p>For more information, see the <a + href="https://wiki.archlinux.org/index.php/DeveloperWiki:releng_testimages_feedba…">documentation + on the wiki</a></p> + <p>All ISOs referenced on this page are available from <a href="{{ iso_url }}">{{ iso_url }}</a>.</p> -- 1.7.5.1

2 3

[arch-releng] [RFC] [PATCH] [archiso] Update fstab and "source dev" of aufs.
by Gerardo Exequiel Pozzi 09 May '11

09 May '11

* Change from none -> union (looks like util-linux is confused BUG?) Avoid the message: "umount aufs failed: not found" at shutdown. #1 mount -t tmpfs none /something #2 mount -t tmpfs xxxx /something The output of findmnt -rnu -o SOURCE will be blank in #1. * Change from aufs -> auto, make its more generic. * Update devpts and shm entries. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- archiso/hooks/archiso | 2 +- configs/syslinux-iso/overlay/etc/fstab | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 4a4239e..a129b20 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -127,7 +127,7 @@ archiso_mount_handler() { msg "done." msg ":: Mounting root (aufs) filesystem" - /bin/mount -t aufs -o dirs=/rw_branch=rw none "${newroot}" + /bin/mount -t aufs -o dirs=/rw_branch=rw union "${newroot}" if [ $? -ne 0 ]; then echo "ERROR: while mounting root (aufs) filesystem." launch_interactive_shell diff --git a/configs/syslinux-iso/overlay/etc/fstab b/configs/syslinux-iso/overlay/etc/fstab index 3c43a5e..b470b17 100644 --- a/configs/syslinux-iso/overlay/etc/fstab +++ b/configs/syslinux-iso/overlay/etc/fstab @@ -1,7 +1,7 @@ +# # /etc/fstab: static file system information +# # <file system> <dir> <type> <options> <dump> <pass> -aufs / aufs noauto 0 0 -none /dev/pts devpts defaults 0 0 -none /dev/shm tmpfs defaults 0 0 - -### Auto generated entries get added here: +union / auto noauto 0 0 +devpts /dev/pts devpts defaults 0 0 +shm /dev/shm tmpfs nodev,nosuid 0 0 -- 1.7.5.1

1 1

[arch-releng] [RFC] [PATCH] [syslinux-iso] Update rc.conf to match newer initscripts.
by Gerardo Exequiel Pozzi 09 May '11

09 May '11

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/syslinux-iso/overlay/etc/rc.conf | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/configs/syslinux-iso/overlay/etc/rc.conf b/configs/syslinux-iso/overlay/etc/rc.conf index 2819a32..55f4ec4 100644 --- a/configs/syslinux-iso/overlay/etc/rc.conf +++ b/configs/syslinux-iso/overlay/etc/rc.conf @@ -4,22 +4,33 @@ . /etc/archiso/functions LOCALE_DEFAULT="en_US.UTF-8" -CLOCK_DEFAULT="" -TIMEZONE_DEFAULT="" +DAEMON_LOCALE_DEFAULT="no" +CLOCK_DEFAULT="UTC" +TIMEZONE_DEFAULT="Canada/Pacific" KEYMAP_DEFAULT="us" +CONSOLEFONT_DEFAULT= +CONSOLEMAP_DEFAULT= +USECOLOR_DEFAULT="yes" +VERBOSE_DEFAULT="3" LOCALE="$(kernel_cmdline locale ${LOCALE_DEFAULT})" +DAEMON_LOCALE="$(kernel_cmdline daemon_locale ${DAEMON_LOCALE_DEFAULT})" HARDWARECLOCK="$(kernel_cmdline clock ${CLOCK_DEFAULT})" TIMEZONE="$(kernel_cmdline timezone ${TIMEZONE_DEFAULT})" KEYMAP="$(kernel_cmdline keymap ${KEYMAP_DEFAULT})" -CONSOLEFONT="$(kernel_cmdline consolefont)" -CONSOLEMAP="$(kernel_cmdline consolemap)" -USECOLOR="yes" +CONSOLEFONT="$(kernel_cmdline consolefont ${CONSOLEFONT_DEFAULT})" +CONSOLEMAP="$(kernel_cmdline consolemap ${CONSOLEMAP_DEFAULT})" +USECOLOR="$(kernel_cmdline usecolor ${USECOLOR_DEFAULT})" +VERBOSE="$(kernel_cmdline verbose ${VERBOSE_DEFAULT}" MOD_AUTOLOAD="yes" +MODULES=() + +UDEV_TIMEOUT=30 +USEDMRAID="no" +USEBTRFS="no" +USELVM="no" HOSTNAME="archiso" -#TODO add more auto-daemons here, especially the live-cd specific stuff -DAEMONS=(syslog-ng network archiso) -#TODO: auto-network find-disks find-user-home +DAEMONS=(hwclock syslog-ng network archiso) -- 1.7.5.1

1 0

[arch-releng] [RFC] [PATCH] [syslinux-iso] Change initramfs compression lzma -> xz
by Gerardo Exequiel Pozzi 04 May '11

04 May '11

Needs mkinitcpio >= 0.6.9-1 (otherwise does not work with passed options to xz). Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/syslinux-iso/mkinitcpio.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configs/syslinux-iso/mkinitcpio.conf b/configs/syslinux-iso/mkinitcpio.conf index f5f8c79..aea436d 100644 --- a/configs/syslinux-iso/mkinitcpio.conf +++ b/configs/syslinux-iso/mkinitcpio.conf @@ -3,4 +3,4 @@ MODULES="" BINARIES="" FILES="" HOOKS="base udev memdisk archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata usb fw pcmcia filesystems usbinput" -COMPRESSION="lzma" +COMPRESSION="xz" -- 1.7.4.4

2 3

[arch-releng] [PATCH] [RFC][syslinux-iso] Fix double execution of initscripts hooks.
by Gerardo Exequiel Pozzi 03 May '11

03 May '11

Partially revert commit b171f8f11fdc04a22c7b8f3ff3b9dd164986daae Fixes https://bugs.archlinux.org/task/23786 Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/syslinux-iso/overlay/etc/archiso/functions | 20 ++++++++++++++++++++ configs/syslinux-iso/overlay/etc/rc.conf | 2 +- .../overlay/etc/rc.d/functions.d/archiso | 20 -------------------- .../overlay/etc/rc.d/functions.d/automated_script | 2 ++ 4 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 configs/syslinux-iso/overlay/etc/archiso/functions delete mode 100644 configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso diff --git a/configs/syslinux-iso/overlay/etc/archiso/functions b/configs/syslinux-iso/overlay/etc/archiso/functions new file mode 100644 index 0000000..02b41cf --- /dev/null +++ b/configs/syslinux-iso/overlay/etc/archiso/functions @@ -0,0 +1,20 @@ +# vim: set ft=sh: + +# kernel_cmdline <param> +# Looks for a parameter on the kernel's boot-time command line. +# +# returns: 0 if param was found. Also prints its value if it was a K=V param. +# 1 if it was not +# +kernel_cmdline () +{ + for param in $(/bin/cat /proc/cmdline); do + case "${param}" in + $1=*) echo "${param##*=}"; return 0 ;; + $1) return 0 ;; + *) continue ;; + esac + done + + return 1 +} diff --git a/configs/syslinux-iso/overlay/etc/rc.conf b/configs/syslinux-iso/overlay/etc/rc.conf index 3ce3c5a..2819a32 100644 --- a/configs/syslinux-iso/overlay/etc/rc.conf +++ b/configs/syslinux-iso/overlay/etc/rc.conf @@ -1,7 +1,7 @@ # # /etc/rc.conf - Main Configuration for Arch Linux -. /etc/rc.d/functions +. /etc/archiso/functions LOCALE_DEFAULT="en_US.UTF-8" CLOCK_DEFAULT="" diff --git a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso deleted file mode 100644 index 02b41cf..0000000 --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso +++ /dev/null @@ -1,20 +0,0 @@ -# vim: set ft=sh: - -# kernel_cmdline <param> -# Looks for a parameter on the kernel's boot-time command line. -# -# returns: 0 if param was found. Also prints its value if it was a K=V param. -# 1 if it was not -# -kernel_cmdline () -{ - for param in $(/bin/cat /proc/cmdline); do - case "${param}" in - $1=*) echo "${param##*=}"; return 0 ;; - $1) return 0 ;; - *) continue ;; - esac - done - - return 1 -} diff --git a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script index 7a35acb..edb8ea3 100644 --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script +++ b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script @@ -1,3 +1,5 @@ +. /etc/archiso/functions + automated_script () { script="$(kernel_cmdline script)" -- 1.7.5

1 1

[arch-releng] [PATCH 1/5] add loading releng fixtures to README
by Dieter Plaetinck 03 May '11

03 May '11

Signed-off-by: Dieter Plaetinck <dieter(a)plaetinck.be> --- README | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/README b/README index 3e31538..6319439 100644 --- a/README +++ b/README @@ -60,6 +60,7 @@ packages, you will probably want the following: (archweb-env) $ ./manage.py loaddata main/fixtures/repos.json (archweb-env) $ ./manage.py loaddata main/fixtures/groups.json (archweb-env) $ ./manage.py loaddata mirrors/fixtures/mirrorprotocols.json + (archweb-env) $ ./manage.py loaddata releng/fixtures/* 7. Use the following commands to start a service instance -- 1.7.4.4

2 8