Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package arch-install-scripts for
openSUSE:Factory checked in at 2022-11-22 16:10:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arch-install-scripts (Old)
and /work/SRC/openSUSE:Factory/.arch-install-scripts.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arch-install-scripts"
Tue Nov 22 16:10:11 2022 rev:5 rq:1037157 version:28
Changes:
--------
---
/work/SRC/openSUSE:Factory/arch-install-scripts/arch-install-scripts.changes
2022-09-30 17:57:47.581248428 +0200
+++
/work/SRC/openSUSE:Factory/.arch-install-scripts.new.1597/arch-install-scripts.changes
2022-11-22 16:10:17.406062607 +0100
@@ -1,0 +2,6 @@
+Mon Nov 21 17:22:00 UTC 2022 - Bruno Pitrus <[email protected]>
+- New upstream release 28
+ * genfstab: disable fsck for btrfs (it does not need it and the binary is a
no-op)
+ * genfstab: remove subvolid= from btrfs options if subvol= is set
+
+-------------------------------------------------------------------
Old:
----
v27.tar.gz
New:
----
v28.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arch-install-scripts.spec ++++++
--- /var/tmp/diff_new_pack.TRYyTN/_old 2022-11-22 16:10:20.622078924 +0100
+++ /var/tmp/diff_new_pack.TRYyTN/_new 2022-11-22 16:10:20.626078944 +0100
@@ -17,7 +17,7 @@
Name: arch-install-scripts
-Version: 27
+Version: 28
Release: 0
Summary: Scripts aimed at automating some menial installation/recovery
tasks
License: GPL-2.0-only
@@ -44,6 +44,9 @@
%setup -q
%autopatch
+#preserve original file dates
+sed -i 's/install -/install -p -/' Makefile
+
#Remove an Arch-specific script that is useless on other distros and requires
a working pacman install
find . -name 'pacstrap*' -delete
++++++ v27.tar.gz -> v28.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/arch-install-scripts-27/common
new/arch-install-scripts-28/common
--- old/arch-install-scripts-27/common 2022-09-28 18:48:20.000000000 +0200
+++ new/arch-install-scripts-28/common 2022-11-20 14:59:40.000000000 +0100
@@ -56,7 +56,7 @@
[virtiofs]=1)
# generated from: pkgfile -vbr '/fsck\..+' | awk -F. '{ print $NF }' | sort
-declare -A fsck_types=([btrfs]=1
+declare -A fsck_types=([btrfs]=0 # btrfs doesn't need a regular fsck utility
[cramfs]=1
[erofs]=1
[exfat]=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/arch-install-scripts-27/completion/pacstrap.bash
new/arch-install-scripts-28/completion/pacstrap.bash
--- old/arch-install-scripts-27/completion/pacstrap.bash 2022-09-28
18:48:20.000000000 +0200
+++ new/arch-install-scripts-28/completion/pacstrap.bash 2022-11-20
14:59:40.000000000 +0100
@@ -8,7 +8,7 @@
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts="-C -c -G -i -K -M -N -h"
+ opts="-C -c -D -G -i -K -M -N -P -U -h"
for i in "${COMP_WORDS[@]:1:COMP_CWORD-1}"; do
if [[ -d ${i} ]]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/arch-install-scripts-27/doc/pacstrap.8.asciidoc
new/arch-install-scripts-28/doc/pacstrap.8.asciidoc
--- old/arch-install-scripts-27/doc/pacstrap.8.asciidoc 2022-09-28
18:48:20.000000000 +0200
+++ new/arch-install-scripts-28/doc/pacstrap.8.asciidoc 2022-11-20
14:59:40.000000000 +0100
@@ -28,6 +28,9 @@
*-c*::
Use the package cache on the host, rather than the target.
+*-D*::
+ Skip pacman dependency checks.
+
*-G*::
Avoid copying the host's pacman keyring to the target.
@@ -45,6 +48,9 @@
mount and user namespace, allowing regular users to create new system
installations.
+*-P*::
+ Copy the host's pacman config to the target.
+
*-U*::
Use pacman -U to install packages. Useful for obtaining fine-grained
control over the installed packages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/arch-install-scripts-27/genfstab.in
new/arch-install-scripts-28/genfstab.in
--- old/arch-install-scripts-27/genfstab.in 2022-09-28 18:48:20.000000000
+0200
+++ new/arch-install-scripts-28/genfstab.in 2022-11-20 14:59:40.000000000
+0100
@@ -58,6 +58,14 @@
fi
case $fstype in
+ btrfs)
+ # Having only one of subvol= and subvolid= is enough for mounting a
btrfs subvolume
+ # And having subvolid= set prevents things like 'snapper rollback' to
work, as it
+ # updates the subvolume in-place, leaving subvol= unchanged with a
different subvolid.
+ if optstring_has_option "$varname" subvol; then
+ optstring_remove_option "$varname" subvolid
+ fi
+ ;;
f2fs)
# These are Kconfig options for f2fs. Kernels supporting the options will
# only provide the negative versions of these (e.g. noacl), and vice
versa
@@ -166,6 +174,7 @@
if [[ $fsroot != / && $fstype != btrfs ]]; then
# it's a bind mount
src=$(findmnt -funcevo TARGET "$src")$fsroot
+ src="/${src#$root/}"
if [[ $src -ef $target ]]; then
# hrmm, this is weird. we're probably looking at a file or directory
# that was bound into a chroot from the host machine. Ignore it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/arch-install-scripts-27/pacstrap.in
new/arch-install-scripts-28/pacstrap.in
--- old/arch-install-scripts-27/pacstrap.in 2022-09-28 18:48:20.000000000
+0200
+++ new/arch-install-scripts-28/pacstrap.in 2022-11-20 14:59:40.000000000
+0100
@@ -16,9 +16,12 @@
copykeyring=1
initkeyring=0
copymirrorlist=1
+pacman_args=()
pacmode=-Sy
setup=chroot_setup
unshare=0
+copyconf=0
+pacman_config=/etc/pacman.conf
usage() {
cat <<EOF
@@ -27,11 +30,13 @@
Options:
-C <config> Use an alternate config file for pacman
-c Use the package cache on the host, rather than the target
+ -D Skip pacman dependency checks
-G Avoid copying the host's pacman keyring to the target
-i Prompt for package confirmation when needed (run
interactively)
-K Initialize an empty pacman keyring in the target (implies
'-G')
-M Avoid copying the host's mirrorlist to the target
-N Run in unshare mode as a regular user
+ -P Copy the host's pacman config to the target
-U Use pacman -U to install packages
-h Print this help message
@@ -47,13 +52,13 @@
exit $(( $# ? 0 : 1 ))
fi
-while getopts ':C:cdGiKMNU' flag; do
+while getopts ':C:cDGiKMNPU' flag; do
case $flag in
C)
pacman_config=$OPTARG
;;
- d)
- # retired flag. does nothing.
+ D)
+ pacman_args+=(-dd)
;;
c)
hostcache=1
@@ -74,6 +79,9 @@
setup=unshare_setup
unshare=1
;;
+ P)
+ copyconf=1
+ ;;
U)
pacmode=-U
;;
@@ -89,7 +97,7 @@
(( $# )) || die "No root directory specified"
newroot=$1; shift
-pacman_args=("${@:-base}")
+pacman_args+=("$pacmode" "${@:-base}" --config="$pacman_config")
if (( ! hostcache )); then
pacman_args+=(--cachedir="$newroot/var/cache/pacman/pkg")
@@ -99,10 +107,6 @@
pacman_args+=(--noconfirm)
fi
-if [[ $pacman_config ]]; then
- pacman_args+=(--config="$pacman_config")
-fi
-
[[ -d $newroot ]] || die "%s is not a directory" "$newroot"
pacstrap() {
@@ -127,7 +131,7 @@
fi
msg 'Installing packages to %s' "$newroot"
- if ! $pid_unshare pacman -r "$newroot" $pacmode "${pacman_args[@]}"; then
+ if ! $pid_unshare pacman -r "$newroot" "${pacman_args[@]}"; then
die 'Failed to install packages to new root'
fi
@@ -135,6 +139,10 @@
# install the host's mirrorlist onto the new root
cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/"
fi
+
+ if (( copyconf )); then
+ cp -a "$pacman_config" "$newroot/etc/pacman.conf"
+ fi
}
if (( unshare )); then
