Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2020-10-06 17:08:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Tue Oct 6 17:08:54 2020 rev:116 rq:839765 version:16.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2020-09-27 11:48:28.435959249 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new.4249/installation-images.changes
2020-10-06 17:10:41.481505568 +0200
@@ -1,0 +2,21 @@
+Tue Oct 6 10:17:39 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#428
+- include all of xorg-x11-server
+- 16.22
+
+--------------------------------------------------------------------
+Tue Oct 6 08:55:07 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#427
+- ensure /proc is mounted in chroot environments (bsc#1176972)
+- 16.21
+
+--------------------------------------------------------------------
+Thu Oct 1 11:16:25 UTC 2020 - [email protected]
+
+- merge gh#openSUSE/installation-images#426
+- Extra yast module for common criteria (boo#1176982)
+- 16.20
+
+--------------------------------------------------------------------
@@ -12500,0 +12522 @@
+
Old:
----
installation-images-16.19.tar.xz
New:
----
installation-images-16.22.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.UkuxTX/_old 2020-10-06 17:10:42.365506332 +0200
+++ /var/tmp/diff_new_pack.UkuxTX/_new 2020-10-06 17:10:42.369506335 +0200
@@ -646,7 +646,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 16.19
+Version: 16.22
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-16.19.tar.xz -> installation-images-16.22.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.19/VERSION
new/installation-images-16.22/VERSION
--- old/installation-images-16.19/VERSION 2020-09-25 12:10:32.000000000
+0200
+++ new/installation-images-16.22/VERSION 2020-10-06 12:17:39.000000000
+0200
@@ -1 +1 @@
-16.19
+16.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.19/changelog
new/installation-images-16.22/changelog
--- old/installation-images-16.19/changelog 2020-09-25 12:10:32.000000000
+0200
+++ new/installation-images-16.22/changelog 2020-10-06 12:17:39.000000000
+0200
@@ -1,3 +1,15 @@
+2020-10-06: 16.22
+ - merge gh#openSUSE/installation-images#428
+ - include all of xorg-x11-server
+
+2020-10-06: 16.21
+ - merge gh#openSUSE/installation-images#427
+ - ensure /proc is mounted in chroot environments (bsc#1176972)
+
+2020-10-01: 16.20
+ - merge gh#openSUSE/installation-images#426
+ - Extra yast module for common critiera (boo#1176982)
+
2020-09-25: 16.19
- merge gh#openSUSE/installation-images#424
- adjust to openssh package split
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.19/data/root/root.file_list
new/installation-images-16.22/data/root/root.file_list
--- old/installation-images-16.19/data/root/root.file_list 2020-09-25
12:10:32.000000000 +0200
+++ new/installation-images-16.22/data/root/root.file_list 2020-10-06
12:17:39.000000000 +0200
@@ -294,6 +294,7 @@
?system-role-common-criteria: nodeps
/usr/share/YaST2/lib/y2system_role_handlers/cc_role_finish.rb
+ /usr/share/YaST2/clients/inst_cc_mode.rb
yast2:
/etc
@@ -453,9 +454,7 @@
if arch ne 's390' && arch ne 's390x'
xorg-x11-server:
- /etc/X11/xorg.conf.d
- /usr/bin/Xorg
- /usr/<lib>/xorg/modules
+ /
# avoid update-alternatives
e [ -f usr/<lib>/xorg/modules/extensions/xorg/xorg-libglx.so ] && ln -snf
xorg/xorg-libglx.so usr/<lib>/xorg/modules/extensions/libglx.so ; true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.19/lib/AddFiles.pm
new/installation-images-16.22/lib/AddFiles.pm
--- old/installation-images-16.19/lib/AddFiles.pm 2020-09-25
12:10:32.000000000 +0200
+++ new/installation-images-16.22/lib/AddFiles.pm 2020-10-06
12:17:39.000000000 +0200
@@ -69,6 +69,8 @@
sub rpm_has_file;
sub fixup_re;
sub replace_config_var;
+sub mount_proc_and_stuff;
+sub umount_proc_and_stuff;
my $ignore;
my $src_line;
@@ -76,6 +78,7 @@
my $used_packs;
my $dangling_links;
my $dir;
+my $mount_proc_state; # cf. (u)mount_proc_and_stuff functions
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -760,26 +763,24 @@
if($e eq 'e') {
SUSystem "mv $dir $basedir/base/xxxx" and die "oops";
+
+ # cf. bsc#1176972
+ mount_proc_and_stuff("$basedir/base");
+
if($is_script) {
$r = SUSystem "chroot $basedir/base /bin/sh -c 'cd xxxx ; sh
install/inst.sh 1'";
}
else {
$r = SUSystem "chroot $basedir/base /bin/sh -c 'cd xxxx ; $cmd'";
}
+
+ umount_proc_and_stuff("$basedir/base");
+
SUSystem "mv $basedir/base/xxxx $dir" and die "oops";
}
else {
- # Set up /proc and /dev/fd if they are missing as a number of tools
- # rely on these (bsc#1160594).
-
- my $has_proc = -d "$dir/proc";
- my $has_dev = -d "$dir/dev";
- my $has_dev_fd = -e "$dir/dev/fd";
-
- SUSystem("mkdir $dir/dev") if !$has_dev;
- SUSystem("ln -s /proc/self/fd $dir/dev/fd") if !$has_dev_fd;
- SUSystem("mkdir $dir/proc") if !$has_proc;
- SUSystem("mount -oro -t proc proc $dir/proc");
+ # cf. bsc#1160594
+ mount_proc_and_stuff($dir);
if($is_script) {
$r = SUSystem "chroot $dir /bin/sh -c 'sh install/inst.sh 1'";
@@ -788,10 +789,7 @@
$r = SUSystem "chroot $dir /bin/sh -c '$cmd'";
}
- SUSystem("umount $dir/proc");
- SUSystem("rmdir $dir/proc") if !$has_proc;
- SUSystem("rm $dir/dev/fd") if !$has_dev_fd;
- SUSystem("rmdir $dir/dev") if !$has_dev;
+ umount_proc_and_stuff($dir);
}
warn "$Script: execution of $pm failed" if $r;
@@ -998,4 +996,64 @@
return "<$name>";
}
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set up /proc and /dev/fd in directory dir if they are missing as a number
+# of tools rely on these (bsc#1160594, bsc#1176972).
+#
+# This is necessary when you plan to chroot into this directory and run
+# commands there.
+#
+# Each call to mount_proc_and_stuff must be undone by calling
+# umount_proc_and_stuff for the same directory.
+#
+# mount_proc_and_stuff(dir)
+#
+sub mount_proc_and_stuff
+{
+ my $dir = $_[0];
+
+ # no stacking or fancy stuff
+ return if $mount_proc_state->{$dir};
+
+ # remember current situation
+ $mount_proc_state->{$dir}{proc} = -d "$dir/proc";
+ $mount_proc_state->{$dir}{dev} = -d "$dir/dev";
+ $mount_proc_state->{$dir}{fd} = -e "$dir/dev/fd";
+
+ # create missing parts
+ SUSystem("mkdir $dir/dev") if !$mount_proc_state->{$dir}{dev};
+ SUSystem("ln -s /proc/self/fd $dir/dev/fd") if
!$mount_proc_state->{$dir}{fd};
+ SUSystem("mkdir $dir/proc") if !$mount_proc_state->{$dir}{proc};
+
+ # mount proc fs
+ SUSystem("mount -oro -t proc proc $dir/proc");
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Undo whatever mount_proc_and_stuff might have done.
+#
+# Each call to mount_proc_and_stuff() must be undone by calling
+# umount_proc_and_stuff for the same directory.
+#
+# umount_proc_and_stuff(dir)
+#
+sub umount_proc_and_stuff
+{
+ my $dir = $_[0];
+
+ return if !$mount_proc_state->{$dir};
+
+ # umount proc fs
+ SUSystem("umount $dir/proc");
+
+ # remove added parts
+ SUSystem("rmdir $dir/proc") if !$mount_proc_state->{$dir}{proc};
+ SUSystem("rm $dir/dev/fd") if !$mount_proc_state->{$dir}{fd};
+ SUSystem("rmdir $dir/dev") if !$mount_proc_state->{$dir}{dev};
+
+ delete $mount_proc_state->{$dir};
+}
+
1;
