Hello community, here is the log from the commit of package installation-images-openSUSE for openSUSE:Factory checked in at 2014-04-26 11:45:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old) and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes 2014-04-15 07:35:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes 2014-04-26 11:45:22.000000000 +0200 @@ -1,0 +2,34 @@ +Fri Apr 25 12:58:44 CEST 2014 - snwint@suse.de + +- handle SUSEConnect, add var/lock symlink +- 14.81 + +------------------------------------------------------------------- +Fri Apr 25 10:20:25 CEST 2014 - snwint@suse.de + +- add tar to initrd +- added virtio_scsi to ppc modules (bnc #874681) +- add xz to initrd +- remove /etc/os-release +- root.file_list: ignore zypper, add optional skelcd-control-SLES-for-VMware +- ignore zypper, add optional skelcd-control-SLES-for-VMware +- 14.80 + +------------------------------------------------------------------- +Tue Apr 22 10:35:17 CEST 2014 - snwint@suse.de + +- log wickedd output +- added --stop options to service_start script (bnc #873057) +- patch file removed: sysvinit.diff + +------------------------------------------------------------------- +Mon Apr 21 09:13:17 UTC 2014 - coolo@suse.com + +- sysvinit no longer required: sysvinit.diff + +------------------------------------------------------------------- +Tue Apr 15 14:38:14 CEST 2014 - snwint@suse.de + +- add rpc user (bnc #873173) + +------------------------------------------------------------------- Old: ---- installation-images-14.77.tar.bz2 New: ---- installation-images-14.81.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.zRkl94/_old 2014-04-26 11:45:23.000000000 +0200 +++ /var/tmp/diff_new_pack.zRkl94/_new 2014-04-26 11:45:23.000000000 +0200 @@ -45,6 +45,7 @@ BuildRequires: openSUSE-release BuildRequires: openSUSE-release-mini %endif +BuildRequires: sysvinit-tools BuildRequires: haveged BuildRequires: raleway-fonts BuildRequires: kdump @@ -205,7 +206,6 @@ BuildRequires: strace BuildRequires: syslogd BuildRequires: systemd-sysvinit -BuildRequires: sysvinit BuildRequires: tcpd-devel BuildRequires: telnet BuildRequires: telnet-server @@ -356,10 +356,10 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.77 +Version: 14.81 Release: 0 Provides: installation-images = %version-%release -Source: installation-images-14.77.tar.bz2 +Source: installation-images-14.81.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio ++++++ installation-images-14.77.tar.bz2 -> installation-images-14.81.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/VERSION new/installation-images-14.81/VERSION --- old/installation-images-14.77/VERSION 2014-04-14 14:59:03.000000000 +0200 +++ new/installation-images-14.81/VERSION 2014-04-25 12:58:34.000000000 +0200 @@ -1 +1 @@ -14.77 +14.81 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/changelog new/installation-images-14.81/changelog --- old/installation-images-14.77/changelog 2014-04-14 14:59:08.000000000 +0200 +++ new/installation-images-14.81/changelog 2014-04-25 12:58:38.000000000 +0200 @@ -1,4 +1,25 @@ -2014-04-14: HEAD +2014-04-25: HEAD + - handle SUSEConnect, add var/lock symlink + +2014-04-24: 14.80 + - add tar to initrd + - added virtio_scsi to ppc modules (bnc #874681) + - add xz to initrd + - Merge branch 'master' of github.com:openSUSE/installation-images + - remove /etc/os-release + - Merge pull request #13 from lslezak/ignore_zypper + - root.file_list: ignore zypper, add optional skelcd-control-SLES-for-VMware + - ignore zypper, add optional skelcd-control-SLES-for-VMware + +2014-04-22: 14.79 + - log wickedd output + - sysvinit is no more + - added --stop options to service_start script (bnc #873057) + +2014-04-15: 14.78 + - add rpc user + +2014-04-14: 14.77 - deal with unnecessary links to /usr/sbin/service 2014-04-08: 14.76 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/initrd/initrd.file_list new/installation-images-14.81/data/initrd/initrd.file_list --- old/installation-images-14.77/data/initrd/initrd.file_list 2014-04-07 10:09:04.000000000 +0200 +++ new/installation-images-14.81/data/initrd/initrd.file_list 2014-04-25 11:46:58.000000000 +0200 @@ -3,7 +3,7 @@ d var/run var/spool var/run/libstorage var/tmp var/log/YaST2 var/adm/mount d var/lib/YaST2 var/lib/hardware/unique-keys var/lib/autoinstall d var/run/hotplug var/cache/fontconfig -d var/lib/sshd var/lib/empty var/run/ntp var/lib/rpcbind +d var/lib/sshd var/lib/empty var/run/ntp d var/cache/sax/files var/cache/sax/sysp/rdbms var/cache/xfine var/cache/zypp var/lib/sax d etc/sysconfig d etc/sysconfig/hardware @@ -83,7 +83,6 @@ openssl: ignore permissions: ignore pinentry: ignore -rpcbind: ignore ?suspend: ignore update-alternatives: ignore ?dracut: ignore @@ -115,6 +114,7 @@ sysconfig-netconfig: sg3_utils: systemd-presets-branding-<base_theme>: +tar: if arch eq 'aarch64' qemu-linux-aarch64: @@ -311,6 +311,9 @@ /usr/bin/gzip /usr/bin/gunzip +xz: + /usr/bin/xz + gawk: /usr/bin/gawk s gawk usr/bin/awk @@ -376,8 +379,8 @@ filesystem: /var/spool/locks - /var/lock /run + s /run/lock /var/lock # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -418,6 +421,11 @@ nscd: E prein +# we just want the user & group entries +rpcbind: + /var/lib + E prein + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # @@ -507,6 +515,18 @@ endif +# certificates are prepared in base.file_list +# here we ust copy the files from there +# the packages are listed here just so they show up in the package list later +ca-certificates: nodeps + # do nothing + t tmp + +ca-certificates-mozilla: nodeps + # copy ssl certificates + e cp -a /etc/ssl etc + e cp -a /var/lib/ca-certificates var/lib + : include theme.file_list @@ -524,10 +544,6 @@ # historical static device nodes x devz /devz -# copy ssl certificates -e cp -a /etc/ssl etc -e cp -a /var/lib/ca-certificates var/lib - # mtab is symlink now r /etc/mtab s /proc/self/mounts /etc/mtab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/initrd/scripts/early_setup new/installation-images-14.81/data/initrd/scripts/early_setup --- old/installation-images-14.77/data/initrd/scripts/early_setup 2014-01-24 11:37:10.000000000 +0100 +++ new/installation-images-14.81/data/initrd/scripts/early_setup 2014-04-17 11:29:39.000000000 +0200 @@ -32,7 +32,9 @@ if [ -x usr/sbin/wickedd ] ; then echo "Starting wicked" - /usr/sbin/wickedd - for i in /usr/lib/wicked/bin/wickedd-* ; do $i ; done + { + /usr/sbin/wickedd + for i in /usr/lib/wicked/bin/wickedd-* ; do $i ; done + } >/var/log/wickedd.log 2>&1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/initrd/service_start new/installation-images-14.81/data/initrd/service_start --- old/installation-images-14.77/data/initrd/service_start 2014-03-28 13:21:42.000000000 +0100 +++ new/installation-images-14.81/data/initrd/service_start 2014-04-16 13:37:26.000000000 +0200 @@ -6,9 +6,11 @@ sub usage; my $opt_show; +my $opt_stop; GetOptions( 'show' => \$opt_show, + 'stop' => \$opt_stop, 'help' => sub { usage 0 }, ) || usage 1; @@ -42,14 +44,25 @@ for (@todo) { $cmd .= ". $_\n" if s/^EnvironmentFile=[\-@]*// } for (@todo) { $cmd .= "export $1\n" if /^Environment=(.+)/ } -for (@todo) { $cmd .= "$_\n" if s/^ExecStartPre=[\-@]*// } -for (@todo) { $cmd .= "$_$suffix\n" if s/^ExecStart=[\-@]*// } +if($opt_stop) { + for (@todo) { $cmd .= "$_\n" if s/^ExecStop=[\-@]*// } + for (@todo) { $cmd .= "$_\n" if s/^ExecStopPost=[\-@]*// } +} +else { + for (@todo) { $cmd .= "$_\n" if s/^ExecStartPre=[\-@]*// } + for (@todo) { $cmd .= "$_$suffix\n" if s/^ExecStart=[\-@]*// } + for (@todo) { $cmd .= "$_\n" if s/^ExecStartPost=[\-@]*// } +} if($opt_show) { print $cmd; } else { - open $f, "| /bin/sh >/var/log/service_start.log 2>&1"; + if(open $f, ">>/var/log/service_start.log") { + print $f "=== $service " . ($opt_stop ? "stop" : "start") . " ===\n"; + close $f; + } + open $f, "| /bin/sh >>/var/log/service_start.log 2>&1"; print $f $cmd; exit $? >> 8 if !close $f; } @@ -63,11 +76,15 @@ sub usage { print <<"= = = = = = = ="; -Usage: service_start SERVICE -Start systemd service SERVICE. +Usage: service_start [OPTIONS] SERVICE +Start or stop systemd service SERVICE. + +Note: this is a simplified tool that may or may not work for a particular +service. Options: - --show Don't run service but show necessary commands. + --stop Stop service. + --show Don't start/stop service but show necessary commands. --help Write this help text. = = = = = = = = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/data/root/root.file_list new/installation-images-14.81/data/root/root.file_list --- old/installation-images-14.77/data/root/root.file_list 2014-04-08 13:26:50.000000000 +0200 +++ new/installation-images-14.81/data/root/root.file_list 2014-04-25 11:58:21.000000000 +0200 @@ -24,6 +24,11 @@ r /usr/bin/ld s ld.bfd /usr/bin/ld +TEMPLATE SUSEConnect: + / + # avoid update-alternatives + s SUSEConnect-0.0.14 /usr/bin/SUSEConnect + TEMPLATE rubygem-.*: /usr/*/ruby/gems/*/gems/*/lib /usr/*/ruby/gems/*/specifications @@ -74,6 +79,11 @@ ?dracut: ignore ?mkinitrd: ignore yast2-schema: ignore +# handle yast2-registration -> suse-connect -> zypper dependency, +# yast does not need zypper, just suse-connect, so ignore it +?zypper: ignore +# already in initrd +ca-certificates-mozilla: ignore if arch eq 'aarch64' qemu-linux-aarch64: @@ -142,8 +152,6 @@ systemd-presets-branding-<base_theme>: systemd-sysvinit: systemd: -sysvinit: -tar: usbutils: util-linux: vim: @@ -166,6 +174,7 @@ # pull in yast2 installation related packages via package deps ?skelcd-control-openSUSE: ?skelcd-control-SLES: +?skelcd-control-SLES-for-VMware: ?skelcd-control-SLED: rpm: @@ -594,6 +603,9 @@ # remove these, we don't want them symlinked r root mnt tmp proc usr/libexec +# remove /etc/os-release so it's not used accidentally +r /etc/os-release + x /usr/lib/YaST/.Reh /usr/lib/YaST2 x etc/inst_setup /sbin/inst_setup x etc/adddir /sbin/adddir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/etc/module.config new/installation-images-14.81/etc/module.config --- old/installation-images-14.77/etc/module.config 2014-04-04 15:22:52.000000000 +0200 +++ new/installation-images-14.81/etc/module.config 2014-04-23 17:12:57.000000000 +0200 @@ -385,6 +385,7 @@ [ppc] +virtio_scsi rsxx rtas_flash,"rtas_flash" mii,"-MII interface library",- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.77/lib/AddFiles.pm new/installation-images-14.81/lib/AddFiles.pm --- old/installation-images-14.77/lib/AddFiles.pm 2014-02-18 08:51:26.000000000 +0100 +++ new/installation-images-14.81/lib/AddFiles.pm 2014-04-25 11:13:23.000000000 +0200 @@ -559,7 +559,7 @@ warn "$Script: failed to link $1 to $2"; } elsif(/^s\s+(\S+)\s+(\S+)$/) { - SUSystem "ln -s $1 $dir/$2" and + SUSystem "ln -sf $1 $dir/$2" and warn "$Script: failed to symlink $1 to $2"; } elsif(/^m\s+(\S+)\s+(\S+)$/) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org