Attachment 302361 Details for Bug 441957 – Better Descriptive Text

Better Descriptive Text

diffs (text/plain), 4.89 KB, created by Matthew Harmsen on 2008-04-14 16:31:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Harmsen

Created: 2008-04-14 16:31:20 UTC

Size: 4.89 KB

patch

obsolete

>Index: linux/scripts/remove_pki_components
>===================================================================
>--- linux/scripts/remove_pki_components	(revision 19)
>+++ linux/scripts/remove_pki_components	(working copy)
>@@ -36,16 +36,57 @@
> 
> 
> ##
>+##  Define DEFAULT PKI Instances
>+##
>+
>+PKI_DIR="/var/lib"
>+
>+PKI_CA="pki-ca"
>+PKI_DRM="pki-kra"
>+PKI_OCSP="pki-ocsp"
>+PKI_TKS="pki-tks"
>+PKI_RA="pki-ra"
>+PKI_TPS="pki-tps"
>+
>+
>+
>+##
> ##  Ask user if any PKI instances need to be removed
> ##
> 
>+printf "REMINDER:  PKI instances contain user's PKI data, and consist of\n"
>+printf "           DEFAULT PKI instances and CUSTOMIZED PKI instances.\n\n"
>+printf "           DEFAULT PKI instances are automatically created whenever\n"
>+printf "           one of the PKI subsystems are installed UNLESS that\n"
>+printf "           particular PKI subsystem's DEFAULT PKI instance\n"
>+printf "           already exists.\n\n"
>+printf "           DEFAULT PKI instances consist of the following:\n\n"
>+printf "               CA   - ${PKI_DIR}/${PKI_CA}\n"
>+printf "               DRM  - ${PKI_DIR}/${PKI_DRM}\n"
>+printf "               OCSP - ${PKI_DIR}/${PKI_OCSP}\n"
>+printf "               RA   - ${PKI_DIR}/${PKI_RA}\n"
>+printf "               TKS  - ${PKI_DIR}/${PKI_TKS}\n"
>+printf "               TPS  - ${PKI_DIR}/${PKI_TPS}\n\n"
>+printf "           Please use the 'remove_default_pki_instances' script\n"
>+printf "           to remove ALL of these DEFAULT PKI instances, OR\n"
>+printf "           use the 'pkiremove' utility to remove INDIVIDUAL\n"
>+printf "           DEFAULT PKI instances.\n\n"
>+printf "           CUSTOMIZED PKI instances may be named anything and\n"
>+printf "           may be located anywhere.  Please use the 'pkiremove'\n"
>+printf "           utility to remove any CUSTOMIZED PKI instances.\n\n"
> while :
> do
>-    printf "REMINDER:  Do any PKI instances need to be removed?  [yn]  "
>+    printf "NEITHER CUSTOMIZED PKI instances, NOR DEFAULT PKI instances will\n"
>+    printf "be REMOVED by this script!  Do any DEFAULT or CUSTOMIZED\n"
>+    printf "PKI instances need to be removed PRIOR to uninstalling\n"
>+    printf "ALL of the PKI components?  [yn]  "
>     read ANSWER
>     printf "\n"
>     if [ "${ANSWER}" = "Y" ] ||
>        [ "${ANSWER}" = "y" ] ; then
>+        printf "\n"
>+        printf "Please REMOVE the desired CUSTOMIZED and/or DEFAULT\n"
>+        printf "PKI instances PRIOR to re-running this script.\n\n"
>         exit 255
>     elif [ "${ANSWER}" = "N" ] ||
>          [ "${ANSWER}" = "n" ] ; then
>@@ -103,6 +144,8 @@
> ##
> 
> if [ "${PKI_COMPONENT_LIST}" != "" ] ; then
>+    printf "Removing the following PKI packages:\n"
>+    printf "    ${PKI_COMPONENT_LIST}\n\n"
>     rpm -ev ${PKI_COMPONENT_LIST}
>     printf "\n"
> else
>Index: linux/scripts/remove_default_pki_instances
>===================================================================
>--- linux/scripts/remove_default_pki_instances	(revision 19)
>+++ linux/scripts/remove_default_pki_instances	(working copy)
>@@ -36,12 +36,42 @@
> 
> 
> ##
>+##  Define DEFAULT PKI Instances
>+##
>+
>+PKI_DIR="/var/lib"
>+
>+PKI_CA="pki-ca"
>+PKI_DRM="pki-kra"
>+PKI_OCSP="pki-ocsp"
>+PKI_TKS="pki-tks"
>+PKI_RA="pki-ra"
>+PKI_TPS="pki-tps"
>+
>+PKI_INSTANCES="${PKI_CA} ${PKI_DRM} ${PKI_OCSP} ${PKI_TKS} ${PKI_RA} ${PKI_TPS}"
>+
>+
>+
>+##
> ##  Ask user if is is okay to remove ALL DEFAULT PKI instances
> ##
> 
>+printf "REMINDER:  PKI instances contain user's PKI data, and consist of\n"
>+printf "           DEFAULT PKI instances and CUSTOMIZED PKI instances.\n\n"
>+printf "           DEFAULT PKI instances are automatically created whenever\n"
>+printf "           one of the PKI subsystems are installed UNLESS that\n"
>+printf "           particular PKI subsystem's DEFAULT PKI instance\n"
>+printf "           already exists.\n\n"
>+printf "           DEFAULT PKI instances consist of the following:\n\n"
>+printf "               CA   - ${PKI_DIR}/${PKI_CA}\n"
>+printf "               DRM  - ${PKI_DIR}/${PKI_DRM}\n"
>+printf "               OCSP - ${PKI_DIR}/${PKI_OCSP}\n"
>+printf "               RA   - ${PKI_DIR}/${PKI_RA}\n"
>+printf "               TKS  - ${PKI_DIR}/${PKI_TKS}\n"
>+printf "               TPS  - ${PKI_DIR}/${PKI_TPS}\n\n"
> while :
> do
>-    printf "REMINDER:  ALL DEFAULT PKI instances will be REMOVED!  "
>+    printf "This script REMOVES ALL DEFAULT PKI instances!  "
>     printf "Is this okay?  [yn]  "
>     read ANSWER
>     printf "\n"
>@@ -51,6 +81,8 @@
>         break
>     elif [ "${ANSWER}" = "N" ] ||
>          [ "${ANSWER}" = "n" ] ; then
>+        printf "\n"
>+        printf "No DEFAULT PKI instances will be removed.\n\n"
>         exit 255
>     else
>         continue
>@@ -60,23 +92,6 @@
> 
> 
> ##
>-##  Define DEFAULT PKI Instances
>-##
>-
>-PKI_DIR="/var/lib"
>-
>-PKI_CA="pki-ca"
>-PKI_DRM="pki-kra"
>-PKI_OCSP="pki-ocsp"
>-PKI_TKS="pki-tks"
>-PKI_RA="pki-ra"
>-PKI_TPS="pki-tps"
>-
>-PKI_INSTANCES="${PKI_CA} ${PKI_DRM} ${PKI_OCSP} ${PKI_TKS} ${PKI_RA} ${PKI_TPS}"
>-
>-
>-
>-##
> ##  Remove ALL DEFAULT PKI Instances present . . .
> ##
>

Actions: View

Attachments on bug 441957: 302361