October 2012 - Arch-releng - lists.archlinux.org

[arch-releng] [PATCH] [configs/releng] /etc/timezone is not used anymore
by Gerardo Exequiel Pozzi 10 Oct '12

10 Oct '12

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/releng/root-image/etc/timezone | 1 - 1 file changed, 1 deletion(-) delete mode 100644 configs/releng/root-image/etc/timezone diff --git a/configs/releng/root-image/etc/timezone b/configs/releng/root-image/etc/timezone deleted file mode 100644 index e2e7775..0000000 --- a/configs/releng/root-image/etc/timezone +++ /dev/null @@ -1 +0,0 @@ -UTC -- 1.7.12.2

1 0

[arch-releng] [PATCH] [configs/releng] Remove unused files (startup*.nsh)
by Gerardo Exequiel Pozzi 10 Oct '12

10 Oct '12

These files was used with efi-shell boot method, before gummiboot comes here. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/releng/efiboot/EFI/boot/startup_iso.nsh | 10 ---------- configs/releng/efiboot/EFI/boot/startup_usb.nsh | 10 ---------- 2 files changed, 20 deletions(-) delete mode 100644 configs/releng/efiboot/EFI/boot/startup_iso.nsh delete mode 100644 configs/releng/efiboot/EFI/boot/startup_usb.nsh diff --git a/configs/releng/efiboot/EFI/boot/startup_iso.nsh b/configs/releng/efiboot/EFI/boot/startup_iso.nsh deleted file mode 100644 index 5c35ca8..0000000 --- a/configs/releng/efiboot/EFI/boot/startup_iso.nsh +++ /dev/null @@ -1,10 +0,0 @@ -@echo -off - -for %m run (0 20) - if exist fs%m:\EFI\archiso\vmlinuz.efi then - fs%m: - cd fs%m:\EFI\archiso - echo "Launching Arch Linux ISO Kernel fs%m:\EFI\archiso\vmlinuz.efi" - vmlinuz.efi archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% initrd=\EFI\archiso\archiso.img - endif -endfor diff --git a/configs/releng/efiboot/EFI/boot/startup_usb.nsh b/configs/releng/efiboot/EFI/boot/startup_usb.nsh deleted file mode 100644 index 439e400..0000000 --- a/configs/releng/efiboot/EFI/boot/startup_usb.nsh +++ /dev/null @@ -1,10 +0,0 @@ -@echo -off - -for %m run (0 20) - if exist fs%m:\%INSTALL_DIR%\boot\x86_64\vmlinuz then - fs%m: - cd fs%m:\%INSTALL_DIR%\boot\x86_64 - echo "Launching Archiso Kernel fs%m:\%INSTALL_DIR%\boot\x86_64\vmlinuz" - vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% initrd=\%INSTALL_DIR%\boot\x86_64\archiso.img - endif -endfor -- 1.7.12.2

1 0

[arch-releng] [RFC] [PATCH] [configs/releng] make packages.both for common packages for each x86_64
by Gerardo Exequiel Pozzi 08 Oct '12

