Hello community,
here is the log from the commit of package yast2-firstboot for openSUSE:Factory
checked in at 2020-01-17 16:03:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-firstboot (Old)
and /work/SRC/openSUSE:Factory/.yast2-firstboot.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firstboot"
Fri Jan 17 16:03:10 2020 rev:86 rq:764913 version:4.2.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-firstboot/yast2-firstboot.changes
2020-01-04 19:20:36.993117971 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-firstboot.new.26092/yast2-firstboot.changes
2020-01-17 16:03:15.880379801 +0100
@@ -1,0 +2,22 @@
+Tue Jan 14 11:02:28 UTC 2020 - Ludwig Nussel <[email protected]>
+
+- Don't use deprecated Progress.on
+- Don't allow to go back in congratulate screen
+- Don't try to set keyboard in WSL
+- 4.2.9
+
+-------------------------------------------------------------------
+Tue Jan 14 08:24:30 UTC 2020 - Josef Reidinger <[email protected]>
+
+- drop starting of hal as it is also obsolete and no longer exist
+ (jsc#SLE-10976)
+- 4.2.8
+
+-------------------------------------------------------------------
+Mon Jan 13 09:59:21 UTC 2020 - Josef Reidinger <[email protected]>
+
+- drop deprecated network technologies (jsc#SLE-7753)
+- replace rc* and init.d usage by systemd (jsc#SLE-10976)
+- 4.2.7
+
+-------------------------------------------------------------------
Old:
----
yast2-firstboot-4.2.6.tar.bz2
New:
----
yast2-firstboot-4.2.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-firstboot.spec ++++++
--- /var/tmp/diff_new_pack.oUAxNv/_old 2020-01-17 16:03:17.708380665 +0100
+++ /var/tmp/diff_new_pack.oUAxNv/_new 2020-01-17 16:03:17.708380665 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-firstboot
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-firstboot
-Version: 4.2.6
+Version: 4.2.8
Release: 0
Summary: YaST2 - Initial System Configuration
License: GPL-2.0-only
++++++ yast2-firstboot-4.2.6.tar.bz2 -> yast2-firstboot-4.2.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.2.6/control/firstboot.xml
new/yast2-firstboot-4.2.8/control/firstboot.xml
--- old/yast2-firstboot-4.2.6/control/firstboot.xml 2019-12-18
16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/control/firstboot.xml 2020-01-16
10:45:57.000000000 +0100
@@ -157,6 +157,8 @@
<module>
<label>Finish Setup</label>
<name>inst_congratulate</name>
+ <enable_back>no</enable_back>
+ <enable_next>no</enable_next>
</module>
</modules>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.2.6/package/yast2-firstboot.changes
new/yast2-firstboot-4.2.8/package/yast2-firstboot.changes
--- old/yast2-firstboot-4.2.6/package/yast2-firstboot.changes 2019-12-18
16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/package/yast2-firstboot.changes 2020-01-16
10:45:57.000000000 +0100
@@ -1,4 +1,26 @@
-------------------------------------------------------------------
+Tue Jan 14 11:02:28 UTC 2020 - Ludwig Nussel <[email protected]>
+
+- Don't use deprecated Progress.on
+- Don't allow to go back in congratulate screen
+- Don't try to set keyboard in WSL
+- 4.2.9
+
+-------------------------------------------------------------------
+Tue Jan 14 08:24:30 UTC 2020 - Josef Reidinger <[email protected]>
+
+- drop starting of hal as it is also obsolete and no longer exist
+ (jsc#SLE-10976)
+- 4.2.8
+
+-------------------------------------------------------------------
+Mon Jan 13 09:59:21 UTC 2020 - Josef Reidinger <[email protected]>
+
+- drop deprecated network technologies (jsc#SLE-7753)
+- replace rc* and init.d usage by systemd (jsc#SLE-10976)
+- 4.2.7
+
+-------------------------------------------------------------------
Wed Dec 18 15:42:53 UTC 2019 - Ancor Gonzalez Sosa <[email protected]>
- Replace outdated "SuSE" spelling (bsc#970809).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.2.6/package/yast2-firstboot.spec
new/yast2-firstboot-4.2.8/package/yast2-firstboot.spec
--- old/yast2-firstboot-4.2.6/package/yast2-firstboot.spec 2019-12-18
16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/package/yast2-firstboot.spec 2020-01-16
10:45:57.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: yast2-firstboot
-Version: 4.2.6
+Version: 4.2.8
Release: 0
Summary: YaST2 - Initial System Configuration
Group: System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.2.6/scripts/Firstboot-Stage/S02-logging
new/yast2-firstboot-4.2.8/scripts/Firstboot-Stage/S02-logging
--- old/yast2-firstboot-4.2.6/scripts/Firstboot-Stage/S02-logging
2019-12-18 16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/scripts/Firstboot-Stage/S02-logging
2020-01-16 10:45:57.000000000 +0100
@@ -5,9 +5,7 @@
#=============================================
# 3) start syslog daemon
#---------------------------------------------
-if [ -x /etc/init.d/syslog ];then
- /etc/init.d/syslog start
-fi
+/usr/bin/systemctl start syslog.socket
#=============================================
# 3.1) set debug and logging options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.2.6/scripts/Firstboot-Stage/S06-services
new/yast2-firstboot-4.2.8/scripts/Firstboot-Stage/S06-services
--- old/yast2-firstboot-4.2.6/scripts/Firstboot-Stage/S06-services
2019-12-18 16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/scripts/Firstboot-Stage/S06-services
2020-01-16 10:45:57.000000000 +0100
@@ -2,53 +2,3 @@
log "Starting S06-services..."
log "========================"
-#=============================================
-# 9) start services
-#---------------------------------------------
-if [ -x /sbin/rcpcmcia ] ; then
-if [ -r /etc/sysconfig/pcmcia ];then
- # /.../
- # To start the pcmcia subsystem we need to set the following
- # variables within /etc/sysconfig/pcmcia file
- # ---
- TMP=`/bin/mktemp /tmp/sysconfig.pcmcia.XXXXXX`
- ISI=/etc/install.inf
- RCC=/etc/sysconfig/pcmcia
- cp $RCC $TMP
- CORE=`sed -n "/^options/s/^.*pcmcia_core //p" $ISI`
- PCIC=`sed -n "/^options/s/^.*\(i82365\|tcic\) //p" $ISI`
- sed -e "/^PCMCIA_CORE_OPTS/s/=.*$/=\"$CORE\"/" \
- -e "/^PCMCIA_PCIC_OPTS/s/=.*$/=\"$PCIC\"/" $TMP > $RCC
- rm $TMP
- # /.../
- # It does not matter whether pcmcia is already active or not because:
- # 1) loading an already loaded module does not harm
- # 2) the cardmgr is already dead. cardmgr was the same binary as
linuxrc.
- # 3) there is no configuration info in network.opts, so eth0 will stay
- # completely untouched and its state is "up"
- # ---
- # We are safe to start the subsystem now
- # ---
- if grep -qs '^PCMCIA:' /etc/install.inf ; then
- log "\tStarting PCMCIA service..."
- log "\tUsing following PCMCIA configuration:"
- IFS="
- "
- while read line;do
- log "\t$line"
- done < $RCC
- rcpcmcia start
- fi
-fi
-fi
-
-#=============================================
-# 9.1) start hald
-#---------------------------------------------
-if [ -x /usr/sbin/rchal ] ; then
- test -f /usr/sbin/rcdbus && /usr/sbin/rcdbus start
- test -f /usr/sbin/rcacpid && /usr/sbin/rcacpid start
- test -f /usr/sbin/rchal && /usr/sbin/rchal start
-fi
-
-sleep 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.2.6/scripts/Firstboot-Stage/S09-cleanup
new/yast2-firstboot-4.2.8/scripts/Firstboot-Stage/S09-cleanup
--- old/yast2-firstboot-4.2.6/scripts/Firstboot-Stage/S09-cleanup
2019-12-18 16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/scripts/Firstboot-Stage/S09-cleanup
2020-01-16 10:45:57.000000000 +0100
@@ -19,27 +19,8 @@
# 13.3) stop network and sshd
if test ! -z "$Y2_NETWORK_ACTIVE" ; then
log "\tShutdown SSH daemon and network interfaces..."
- test -z "$Y2_SSH_ACTIVE" && rcsshd stop
- rcnetwork stop
-fi
-# 13.4) stop pcmcia service
-if [ -x /sbin/rcpcmcia ] ; then
-if rcpcmcia status ; then
- log "\tShutdown PCMCIA services..."
- /sbin/cardctl eject
- /etc/init.d/pcmcia stop
-fi
-fi
-# 13.5) remove network config for pcmcia and usb
-if [ -f "$IFCFG_PCMCIA_SAVE" ] ; then
- mv $IFCFG_PCMCIA_SAVE $IFCFG_PCMCIA
-else
- rm -f $IFCFG_PCMCIA
-fi
-if [ -f "$IFCFG_USB_SAVE" ] ; then
- mv $IFCFG_USB_SAVE $IFCFG_PCMCIA
-else
- rm -f $IFCFG_USB
+ test -z "$Y2_SSH_ACTIVE" && /usr/bin/systemctl stop sshd
+ /usr/bin/systemctl stop network
fi
stop_unicode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.2.6/src/clients/firstboot.rb
new/yast2-firstboot-4.2.8/src/clients/firstboot.rb
--- old/yast2-firstboot-4.2.6/src/clients/firstboot.rb 2019-12-18
16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/src/clients/firstboot.rb 2020-01-16
10:45:57.000000000 +0100
@@ -32,6 +32,7 @@
Yast.import "Pkg"
textdomain "firstboot"
+ Yast.import "Arch"
Yast.import "Directory"
Yast.import "Mode"
Yast.import "Stage"
@@ -59,7 +60,7 @@
# generated yet (the X server started by YaST-Firstboot doesn't seem to
# be enough to trigger the systemd mechanism that generates it), let's
# enforce the keyboard map if we are running in graphic mode (bsc#950335)
- Keyboard.Set(Keyboard.current_kbd)
+ Keyboard.Set(Keyboard.current_kbd) unless Yast::Arch.is_wsl
# initialize package callbacks, since some of the modules run in the
# firstboot workflow expect them to be initialized (bug #335979)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.2.6/src/clients/firstboot_ssh.rb
new/yast2-firstboot-4.2.8/src/clients/firstboot_ssh.rb
--- old/yast2-firstboot-4.2.6/src/clients/firstboot_ssh.rb 2019-12-18
16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/src/clients/firstboot_ssh.rb 2020-01-16
10:45:57.000000000 +0100
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
#
------------------------------------------------------------------------------
# Copyright (c) 2012 Novell, Inc. All Rights Reserved.
#
@@ -19,44 +17,6 @@
# current contact information at www.novell.com.
#
------------------------------------------------------------------------------
-#
-# Module: firstboot_ssh.ycp
-#
-# Author: Jiri Srain <[email protected]>
-#
-# Submodules:
-#
-#
-# Purpose: recreate SSH keys during firstboot run
-#
-#
-#
-# $Id$
-module Yast
- class FirstbootSshClient < Client
- def main
-
- textdomain "firstboot"
-
- Yast.import "GetInstArgs"
-
- return :auto if GetInstArgs.going_back
-
- SCR.Execute(
- path(".target.bash"),
- "\n" +
- "test -x /etc/init.d/sshd || exit 0;\n" +
- "\n" +
- "/etc/init.d/sshd status && export SSHD_IS_RUNNING=1;\n" +
- "\n" +
- "[ $SSHD_IS_RUNNING ] && /etc/init.d/sshd stop;\n" +
- "rm -f /etc/ssh/ssh_host*key*;\n" +
- "[ $SSHD_IS_RUNNING ] && /etc/init.d/sshd start;\n"
- )
-
- :next
- end
- end
-end
+require "y2firstboot/clients/firstboot_ssh"
-Yast::FirstbootSshClient.new.main
+Y2Firstboot::Clients::FirstbootSSH.new.run
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-firstboot-4.2.6/src/clients/firstboot_write.rb
new/yast2-firstboot-4.2.8/src/clients/firstboot_write.rb
--- old/yast2-firstboot-4.2.6/src/clients/firstboot_write.rb 2019-12-18
16:57:46.000000000 +0100
+++ new/yast2-firstboot-4.2.8/src/clients/firstboot_write.rb 2020-01-16
10:45:57.000000000 +0100
@@ -65,7 +65,7 @@
)
- Progress.on
+ @progress_orig = Progress.set(false)
Progress.New(
# Headline for last dialog of first boot workflow
@@ -111,6 +111,8 @@
Builtins.sleep(100)
Progress.Finish
+ Progress.set(@progress_orig)
+
:next
#EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.2.6/src/lib/y2firstboot/clients/firstboot_ssh.rb
new/yast2-firstboot-4.2.8/src/lib/y2firstboot/clients/firstboot_ssh.rb
--- old/yast2-firstboot-4.2.6/src/lib/y2firstboot/clients/firstboot_ssh.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-firstboot-4.2.8/src/lib/y2firstboot/clients/firstboot_ssh.rb
2020-01-16 10:45:57.000000000 +0100
@@ -0,0 +1,46 @@
+#
------------------------------------------------------------------------------
+# Copyright (c) 2012 Novell, Inc. All Rights Reserved.
+#
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail, you may
find
+# current contact information at www.novell.com.
+#
------------------------------------------------------------------------------
+
+Yast.import "GetInstArgs"
+
+require "fileutils"
+require "yast2/systemd/service"
+
+module Y2Firstboot
+ module Clients
+ # class responsible for recreation of ssh keys during first boot run
+ class FirstbootSSH
+ def run
+ return :auto if Yast::GetInstArgs.going_back
+
+ service = Yast2::Systemd::Service.find("sshd")
+ return :next unless service # sshd not installed
+
+ running = service.running?
+ service.stop if running
+ Dir.glob("/etc/ssh/ssh_host*key*") do |file|
+ FileUtils.rm_f(file)
+ end
+ service.start if running
+
+ :next
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-firstboot-4.2.6/test/y2firstboot/clients/firstboot_ssh_test.rb
new/yast2-firstboot-4.2.8/test/y2firstboot/clients/firstboot_ssh_test.rb
--- old/yast2-firstboot-4.2.6/test/y2firstboot/clients/firstboot_ssh_test.rb
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-firstboot-4.2.8/test/y2firstboot/clients/firstboot_ssh_test.rb
2020-01-16 10:45:57.000000000 +0100
@@ -0,0 +1,85 @@
+#!/usr/bin/env rspec
+
+# Copyright (c) [2020] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../test_helper"
+require "y2firstboot/clients/firstboot_ssh"
+
+describe Y2Firstboot::Clients::FirstbootSSH do
+ describe "#run" do
+ context "installation going back" do
+ before do
+ allow(Yast::GetInstArgs).to receive(:going_back).and_return(true)
+ end
+
+ it "returns :auto" do
+ expect(subject.run).to eq :auto
+ end
+ end
+
+ context "sshd is not installed" do
+ before do
+ allow(Yast2::Systemd::Service).to receive(:find).and_return(nil)
+ end
+
+ it "return :next" do
+ expect(subject.run).to eq :next
+ end
+ end
+
+ context "sshd is installed" do
+ before do
+ allow(Yast2::Systemd::Service).to
receive(:find).and_return(sshd_service)
+ end
+
+ context "sshd is not running" do
+ let(:sshd_service) { double(running?: false) }
+
+ it "removes ssh host keys" do
+ expect(Dir).to receive(:glob)
+
+ subject.run
+ end
+ end
+
+ context "sshd is running" do
+ let(:sshd_service) { double(running?: true, stop: true, start: true) }
+
+ it "stops sshd" do
+ expect(sshd_service).to receive(:stop)
+
+ subject.run
+ end
+
+ it "removes ssh host keys" do
+ expect(Dir).to receive(:glob)
+
+ subject.run
+ end
+
+ it "starts sshd again" do
+ expect(sshd_service).to receive(:start)
+
+ subject.run
+ end
+ end
+ end
+ end
+end
