Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2022-01-25 17:35:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Tue Jan 25 17:35:57 2022 rev:156 rq:948997 version:17.38
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2022-01-22 08:18:01.142970516 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.1938/installation-images.changes
2022-01-25 17:37:06.521905158 +0100
@@ -1,0 +2,15 @@
+Tue Jan 25 10:38:14 UTC 2022 - [email protected]
+
+- merge gh#openSUSE/installation-images#569
+- re-add mount.nfs (bsc#1195035)
+- fix locale handling
+- 17.38
+
+--------------------------------------------------------------------
+Mon Jan 24 08:40:00 UTC 2022 - [email protected]
+
+- merge gh#openSUSE/installation-images#568
+- etc: update module.config to match 5.17
+- 17.37
+
+--------------------------------------------------------------------
Old:
----
installation-images-17.36.tar.xz
New:
----
installation-images-17.38.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.6cOTRZ/_old 2022-01-25 17:37:07.237900226 +0100
+++ /var/tmp/diff_new_pack.6cOTRZ/_new 2022-01-25 17:37:07.241900198 +0100
@@ -687,7 +687,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
-Version: 17.36
+Version: 17.38
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-17.36.tar.xz -> installation-images-17.38.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.36/VERSION
new/installation-images-17.38/VERSION
--- old/installation-images-17.36/VERSION 2022-01-21 13:48:41.000000000
+0100
+++ new/installation-images-17.38/VERSION 2022-01-25 11:38:14.000000000
+0100
@@ -1 +1 @@
-17.36
+17.38
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.36/changelog
new/installation-images-17.38/changelog
--- old/installation-images-17.36/changelog 2022-01-21 13:48:41.000000000
+0100
+++ new/installation-images-17.38/changelog 2022-01-25 11:38:14.000000000
+0100
@@ -1,3 +1,12 @@
+2022-01-25: 17.38
+ - merge gh#openSUSE/installation-images#569
+ - re-add mount.nfs (bsc#1195035)
+ - fix locale handling
+
+2022-01-24: 17.37
+ - merge gh#openSUSE/installation-images#568
+ - etc: update module.config to match 5.17
+
2022-01-21: 17.36
- merge gh#openSUSE/installation-images#564
- do not reset standard file descriptors in inst_setup, linuxrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-17.36/data/initrd/initrd.file_list
new/installation-images-17.38/data/initrd/initrd.file_list
--- old/installation-images-17.36/data/initrd/initrd.file_list 2022-01-21
13:48:41.000000000 +0100
+++ new/installation-images-17.38/data/initrd/initrd.file_list 2022-01-25
11:38:14.000000000 +0100
@@ -165,15 +165,7 @@
suse-module-tools:
/etc/modprobe.d
-# XXX: usrmerge
?s390-tools:
- /sbin/zfcp_*_configure
- /sbin/zfcp_san_disc
- /sbin/iucv_configure
- /sbin/ctc_configure
- /sbin/qeth_configure
- /sbin/dasdinfo
- /sbin/chzdev
/usr/sbin/zfcp_*_configure
/usr/sbin/zfcp_san_disc
/usr/sbin/iucv_configure
@@ -194,9 +186,7 @@
/usr/share/kbd/consoletrans/trivial
/usr/share/kbd/consolefonts/default8x16.psfu.gz
-# XXX: usrmerge
cifs-utils:
- /sbin/mount.cifs
/usr/sbin/mount.cifs
?acpica:
@@ -205,11 +195,6 @@
?dmidecode:
/usr/sbin/dmidecode
-# XXX: usrmerge
-?bootsplash:
- /sbin/splash
- /usr/sbin/splash
-
if exists(wpa_supplicant)
wpa_supplicant:
/
@@ -255,9 +240,7 @@
# linuxrc needs it in /bin
m /usr/bin/rm bin
-# XXX: usrmerge
bash:
- /bin/{sh,bash}
/usr/bin/bash
s bash usr/bin/sh
s bash usr/bin/lsh
@@ -266,10 +249,7 @@
/usr/bin/clear
/usr/bin/tset
-# XXX: usrmerge
iproute2:
- /bin/ip
- /sbin/ip
/usr/bin/ip
/usr/sbin/ip
@@ -278,7 +258,6 @@
/etc/iscsi
c 644 0 0 /etc/iscsi/iscsid.conf
-
util-linux:
/usr/sbin/mkswap
/usr/sbin/swapon
@@ -288,14 +267,10 @@
/usr/bin/setsid
/usr/sbin/losetup
/usr/sbin/blkid
+ /usr/sbin/nologin
-# XXX: usrmerge
nfs-client:
- /sbin/mount.nfs
- /sbin/mount.nfs4
- /sbin/umount.nfs
- /sbin/umount.nfs4
- /sbin/mount.nfs
+ /usr/sbin/mount.nfs
/usr/sbin/mount.nfs4
/usr/sbin/umount.nfs
/usr/sbin/umount.nfs4
@@ -312,32 +287,18 @@
?libcryptsetup*-hmac:
?libgcrypt20-hmac:
-# XXX: usrmerge
ntfs-3g:
/
- s mount.ntfs-3g /sbin/mount.ntfs
s mount.ntfs-3g /usr/sbin/mount.ntfs
?kexec-tools: nodeps
/usr/sbin/kexec
-# XXX: usrmerge
-if exists(blog)
- blog:
- /usr/lib*
- /sbin/showconsole
- /usr/sbin/showconsole
+blog:
+ /usr/sbin/showconsole
- sysvinit-tools: nodeps
- /sbin/startproc
- /usr/sbin/startproc
-else
- sysvinit-tools: nodeps
- /sbin/showconsole
- /sbin/startproc
- /usr/sbin/showconsole
- /usr/sbin/startproc
-endif
+sysvinit-tools: nodeps
+ /usr/sbin/startproc
rpm:
/usr/bin/rpm2cpio
@@ -394,30 +355,18 @@
/usr/sbin/useradd.local
d /etc/skel
-# XXX: usrmerge
pam:
- /sbin
/usr/sbin
/etc
/usr/etc
- /lib*/libpam*.so.*
- /lib*/security/pam_group.so
- /lib*/security/pam_unix*.so
- /lib*/security/pam_env.so
- /lib*/security/pam_limits.so
- /lib*/security/pam_umask.so
- /lib*/security/pam_rootok.so
- /lib*/security/pam_permit.so
- /lib*/security/pam_deny.so
/usr/lib*/libpam*.so.*
- /usr/lib*/security/pam_group.so
- /usr/lib*/security/pam_unix*.so
+ /usr/lib*/security/pam_deny.so
/usr/lib*/security/pam_env.so
+ /usr/lib*/security/pam_group.so
/usr/lib*/security/pam_limits.so
- /usr/lib*/security/pam_umask.so
- /usr/lib*/security/pam_rootok.so
/usr/lib*/security/pam_permit.so
- /usr/lib*/security/pam_deny.so
+ /usr/lib*/security/pam_rootok.so
+ /usr/lib*/security/pam_umask.so
if exists(plymouth)
# Do not EVER consider another plymouth theme before ensuring it doesn't
@@ -443,7 +392,6 @@
endif
procps:
- /bin/ps
/usr/bin/ps
# maybe we don't need everything...
@@ -479,13 +427,11 @@
lvm2: nodeps
/etc
-# note: locale files are added in root image
-if exists(glibc-locale-base)
- glibc-locale: ignore
- glibc-locale-base:
-else
- glibc-locale:
-endif
+# note: more locale files are added in root image
+glibc-locale: ignore
+glibc-locale-base:
+ /usr/lib/locale/en_US.utf8
+ s en_US.utf8 usr/lib/locale/C.utf8
# charset encodings we might possibly need
/usr/lib*/gconv/IBM1047.so
/usr/lib*/gconv/ISO8859-1.so
@@ -555,6 +501,7 @@
# we just want the user & group entries
openslp-server:
+ E groupadd -r daemon || true
E prein
# we just want the user & group entries
@@ -571,9 +518,7 @@
valgrind:
/
- # XXX: usrmerge
kbd:
- /bin/kbd_mode
/usr/bin/kbd_mode
strace:
@@ -585,17 +530,13 @@
libpython2_6-1_0:
/usr/lib*
- # XXX: usrmerge
libexpat1:
- /lib*/libexpat.so.*
/usr/lib*/libexpat.so.*
libprocps*:
/
- # XXX: usrmerge
psmisc:
- /bin/fuser
/usr/bin/fuser
/usr/bin/killall
/usr/bin/pstree
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-17.36/data/rescue/rescue.file_list
new/installation-images-17.38/data/rescue/rescue.file_list
--- old/installation-images-17.36/data/rescue/rescue.file_list 2022-01-21
13:48:41.000000000 +0100
+++ new/installation-images-17.38/data/rescue/rescue.file_list 2022-01-25
11:38:14.000000000 +0100
@@ -49,7 +49,7 @@
E prein
E postin
-TEMPLATE wicked|lvm2|syslog-service|util-linux|mdadm:
+TEMPLATE wicked|lvm2|syslog-service|util-linux|mdadm|permissions-config:
/
E postin
@@ -74,6 +74,13 @@
?compat-usrmerge: ignore
?compat-usrmerge-tools: ignore
+glibc:
+bash:
+ /usr/bin/bash
+ s bash usr/bin/sh
+fillup:
+coreutils:
+
AUTODEPS:
dbus-1-x11: ignore
@@ -85,12 +92,6 @@
device-mapper-32bit: ignore
binutils: ignore
-# XXX: usrmerge
-bash:
- /bin/{sh,bash}
- /usr/bin/bash
- s bash usr/bin/sh
-
?acpica:
?efibootmgr:
?elilo:
@@ -119,7 +120,6 @@
bzip2:
checkmedia:
cifs-utils:
-coreutils:
cpio:
cracklib-dict-full:
cracklib:
@@ -135,10 +135,8 @@
?exfatprogs:
file-magic:
file:
-fillup:
findutils:
finger:
-glibc:
gpart:
?gptfdisk:
grep:
@@ -198,6 +196,7 @@
tar:
terminfo-base:
usbutils:
+util-linux:
vim-small:
vlan:
wget:
@@ -225,12 +224,8 @@
/usr/bin/gawk
s gawk usr/bin/awk
-if exists(glibc-locale-base)
- glibc-locale: ignore
- glibc-locale-base:
-else
- glibc-locale:
-endif
+glibc-locale: ignore
+glibc-locale-base:
# charset encodings we might possibly need
/usr/lib*/gconv/IBM1047.so
/usr/lib*/gconv/ISO8859-1.so
@@ -348,7 +343,6 @@
rsync:
syslog-service:
rsyslog:
-util-linux:
wicked:
?dmraid:
mdadm:
@@ -440,9 +434,6 @@
e echo console >>etc/securetty
-# enable sysrq
-e perl -pi -e '\''s/^(ENABLE_SYSRQ=).*/$1"yes"/'\'' etc/sysconfig/sysctl
-
# setup multipath config
x etc/multipath.conf /etc
E systemctl enable multipathd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.36/data/root/root.file_list
new/installation-images-17.38/data/root/root.file_list
--- old/installation-images-17.36/data/root/root.file_list 2022-01-21
13:48:41.000000000 +0100
+++ new/installation-images-17.38/data/root/root.file_list 2022-01-25
11:38:14.000000000 +0100
@@ -65,6 +65,17 @@
e [ -e usr/share/pci.ids ] || ln -s pci.ids.d/pci.ids.dist usr/share/pci.ids
e [ -e usr/share/pci.ids ] || { echo "pci ids missing" ; false ; }
+TEMPLATE ruby\d+\.\d+:
+ /
+ r /usr/bin/rake*
+ r /usr/bin/{y2,}racc*
+ r /usr/bin/rdoc*
+ r /usr/bin/ri*
+ r /usr/bin/bundle*
+ r /usr/bin/rbs*
+ r /usr/bin/typeprof*
+ r /usr/bin/rdbg*
+
TEMPLATE:
/
@@ -214,9 +225,7 @@
# pull in yast2 installation related packages via package deps
skelcd-control-<skelcd_ctrl_theme>:
-# XXX: usrmerge
rpm:
- /bin
/etc
/usr/bin
/usr/lib*
@@ -229,22 +238,17 @@
/usr/bin/gawk
s gawk usr/bin/awk
-# XXX: usrmerge
bash:
- /bin/{sh,bash}
/usr/bin/bash
s bash usr/bin/sh
# Note that this does not make it the default shell /bin/sh,
# only scripts that explicitly want dash will use it,
# so we are safe even if there are undetected bashisms in some scripts.
-# XXX: usrmerge
dash:
- /bin/dash
/usr/bin/dash
nfs-client:
- /sbin/{u,}mount.nfs*
/usr/sbin/{u,}mount.nfs*
/usr/sbin/rpc.statd
/usr/sbin/start-statd
@@ -270,7 +274,6 @@
/usr/bin/{cmp,diff}
less:
- /etc/lesskey
/usr/etc/lesskey
/usr/bin/less
@@ -297,18 +300,6 @@
s /usr/sbin/yast2 /sbin/yast.ssh
ruby:
- /
- r /usr/bin/rake*
- r /usr/bin/{y2,}racc*
- r /usr/bin/rdoc*
- r /usr/bin/ri*
- r /usr/bin/bundle*
- r /usr/bin/rbs*
- r /usr/bin/typeprof*
- r /usr/bin/rdbg*
- /usr/lib64/ruby/*/{racc,rdoc}
- /usr/lib64/ruby/gems/*/gems/{minitest,racc,rake,rdoc,test-unit}-*
- e cd usr/bin ; for i in erb gem irb ruby ; do [ -x $i ] || ln -snf
${i}.ruby2* $i ; done
yast2-devtools:
/usr/share/YaST2/data/devtools/bin/showy2log
@@ -326,9 +317,7 @@
yast2-widget-demo:
if arch eq 'ppc' || arch eq 'ppc64'
- # XXX: usrmerge
pdisk:
- /sbin/pdisk
/usr/sbin/pdisk
hfsutils:
@@ -348,7 +337,6 @@
s hattrib /usr/bin/hvol
endif
-# XXX: usrmerge
sysvinit-tools:
krb5:
@@ -358,16 +346,9 @@
/usr/lib*/libgssapi_krb5.so.*
/usr/lib*/libk5crypto.so.*
-# XXX: usrmerge
pam:
/usr/etc/pam.d
- /etc/pam.d
/etc
- /lib*/security
- /lib*/libpam.so.*
- /lib*/libpam_misc.so.*
- /lib*
- /sbin
/usr/lib*/security
/usr/lib*/libpam.so.*
/usr/lib*/libpam_misc.so.*
@@ -423,12 +404,8 @@
chrony:
# note: gconv files are in initrd
-if exists(glibc-locale-base)
- glibc-locale: ignore
- glibc-locale-base:
-else
- glibc-locale:
-endif
+glibc-locale: ignore
+glibc-locale-base:
# built in base system
d usr/lib
e cp -a /tmp/locale usr/lib
@@ -457,7 +434,7 @@
?xf86-video-vesa:
?virtualbox-guest-x11: nodeps
- /etc
+ /usr/etc
/usr/<lib>/xorg/modules
endif
@@ -576,7 +553,7 @@
/usr/share/fonts/truetype/TSCu_Paranar.ttf
thai-fonts:
- /usr/share/fonts/truetype/Loma*.ttf
+ /usr/share/fonts/opentype/thai/Loma*.otf
khmeros-fonts:
/usr/share/fonts/truetype/KhmerOS_sys.ttf
@@ -592,9 +569,7 @@
/usr/share/icons/DMZ
endif
-# XXX: usrmerge
multipath-tools:
- /sbin
/usr/sbin
graphviz-gnome: nodeps
@@ -683,6 +658,9 @@
e mkfontscale usr/share/fonts/truetype
e mkfontdir usr/share/fonts/truetype
+e mkfontscale usr/share/fonts/opentype
+e mkfontdir usr/share/fonts/opentype
+
# remove /etc/os-release so it's not used accidentally
r /etc/os-release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-17.36/data/root/zenroot.file_list
new/installation-images-17.38/data/root/zenroot.file_list
--- old/installation-images-17.36/data/root/zenroot.file_list 2022-01-21
13:48:41.000000000 +0100
+++ new/installation-images-17.38/data/root/zenroot.file_list 2022-01-25
11:38:14.000000000 +0100
@@ -124,9 +124,7 @@
/usr/lib*/libgssapi_krb5.so.*
/usr/lib*/libk5crypto.so.*
-# XXX: usrmerge
bash:
- /bin/{sh,bash}
/usr/bin/bash
s bash usr/bin/sh
@@ -143,7 +141,6 @@
/usr/bin/tset
less:
- /etc/lesskey
/usr/etc/lesskey
/usr/bin/less
@@ -160,9 +157,7 @@
# remove these:
r root mnt tmp usr/libexec
-# XXX: usrmerge
:
- r /lib*/security/pam_userdb.so
r /usr/lib*/security/pam_userdb.so
x etc/inst_setup_ssh /sbin/
@@ -178,10 +173,8 @@
acpica:
/usr/sbin/acpidump
-# XXX: usrmerge
sysconfig:
- /sbin
- /usr/sbin
+ /
# for modify_resolvconf
d etc/sysconfig/network
e echo MODIFY_RESOLV_CONF_DYNAMICALLY=\"yes\" >etc/sysconfig/network/config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-17.36/etc/module.config
new/installation-images-17.38/etc/module.config
--- old/installation-images-17.36/etc/module.config 2022-01-21
13:48:41.000000000 +0100
+++ new/installation-images-17.38/etc/module.config 2022-01-25
11:38:14.000000000 +0100
@@ -657,6 +657,7 @@
ioc3
ipwireless
iscsi_trgt
+mctp-serial
msdos
netdevsim
parport_ax88796
