From 9411b55de61e09d5add4c0cbb4738b073b6dbf3f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 15 Jan 2018 10:56:42 +0100 Subject: [PATCH 1/2] remove obsolete client to have different keyboard in update and on disk (related to bsc#1075828) --- package/yast2-update.spec | 1 - src/Makefile.am | 1 - src/clients/rootpart_check_keyboard.rb | 53 -------------------------- src/modules/RootPart.rb | 10 ----- 4 files changed, 65 deletions(-) delete mode 100644 src/clients/rootpart_check_keyboard.rb diff --git a/package/yast2-update.spec b/package/yast2-update.spec index 25b389c2..a9178cfa 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -113,7 +113,6 @@ Use this component if you wish to update your system. %{yast_clientdir}/backup_proposal.rb %{yast_clientdir}/inst_update_partition.rb %{yast_clientdir}/inst_update_partition_auto.rb -%{yast_clientdir}/rootpart_check_keyboard.rb %dir %{yast_yncludedir} %{yast_yncludedir}/update diff --git a/src/Makefile.am b/src/Makefile.am index 430fa505..78048e43 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,6 @@ client_DATA = \ clients/rootpart_proposal.rb \ clients/update.rb \ clients/inst_update_partition.rb \ - clients/rootpart_check_keyboard.rb \ clients/packages_proposal.rb \ clients/update_proposal.rb \ clients/inst_backup.rb \ diff --git a/src/clients/rootpart_check_keyboard.rb b/src/clients/rootpart_check_keyboard.rb deleted file mode 100644 index 8c6885d7..00000000 --- a/src/clients/rootpart_check_keyboard.rb +++ /dev/null @@ -1,53 +0,0 @@ -# encoding: utf-8 - -# ------------------------------------------------------------------------------ -# Copyright (c) 2006-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. -# ------------------------------------------------------------------------------ - -# Module: rootpart_check_keyboard.ycp -# -# Author: Lukas Ocilka -# -# Purpose: Break build-requires, used only in inst-sys -# -# $Id$ -module Yast - class RootpartCheckKeyboardClient < Client - def main - textdomain "update" - - Yast.import "Keyboard" - Yast.import "GetInstArgs" - Yast.import "Installation" - - @argmap = GetInstArgs.argmap - Builtins.y2milestone("Script args: %1", @argmap) - @destdir = Ops.get_string(@argmap, "destdir", Installation.destdir) - - Builtins.y2milestone( - "Checking keyboard in system mounted to %1", - @destdir - ) - Keyboard.CheckKeyboardDuringUpdate(@destdir) - - true - end - end -end - -Yast::RootpartCheckKeyboardClient.new.main diff --git a/src/modules/RootPart.rb b/src/modules/RootPart.rb index 63d5e12e..0ddb4ae6 100644 --- a/src/modules/RootPart.rb +++ b/src/modules/RootPart.rb @@ -1608,16 +1608,6 @@ def MountPartitions(root_device_current) ret_bool = nil == FsckAndMount("/", root_device_current, "") if !Mode.test if ret_bool - # read the keyboard settings now, so that it used when - # typing passwords for encrypted partitions - # Calling a script because otherwise this module would depend on yast2-country - if Stage.initial - WFM.call( - "rootpart_check_keyboard", - [{ "destdir" => Installation.destdir }] - ) - end - fstab_ref = arg_ref(fstab) crtab_ref = arg_ref(crtab) read_fstab_and_cryptotab(fstab_ref, crtab_ref, root_device_current) From 208562d677448c5b93f7a26099687cfa3e2176f2 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 15 Jan 2018 10:57:53 +0100 Subject: [PATCH 2/2] Changes --- package/yast2-update.changes | 8 ++++++++ package/yast2-update.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-update.changes b/package/yast2-update.changes index 255d2ee6..08b66e28 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jan 15 09:56:47 UTC 2018 - jreidinger@suse.com + +- remove obsolete rootpart_check_keyboard client that allows having + different keyboard in update env and on target disk (related to + bsc#1075828) +- 4.0.6 + ------------------------------------------------------------------- Tue Jan 9 07:09:57 UTC 2018 - ancor@suse.com diff --git a/package/yast2-update.spec b/package/yast2-update.spec index a9178cfa..fc1b3f81 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.0.5 +Version: 4.0.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build