February 2017 - Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH] init: introduce a non-interactive mode (rd.noninteractive)
by Martin Peres 10 Mar '17

10 Mar '17

CI systems compile and boot on kernels that are sometimes broken and fail to find the root device. This patch adds a new parameter (rd.noninteractive) that prevents starting an interactive shell and reboots the machine 2 seconds after warning the user about the issue. This allows me to test the kernel faster than would be possible using external watchdogs which would require at least 2 minutes before kicking in. --- init_functions | 16 ++++++++++++++++ man/mkinitcpio.8.txt | 3 +++ test/test_parse_cmdline | 2 ++ 3 files changed, 21 insertions(+) diff --git a/init_functions b/init_functions index d5a584e..7287086 100644 --- a/init_functions +++ b/init_functions @@ -47,6 +47,19 @@ poll_device() { } launch_interactive_shell() { + if [ -n "$rd_noninteractive" ]; then + printf '%s\n' \ + "************** REBOOT REQUIRED **************" \ + "* *" \ + "* running in non-interactive mode *" \ + "* - *" \ + "* automatically restarting in 2 seconds *" \ + "* *" \ + "*********************************************" + sleep 2 + reboot -f + fi + export PS1='[rootfs \W]\$ ' # explicitly redirect to /dev/console in case we're logging. note that @@ -174,6 +187,9 @@ parse_cmdline_item() { rd_logmask=$(( _rdlog_kmsg | _rdlog_cons )) fi ;; + rd.noninteractive) + rd_noninteractive=y + ;; [![:alpha:]_]*|[[:alpha:]_]*[![:alnum:]_]*) # invalid shell variable, ignore it ;; diff --git a/man/mkinitcpio.8.txt b/man/mkinitcpio.8.txt index 5c3118e..d9410dc 100644 --- a/man/mkinitcpio.8.txt +++ b/man/mkinitcpio.8.txt @@ -292,6 +292,9 @@ the kernel command line: *all*;; Writes output to all known log targets. +*rd.noninteractive*:: + If specified, reboot the machine instead of starting an interactive shell. + These are only the variables that the core of mkinitcpio honor. Additional hooks may look for other environment variables and should be documented by the help output for the hook. diff --git a/test/test_parse_cmdline b/test/test_parse_cmdline index ff855e4..9249962 100755 --- a/test/test_parse_cmdline +++ b/test/test_parse_cmdline @@ -217,6 +217,8 @@ test_parse 'rd.log=kmsg' \ 'rd_logmask' '2' test_parse 'rd.log=file' \ 'rd_logmask' '1' +test_parse 'rd.noninteractive' \ + 'rd_noninteractive' 'y' # a mix of stuff test_parse 'foo=bar bareword bar="ba az"' \ -- 2.11.1

1 1

[arch-projects] [devtools] [PATCH] Fix broken symlink because of temporary chroot PKGDEST /pkgdest
by archlinux＠nicohood.de 04 Mar '17

04 Mar '17

From: NicoHood <git(a)nicohood.de> --- makechrootpkg.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/makechrootpkg.in b/makechrootpkg.in index 284d444..766f237 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -233,6 +233,12 @@ move_products() { for pkgfile in "$copydir"/pkgdest/*; do chown "$src_owner" "$pkgfile" mv "$pkgfile" "$PKGDEST" + + # Fix broken symlink because of temporary chroot PKGDEST /pkgdest + if [[ "$PWD" != "$PKGDEST" && -L "$PWD/${pkgfile##*/}" ]]; then + rm "$PWD/${pkgfile##*/}" + ln -s "$PKGDEST/${pkgfile##*/}" "$PWD/${pkgfile##*/}" + fi done for l in "$copydir"/logdest/*; do -- 2.11.0

3 3

[arch-projects] [devtools] [PATCH] fix potential non-writable directories of builduser in /build
by Levente Polyak 22 Feb '17

22 Feb '17

This removes the preservation of HOME being /build just for the pacman sudo call. Former leads to unbuildable packages when an to be installed dependency writes something into the HOME dir (f.e. .config). The resulting directories won't be writable by the builduser as they are owned by root:root and ultimately will fail to build anything that requires so. --- makechrootpkg.in | 1 - 1 file changed, 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 284d444..0336640 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -173,7 +173,6 @@ prepare_chroot() { done cat > "$copydir/etc/sudoers.d/builduser-pacman" <<EOF -Defaults env_keep += "HOME" builduser ALL = NOPASSWD: /usr/bin/pacman EOF chmod 440 "$copydir/etc/sudoers.d/builduser-pacman" -- 2.11.1

2 1

[arch-projects] [devtools] [PATCH] archbuild/makechrootpkg: Delete sub-subvolumes as well
by Johannes Löthberg 17 Feb '17

17 Feb '17

Some packages end up creating subvolumes through systemd-tmpfiles, (e.g. systemd-nspawn,) so we need to delete those as well. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- archbuild.in | 10 +++++++++- makechrootpkg.in | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/archbuild.in b/archbuild.in index 9c5d706..159602b 100644 --- a/archbuild.in +++ b/archbuild.in @@ -54,7 +54,15 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then lock 9 "$copy.lock" "Locking chroot copy '$copy'" if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then - { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null + # Delete all subvolumes under the copy directory. This is needed + # because some things, like systemd-nspawn, end up creating a btrfs + # subvolume through systemd-tmpfiles. + if type -P btrfs &>/dev/null; then + btrfs subvolume list --sort=-path -o "$copy" | \ + sed 's|[^/]*||' | \ + xargs btrfs subvolume delete &>/dev/null + + btrfs subvolume delete "$copy" &>/dev/null + fi fi rm -rf --one-file-system "${copy}" done diff --git a/makechrootpkg.in b/makechrootpkg.in index 284d444..b89f33e 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -91,6 +91,11 @@ create_chroot() { stat_busy "Creating clean working copy [$copy]" if [[ "$chroottype" == btrfs ]] && ! mountpoint -q "$copydir"; then if [[ -d $copydir ]]; then + btrfs subvolume list --sort=-path -o "$copydir" | \ + sed 's|[^/]*||' | \ + xargs btrfs subvolume delete >/dev/null || + die "Unable to delete subvolumes under %s" "$copydir" + btrfs subvolume delete "$copydir" >/dev/null || die "Unable to delete subvolume %s" "$copydir" fi -- 2.11.0

8 15

[arch-projects] [devtools] [PATCH] mkarchroot: Set LANG=en_US.UTF-8
by Jan Alexander Steffens (heftig) 17 Feb '17

17 Feb '17

In order to have an UTF-8 locale in the build root. This is something normally set on real machines but is not set from our chroots. Meson, for example, loudly complains when the locale charset is not UTF-8. I'd like to have C.UTF-8, as most other distributions do. Unfortunately, it's not part of vanilla glibc; en_US.UTF-8 will have to do. mkarchroot already creates roots with both en_US.UTF-8 and de_DE.UTF-8, the latter because builds of gcc (perhaps used to) require it. Bump the CHROOT_VERSION due to the setting change. --- arch-nspawn.in | 2 +- mkarchroot.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index e46b57ffcdc2cda2..b5fcc9d51e3768f3 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -10,7 +10,7 @@ m4_include(lib/common.sh) -CHROOT_VERSION='v3' +CHROOT_VERSION='v4' working_dir='' diff --git a/mkarchroot.in b/mkarchroot.in index 4d8efb0d8a90f873..c4bb51a1d218a78c 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -10,7 +10,7 @@ m4_include(lib/common.sh) -CHROOT_VERSION='v3' +CHROOT_VERSION='v4' working_dir='' @@ -72,7 +72,7 @@ pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \ "${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages' printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen" -echo 'LANG=C' > "$working_dir/etc/locale.conf" +echo 'LANG=en_US.UTF-8' > "$working_dir/etc/locale.conf" echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot" systemd-machine-id-setup --root="$working_dir" -- 2.11.1

1 0