- Arch-releng - lists.archlinux.org

[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

[arch-releng] [PATCH] Disable ntpd service by default
by Pierre Schmitz 05 Oct '12

05 Oct '12

A live system should never alter the host system in any way. This includes setting the bios clock. E.g. if the user runs his system in local time we would do the wrong thing here. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- configs/releng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 2fa5d50..0d93ccd 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 ntpd.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 -- 1.7.12.2

2 1

[arch-releng] Squashfs
by Mr Green 03 Oct '12

03 Oct '12

Currently to convert root-image to a real install we unsquash root-image.fs.sfs then mount root-image.fs then copy from there. We have already got image mounted /dev/loop0 on /run/archiso/sfs/root-image type squashfs (ro,relatime) Trying to take out an unsquash action to reduce install time, it will only work if I can mount /run/archiso/sfs/root-image/root-image.fs Have feeling I am not going to be able to mount it twice. MrG

2 1

[arch-releng] next snapshot: 2012.10
by Gerardo Exequiel Pozzi 03 Oct '12

03 Oct '12

Hello This is a list of user-view-changes from archiso side: * New packages: xl2tpd, refind-efi-x86_64, gummiboot-efi, fsarchiver, mc, partclone, partimage, testdisk * Re-added pkgs: sudo, wget * Simplified steps to make an USB PC-EFI from ISO * Usage of gummiboot for fancy menu when booting in EFI mode. * The /script/ boot parameter works again (really really now!) * systemd (PENDING) [ready for merge to master] I want to do this, otherwise there is no user feedback. Good Luck -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1

5 9

[arch-releng] squashfs
by Mr Green 02 Oct '12

02 Oct '12

This is more likely not the correct place to ask, but I am interested in finding out more about mksquashfs. Currently I notice that root-image.fs.sfs once mounted gives root-image.fs which then also has to mounted [looped]. Is there a way to only mount and copy once? The root-image. Have noticed that some other live isos only need to copy out image to new install. MrG

3 2