diff --git a/xml/app-temp-script.xml b/xml/app-temp-script.xml index 819eb8f..e0e5aaa 100644 --- a/xml/app-temp-script.xml +++ b/xml/app-temp-script.xml @@ -24,7 +24,7 @@ is shown here. Save this script as rmt-client-setup-res. -#!/bin/sh +#!/bin/bash SUSECONNECT=/usr/bin/SUSEConnect RPM=/usr/bin/rpm @@ -139,7 +139,7 @@ else CERTURL="$REGCERT" fi -$CURL --tlsv1.2 --silent --insecure --connect-timeout 10 --output $TEMPFILE $CERTURL +$CURL --tlsv1.2 --silent --insecure --connect-timeout 10 --output "$TEMPFILE" "$CERTURL" if [ $? -ne 0 ]; then echo "Download failed. Abort." exit 1 @@ -183,14 +183,12 @@ echo "Detected ${SLL_name} version: ${SLL_version}" echo "Importing repomd.xml.key" if [[ ${SLL_version} -eq 7 ]]; then - $CURL --silent --show-error --insecure ${REGURL}/repo/SUSE/Updates/${SLL_name%%-LTSS}/${SLL_version}-LTSS/x86_64/update/repodata/repomd.xml.key --output repomd.xml.key + $CURL --silent --show-error --insecure "${REGURL}/repo/SUSE/Updates/${SLL_name%%-LTSS}/${SLL_version}-LTSS/x86_64/update/repodata/repomd.xml.key" --output repomd.xml.key else - $CURL --silent --show-error --insecure ${REGURL}/repo/SUSE/Updates/${SLL_name}/${SLL_version}/x86_64/update/repodata/repomd.xml.key --output repomd.xml.key + $CURL --silent --show-error --insecure "${REGURL}/repo/SUSE/Updates/${SLL_name}/${SLL_version}/x86_64/update/repodata/repomd.xml.key" --output repomd.xml.key fi $RPM --import repomd.xml.key -if [ ! -x $SUSECONNECT ]; then - echo "Downloading SUSEConnect" if [[ ${SLL_version} -gt 7 ]]; then if [ ! -x $DNF ]; then @@ -200,14 +198,13 @@ if [[ ${SLL_version} -gt 7 ]]; then echo "Disabling all repositories" $DNF config-manager --disable $(dnf repolist -q | awk '{ print $1 }' | grep -v repo) - # sed -i 's/^enabled=1/enabled=0/' /etc/yum.repos.d/* # on RHEL9 (not RHEL8) redhat-release is protected and cannot be updated to sll-release if [ -f /etc/dnf/protected.d/redhat-release.conf ]; then rm -f /etc/dnf/protected.d/redhat-release.conf fi - $DNF config-manager --add-repo ${REGURL}/repo/SUSE/Updates/${SLL_name}/${SLL_version}/x86_64/update - $DNF config-manager --add-repo ${REGURL}/repo/SUSE/Updates/${SLL_name}-AS/${SLL_version}/x86_64/update + $DNF config-manager --add-repo "${REGURL}/repo/SUSE/Updates/${SLL_name}/${SLL_version}/x86_64/update" + $DNF config-manager --add-repo "${REGURL}/repo/SUSE/Updates/${SLL_name}-AS/${SLL_version}/x86_64/update" $DNF install -y --allowerasing ${SLL_release_package} # For RHEL8/CentOS8, remove all old signing keys and import SUSE keys installed with sles_es-release package @@ -215,7 +212,9 @@ if [[ ${SLL_version} -gt 7 ]]; then import_rpm_signing_keys fi + echo "Downloading SUSEConnect" $DNF install SUSEConnect librepo + $DNF config-manager --set-disabled "${RMTNAME}_repo_SUSE_Updates_${SLL_name}_${SLL_version}_x86_64_update" $DNF config-manager --set-disabled "${RMTNAME}_repo_SUSE_Updates_${SLL_name}-AS_${SLL_version}_x86_64_update" @@ -235,25 +234,30 @@ elif [[ ${SLL_version} -eq 7 ]]; then rm -f /usr/share/redhat-release fi - $YUM_CONFIG_MGR --add-repo ${REGURL}/repo/SUSE/Updates/${SLL_name%%-LTSS}/${SLL_version}-LTSS/x86_64/update + $YUM_CONFIG_MGR --add-repo "${REGURL}/repo/SUSE/Updates/${SLL_name%%-LTSS}/${SLL_version}-LTSS/x86_64/update" if [ ${SLL_name} = "RES-OL-LTSS" ]; then - $YUM_CONFIG_MGR --add-repo ${REGURL}/repo/SUSE/Updates/RES-BASE/${SLL_version}/x86_64/update + $YUM_CONFIG_MGR --add-repo "${REGURL}/repo/SUSE/Updates/RES-BASE/${SLL_version}/x86_64/update" fi $YUM_CONFIG_MGR --enable *suse.* > /dev/null - $YUM install -y ${SLL_release_package} suseconnect-ng librepo + if [ ! -x $SUSECONNECT ]; then + $YUM install -y ${SLL_release_package} suseconnect-ng librepo + else + $YUM update -y ${SLL_release_package} suseconnect-ng librepo + fi + $YUM update -y yum $YUM_CONFIG_MGR --disable \* > /dev/null -fi + elif [[ ${SLL_version} -eq 8 ]]; then # For SLL8, the release package is already installed, just import the keys import_rpm_signing_keys fi -$CURL --silent --show-error --insecure $REGURL/tools/rmt-client-setup --output rmt-client-setup +$CURL --silent --show-error --insecure "$REGURL/tools/rmt-client-setup" --output rmt-client-setup echo "Running rmt-client-setup $PARAMS" if [ -n "$YES_PARAM" ]; then - PARAMS=$(echo $PARAMS | sed 's/--yes//') + PARAMS=$(echo "$PARAMS" | sed 's/--yes//') yes | sh rmt-client-setup $PARAMS else sh rmt-client-setup $PARAMS diff --git a/xml/art-quickstart.xml b/xml/art-quickstart.xml index deb1107..04d4dfa 100644 --- a/xml/art-quickstart.xml +++ b/xml/art-quickstart.xml @@ -102,7 +102,7 @@ To register new &rhla; &productnumber; or CentOS Linux &productnumber; - systems, you must purchase a + systems, and to continue receiving new updates for existing systems, you must purchase a &reponame; &productnumber; subscription. @@ -110,11 +110,11 @@ &reponame; &productnumber;. You must remove this product from your system before you can register with an LTSS subscription. - + &productname; is a technology and support solution for mixed Linux environments. diff --git a/xml/mirror-repositories-with-rmt.xml b/xml/mirror-repositories-with-rmt.xml index 1f06838..e1226f1 100644 --- a/xml/mirror-repositories-with-rmt.xml +++ b/xml/mirror-repositories-with-rmt.xml @@ -62,14 +62,14 @@ There are no new &ha; repositories. &ha; is not supported with &reponame; &productnumber;. - + diff --git a/xml/register-with-rmt.xml b/xml/register-with-rmt.xml index 0f96bc1..a5acab7 100644 --- a/xml/register-with-rmt.xml +++ b/xml/register-with-rmt.xml @@ -71,22 +71,33 @@ - + de-register your system from the original subscription before you re-register + with the LTSS subscription: + + + + + De-register your system: + +&prompt.root;SUSEConnect --de-register + + This command also removes the &ha; extension if it was installed on your system. + &ha; is not supported with &reponame; &productnumber;. + + + + + Clean up the registration status: + +&prompt.root;SUSEConnect --cleanup + + + Registering <phrase audience="sll">&rhla; or </phrase>CentOS Linux with &rmt;