08 Oct '12

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- configs/releng/build.sh | 2 +- configs/releng/packages.both | 60 +++++++++++++++++++++++++++++++++++++++++ configs/releng/packages.i686 | 61 ------------------------------------------ configs/releng/packages.x86_64 | 61 ------------------------------------------ 4 files changed, 61 insertions(+), 123 deletions(-) create mode 100644 configs/releng/packages.both diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 2699468..ab8097c 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -38,7 +38,7 @@ make_basefs() { # Additional packages (root-image) make_packages() { - mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" install + mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install } # Copy mkinitcpio archiso hooks (root-image) diff --git a/configs/releng/packages.both b/configs/releng/packages.both new file mode 100644 index 0000000..4bab7de --- /dev/null +++ b/configs/releng/packages.both @@ -0,0 +1,60 @@ +arch-install-scripts +b43-fwcutter +btrfs-progs +crda +darkhttpd +ddrescue +dhclient +dialog +dmraid +dnsmasq +dnsutils +dosfstools +elinks +ethtool +fsarchiver +gnu-netcat +gptfdisk +grml-zsh-config +grub-bios +haveged +hdparm +ipw2100-fw +ipw2200-fw +irssi +lftp +lilo +linux-atm +mc +mtools +netcfg +nfs-utils +nilfs-utils +nmap +ntfs-3g +ntfsprogs +ntp +openconnect +openssh +openvpn +partclone +parted +partimage +pptpclient +rfkill +rp-pppoe +rsync +smartmontools +speedtouch +sudo +tcpdump +testdisk +usb_modeswitch +vpnc +wget +wireless_tools +wpa_actiond +wvdial +xl2tpd +zd1211-firmware +zsh diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index 032b666..e69de29 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -1,61 +0,0 @@ -arch-install-scripts -b43-fwcutter -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -efibootmgr -elinks -ethtool -fsarchiver -gnu-netcat -gptfdisk -grml-zsh-config -grub-bios -haveged -hdparm -ipw2100-fw -ipw2200-fw -irssi -lftp -lilo -linux-atm -mc -mtools -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openconnect -openssh -openvpn -partclone -parted -partimage -pptpclient -rfkill -rp-pppoe -rsync -smartmontools -speedtouch -sudo -tcpdump -testdisk -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wvdial -xl2tpd -zd1211-firmware -zsh diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 21ab1c8..137c9d5 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,64 +1,3 @@ -arch-install-scripts -b43-fwcutter -btrfs-progs -crda -darkhttpd -ddrescue -dhclient -dialog -dmraid -dnsmasq -dnsutils -dosfstools -efibootmgr -elinks -ethtool -fsarchiver -gnu-netcat -gptfdisk -grml-zsh-config -grub-bios grub-efi-x86_64 gummiboot-efi -haveged -hdparm -ipw2100-fw -ipw2200-fw -irssi -lftp -lilo -linux-atm -mc -mtools -netcfg -nfs-utils -nilfs-utils -nmap -ntfs-3g -ntfsprogs -ntp -openconnect -openssh -openvpn -partclone -parted -partimage -pptpclient refind-efi -rfkill -rp-pppoe -rsync -smartmontools -speedtouch -sudo -tcpdump -testdisk -usb_modeswitch -vpnc -wget -wireless_tools -wpa_actiond -wvdial -xl2tpd -zd1211-firmware -zsh -- 1.7.12.2

1 1

[arch-releng] Proposal for a release schedule
by Pierre Schmitz 08 Oct '12

08 Oct '12

Hi, I would like to suggest the following schedule for [arch]iso maintenance. The idea is to have dedicated time frames for each part and not to do everything on the last minute. We aim for monthly iso image releases. This will mostly be the first weekend of every month. E.g. the next one will be build on November 3rd and announced the Sunday after. For archiso itself I suggest we propose and discuss new features and patches within the first two weeks after a iso release. On the third week we need test these changes; only bugfix and minor patches are allowed here. Before the fourth week we should tag and release a new archiso package. What do you think about this in general? Of course these are more guidelines than strict rules and I know that we very likely will miss those goals by a few days. Greetings, Pierre -- Pierre Schmitz, https://pierre-schmitz.com

4 5

[arch-releng] [RFC] [PATCH] [archiso] Introduce cowfile_size= bootparam
by Gerardo Exequiel Pozzi 08 Oct '12

08 Oct '12

If not set, nothing is changed in current behaviour. Since dm-snapshot allows to use as "COW" a file with any size, without caring about the the size of "origin", we can avoid creating a "COW" file of the same size as the "origin". This is really useful, when using as cow_device= a filesystem that is VFAT where sparse files are not supported, so if root-image.fs is 1000M, passing cowfile_size=25% will create a root-image.cow of 250M instead of 1000M. --- README | 5 +++++ archiso/initcpio/hooks/archiso | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README b/README index ce8d355..c33f444 100644 --- a/README +++ b/README @@ -65,6 +65,11 @@ INDEX Size is in bytes (suffix with "k", "m" and "g") or in percentage of available RAM. Default: "75%" +* cowfile_size= Set the size for all files to be used as COW (dm-snapshot), + in percentage of the ro-device.fs file. This is mostly useful + when cow_device= is used and filesystem does not support + sparse files (ie VFAT). + Default: "100%" * copytoram_size= Set the size of tmpfs. This space is used for copy of all SquashFS images used, if copytoram=y. Size is in bytes (suffix with "k", "m" and "g") or diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 5b94743..491ed2f 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -11,13 +11,14 @@ _mnt_fs() { ro_dev=$(losetup --find --show --read-only "${img}") echo ${ro_dev} >> /run/archiso/used_block_devices ro_dev_size=$(blockdev --getsz ${ro_dev}) + rw_dev_size=$((ro_dev_size*cowfile_size/100)) if [[ "${cow_persistent}" == "P" ]]; then if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then msg ":: Found '/run/archiso/cowspace/${cow_directory}/${img_name}.cow', using as persistent." else msg ":: Creating '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' as persistent." - dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${ro_dev_size} &> /dev/null + dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null fi else if [[ -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" ]]; then @@ -25,7 +26,7 @@ _mnt_fs() { rm -f "/run/archiso/cowspace/${cow_directory}/${img_name}.cow" fi msg ":: Creating '/run/archiso/cowspace/${cow_directory}/${img_name}.cow' as non-persistent." - dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${ro_dev_size} &> /dev/null + dd of="/run/archiso/cowspace/${cow_directory}/${img_name}.cow" count=0 seek=${rw_dev_size} &> /dev/null fi rw_dev=$(losetup --find --show "/run/archiso/cowspace/${cow_directory}/${img_name}.cow") @@ -101,6 +102,11 @@ run_hook() { [[ -z "${archisobasedir}" ]] && archisobasedir="arch" [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch" [[ -z "${archisodevice}" ]] && archisodevice="/dev/disk/by-label/${archisolabel}" + if [[ -z "${cowfile_size}" ]]; then + cowfile_size="100" + else + cowfile_size=${cowfile_size/%} + fi if [[ -z "${aitab}" ]]; then aitab="/run/archiso/bootmnt/${archisobasedir}/aitab" -- 1.7.12.2

1 0

[arch-releng] Possibly addition to mkarchiso
by Mr Green 06 Oct '12

06 Oct '12

You guys may already be way ahead of me on this but been thinking about possible upcoming changes to systemd. A new option in mkarchiso might make life a little easier. Currently we use the following to start systemd services: mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -r \ 'systemctl -f enable multi-user.target syslog-ng.service NetworkManager.service haveged.service pacman-init.service autologin@.service || true' run This is my take on a new systemd option for mkarchiso: # -systemctl will bascially do 'systemctl -f <services> || true [as in /usr/lib/systemd/system & /etc/systemd/system <user created ones>] mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -systemctl 'syslog-ng NetworkManager haveged pacman-init autologin@' service # or enable? You can of call the new option what you want MrG

2 1

[arch-releng] [PATCH] Makefile: Do not preserve ownership
by Pierre Schmitz 05 Oct '12

05 Oct '12

If we use cp -a files might copied with the wrong ownership and might end up like this on the target iso. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1abeb4a..2284865 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ install-initcpio: install-examples: install -d -m 755 $(DESTDIR)/usr/share/archiso/ - cp -a configs $(DESTDIR)/usr/share/archiso/ + cp -a --no-preserve=ownership configs $(DESTDIR)/usr/share/archiso/ install-doc: install -D -m 644 README $(DESTDIR)/usr/share/doc/archiso/README -- 1.7.12.2

2 2

[arch-releng] [PATCH] Add rfkill to the live system
by Pierre Schmitz 05 Oct '12

05 Oct '12

Some wireless devices need to be enabled before use which is easier using rfkill. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- configs/releng/packages.i686 | 1 + configs/releng/packages.x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686 index b300c60..032b666 100644 --- a/configs/releng/packages.i686 +++ b/configs/releng/packages.i686 @@ -42,6 +42,7 @@ partclone parted partimage pptpclient +rfkill rp-pppoe rsync smartmontools diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 4d93c78..21ab1c8 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -45,6 +45,7 @@ parted partimage pptpclient refind-efi +rfkill rp-pppoe rsync smartmontools -- 1.7.12.2

1 0

[arch-releng] [PATCH] Place the x86_64 boot before i686
by Pierre Schmitz 05 Oct '12

05 Oct '12

This is a very minor change, but let's most people just press enter on bootup. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg | 2 +- configs/releng/syslinux.dual/archiso_sys_both_inc.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg index 324523e..1593303 100644 --- a/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg +++ b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg @@ -1,4 +1,4 @@ INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_pxe32.cfg INCLUDE boot/syslinux/archiso_pxe64.cfg +INCLUDE boot/syslinux/archiso_pxe32.cfg INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg index 4ed6b39..e885c40 100644 --- a/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg +++ b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg @@ -1,4 +1,4 @@ INCLUDE boot/syslinux/archiso_head.cfg -INCLUDE boot/syslinux/archiso_sys32.cfg INCLUDE boot/syslinux/archiso_sys64.cfg +INCLUDE boot/syslinux/archiso_sys32.cfg INCLUDE boot/syslinux/archiso_tail.cfg -- 1.7.12.2

1 0

[arch-releng] [PATCH] Run dhcpcd on all devices
by Pierre Schmitz 05 Oct '12

05 Oct '12

As we did with initscripts, run dhcpcd on all devices and not just eth0. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- configs/releng/build.sh | 2 +- configs/releng/root-image/etc/conf.d/dhcpcd | 6 ------ configs/releng/root-image/etc/systemd/system/dhcpcd.service | 13 +++++++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 configs/releng/root-image/etc/conf.d/dhcpcd create mode 100644 configs/releng/root-image/etc/systemd/system/dhcpcd.service diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 0d93ccd..3601dff 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -194,7 +194,7 @@ make_customize_root_image() { -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" -s /bin/zsh arch' \ run mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \ - -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd@.service || true' \ + -r 'systemctl -f enable multi-user.target haveged.service pacman-init.service autologin@.service dhcpcd.service || true' \ run : > ${work_dir}/build.${FUNCNAME} fi diff --git a/configs/releng/root-image/etc/conf.d/dhcpcd b/configs/releng/root-image/etc/conf.d/dhcpcd deleted file mode 100644 index 76b56ff..0000000 --- a/configs/releng/root-image/etc/conf.d/dhcpcd +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to the DHCP client daemon -# - -DHCPCD_ARGS="-qb" - diff --git a/configs/releng/root-image/etc/systemd/system/dhcpcd.service b/configs/releng/root-image/etc/systemd/system/dhcpcd.service new file mode 100644 index 0000000..dd030d5 --- /dev/null +++ b/configs/releng/root-image/etc/systemd/system/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on all interfaces +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd.pid +ExecStart=/sbin/dhcpcd -A -b -q +ExecStop=/sbin/dhcpcd -k + +[Install] +WantedBy=multi-user.target -- 1.7.12.2

1 0