Bug 1208612

Summary: Minor fixes - part 2
Product: Red Hat Enterprise Linux 6 Reporter: Frantisek Kluknavsky <fkluknav>
Component: preupgrade-assistant-contentsAssignee: Frantisek Kluknavsky <fkluknav>
Status: CLOSED ERRATA QA Contact: Alois Mahdal <amahdal>
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: 6.6CC: fkluknav, ovasik, phracek, pstodulk, ttomecek
Target Milestone: rcKeywords: Extras
Target Release: ---   
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: Doc Type: Bug Fix
Doc Text:
Story Points: ---
Clone Of:
: 1238806 (view as bug list) Environment:
Last Closed: 2015-07-22 10:36:33 UTC Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:

Description Frantisek Kluknavsky 2015-04-02 16:50:51 UTC
Here is a list of minor fixes in preupgrade-assistant-contents, which probably do not deserve a separate bugzilla for each, but should be properly tracked and tested.

Comment 1 Frantisek Kluknavsky 2015-04-02 16:52:41 UTC
diff --git a/RHEL6_7/desktop/GNOME/gnome.sh b/RHEL6_7/desktop/GNOME/gnome.sh
index 0d8b39d..db85d41 100755
--- a/RHEL6_7/desktop/GNOME/gnome.sh
+++ b/RHEL6_7/desktop/GNOME/gnome.sh
@@ -8,7 +8,7 @@
 
 RESULT="$RESULT_PASS"
 if test -f /usr/share/xsessions/gnome.desktop; then
-       log_extreme_risk "You have GNOME Desktop Environment session as an option in your X11 session manager. GNOME Desktop Environment as a part of the yum group 'Desktop' underwent serious redesign in its user interface as well as und
+       log_high_risk "You have GNOME Desktop Environment session as an option in your X11 session manager. GNOME Desktop Environment as a part of the yum group 'Desktop' underwent serious redesign in its user interface as well as underl
        RESULT="$RESULT_FAIL"
 fi

Comment 2 Frantisek Kluknavsky 2015-04-02 17:09:53 UTC
diff --git a/RHEL6_7/packages/ObsoletedPackages/solution.txt b/RHEL6_7/packages/ObsoletedPackages/solution.txt
index 2f8928a..e69de29 100644
--- a/RHEL6_7/packages/ObsoletedPackages/solution.txt
+++ b/RHEL6_7/packages/ObsoletedPackages/solution.txt
@@ -1 +0,0 @@
-The content detects some services which are disabled by default on Red Hat Enterprise Linux 7 system.

Comment 4 Frantisek Kluknavsky 2015-04-02 17:14:33 UTC
diff --git a/RHEL6_7/services/quota_nld/new_package/checkscript.sh b/RHEL6_7/services/quota_nld/new_package/checkscript.sh
index 1698ab5..651732b 100755
--- a/RHEL6_7/services/quota_nld/new_package/checkscript.sh
+++ b/RHEL6_7/services/quota_nld/new_package/checkscript.sh
@@ -11,12 +11,12 @@ solution 'Quota netlink daemon has been moved from "quota" package into "quota-n
 if service_is_enabled 'quota_nld'; then
     solution '"quota_nld" service is enabled on the old system.'
 
-    mkdir postupgrade.d || exit_error
-    cat <<'EOM' >postupgrade.d/install_package.sh || exit_error
+    mkdir -p $VALUE_TMP_PREUPGRADE/postupgrade.d/quota_nld/ || exit_error
+    cat <<'EOM' >$VALUE_TMP_PREUPGRADE/postupgrade.d/quota_nld/install_package.sh || exit_error
 #/bin/sh
 yum --assumeyes install quota-nld
 EOM
-    chmod +x postupgrade.d/install_package.sh || exit_error
+    chmod +x $VALUE_TMP_PREUPGRADE/postupgrade.d/quota_nld/install_package.sh || exit_error
 
     solution '"quota-nld" package will be installed by a postupgrade scriptlet.'
     solution 'You can reenable "quota_nld" service with "systemctl enable

Comment 5 Frantisek Kluknavsky 2015-04-02 17:14:46 UTC
diff --git a/RHEL6_7/system/initscripts/control/solution.txt b/RHEL6_7/system/initscripts/control/solution.txt
index 685000b..2f8928a 100644
--- a/RHEL6_7/system/initscripts/control/solution.txt
+++ b/RHEL6_7/system/initscripts/control/solution.txt
@@ -1 +1 @@
-The content detects some services who are disabled by default on Red Hat Enterprise Linux 7 system.
+The content detects some services which are disabled by default on Red Hat Enterprise Linux 7 system.

Comment 6 Frantisek Kluknavsky 2015-04-02 17:17:08 UTC
diff --git a/RHEL6_7/system/subscription-manager/subscription-manager.ini b/RHEL6_7/system/subscription-manager/subscription-manager.ini
index 6d24771..582dc06 100644
--- a/RHEL6_7/system/subscription-manager/subscription-manager.ini
+++ b/RHEL6_7/system/subscription-manager/subscription-manager.ini
@@ -1,7 +1,7 @@
 [preupgrade]
-content_title: Red Hat Subscription Manager
-author: Jakub Dornak <jdornak>
+content_title:       Red Hat Subscription Manager
 content_description: This module adds new option to the configuration file, if it is not there already.
-solution: solution.txt
-check_script: check.sh
-applies_to:
+author:              Jakub Dornak <jdornak>
+solution:            solution.txt
+check_script:        check.sh
+applies_to:          subscription-manager

Comment 11 Alois Mahdal 2015-07-17 04:43:23 UTC
> Description in human language for QA: Changes only in whitespace and
> messages. Quota_nld more complex patch is covered in a separate bug
> report.

This is not exactly true:

 *  c#1 - lowers GNOME severity from extreme to high,

 *  c#2 - removes solution,

 *  c#4 - changes deploy path to postupgrade script,

 *  c#5 - is only one that is small: fixed typo,

 *  c#6 - adds applies_to on subscription-manager,
          I guess subscription-manager is installed
          everywhere so it's hopefully not a problem.

Can you confirm these changes are intended?

(BTW I don't understand what you mean by c#7)

PS. and who told you QAs are humans? ;)

Comment 12 Frantisek Kluknavsky 2015-07-17 14:59:53 UTC
c#1 is wrong, it got reverted in the meantime, ignore
others - yes, you are right

Comment 13 Alois Mahdal 2015-07-17 18:08:48 UTC
@fkluknav, thanks for reply.

IMO this is enough for this bug.

I'll just add:  the -contents commit set you linked in c#8 actually introduces another change:  it also adds prep_source_right() function to quota_nld content, apparently with aim to fix 1224742.  That change was apparently supposed to be part of commit 47720d.  However, it has been already verified.

Comment 14 errata-xmlrpc 2015-07-22 10:36:33 UTC
Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

https://rhn.redhat.com/errata/RHBA-2015-1478.html