Hello community, here is the log from the commit of package yup checked in at Mon Aug 27 17:06:13 CEST 2007. -------- --- yup/yup.changes 2007-07-03 14:31:36.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yup/yup.changes 2007-08-27 16:37:42.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Aug 27 16:37:16 CEST 2007 - meissner@suse.de + +- do not remove the SP1 catalog, it might be needed for + later installations. #304851 + +------------------------------------------------------------------- +Tue Jul 10 11:32:00 CEST 2007 - meissner@suse.de + +- Also be able to handle OES2 once released. + +- updated switch-enterprise-nu-mirror script with + hopefully most bugs fixed and capable to migrate + both SLES10 and SLED10 hosts. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yup.spec ++++++ --- /var/tmp/diff_new_pack.h18939/_old 2007-08-27 17:05:15.000000000 +0200 +++ /var/tmp/diff_new_pack.h18939/_new 2007-08-27 17:05:15.000000000 +0200 @@ -21,7 +21,7 @@ BuildArch: noarch %endif Version: 222 -Release: 2 +Release: 15 Summary: "Yum Update Proxy" for SLE 10 Maintenance Source0: yup.sh Source1: yup.sysconfig @@ -168,6 +168,14 @@ fi %changelog +* Mon Aug 27 2007 - meissner@suse.de +- do not remove the SP1 catalog, it might be needed for + later installations. #304851 +* Tue Jul 10 2007 - meissner@suse.de +- Also be able to handle OES2 once released. +- updated switch-enterprise-nu-mirror script with + hopefully most bugs fixed and capable to migrate + both SLES10 and SLED10 hosts. * Tue Jul 03 2007 - meissner@suse.de - Added a switch-enterprise-nu-mirror script, to run at the remote machine for GA -> SP1 migration using YUP ++++++ switch-enterprise-nu-mirror ++++++ --- yup/switch-enterprise-nu-mirror 2007-07-03 14:34:00.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yup/switch-enterprise-nu-mirror 2007-08-27 16:36:40.000000000 +0200 @@ -14,7 +14,7 @@ exit 1 # -# 02 Jul 2007 Andreas Taschner +# 05 Jul 2007 Andreas Taschner # OLD_UPDATES_SERVICE_URL="http://your.server.example.com/SLE10-YUP/SLES10-Updates/sles-10-x86_64/" ## URL of yum repository for SLE?10 SP1 Online @@ -34,6 +34,13 @@ echo -n "---------------------- " date +# Establish product (SLES/SLED) +if grep -i "suse linux enterprise desktop" /etc/SuSE-release ; then + PRODUCT="sled" +else + PRODUCT="sles" +fi + # Check if the machine is indeed already subscribed to $OLD_UPDATES_SERVICE_URL # If not - then fix it SUBSCRIBED_TO_OLD_SERVICE="NO" @@ -89,8 +96,12 @@ rug service-add -t ZYPP $NEW_SP_ONLINE_URL $NEW_SP_ONLINE_NAME rug subscribe $NEW_SP_ONLINE_NAME +# wait for settle +sleep 15 + check_for_updates -rug in -y -t patch slesp1o-liby2util-devel + +rug in -y -t patch ${PRODUCT}p1o-liby2util-devel ZMD_STILL_RUNNING="YES" /usr/sbin/rczmd stop @@ -103,6 +114,7 @@ else echo "Waiting for ZMD terminate properly" sleep 20 + rczmd stop fi ((i++)) done @@ -113,26 +125,40 @@ fi rczmd start -sleep 10 +# Wait for ZMD to calm down +sleep 60 check_for_updates # Perform update to SP1 and then add the SP1 product into /var/lib/zypp echo "Installing the GA - SP1 migration updates." -rug up -y -rug in -y -t patch product-sles10-sp1 + +if [ $PRODUCT == "sled" ] ; then + # To force upgrade of gnomeeting to ekiga + rug in -y -t patch ${PRODUCT}p1o-ekiga +fi +rug up -y --agree-to-third-party-licences +rug in -y --agree-to-third-party-licences -t patch product-${PRODUCT}10-sp1 # Disable suse_register at every boot +test -d /var/lib/suseRegister || mkdir /var/lib/suseRegister touch /var/lib/suseRegister/neverRegisterOnBoot rug service-add -t ZYPP $NEW_SP_UPDATES_URL $NEW_SP_UPDATES_NAME rug subscribe $NEW_SP_UPDATES_NAME rug service-delete $OLD_UPDATES_SERVICE_URL -echo "Installing the current SP1 updates..." -rug up -y +# Wait for ZMD to calm down +sleep 60 + +# These are post-sp1 but still necessary for some fixes... +rug in -y -t patch ${PRODUCT}p1-yast2-online-update +rug in -y -t patch ${PRODUCT}p1-perl-Bootloader + +echo "Installing post-SP1 updates..." +rug up -y --agree-to-third-party-licences echo "Done." -echo + echo "You should reboot the machine now since the kernel has been updated." -# reboot +# rebot ++++++ yup.sh ++++++ --- yup/yup.sh 2007-07-02 14:04:41.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yup/yup.sh 2007-07-10 11:33:33.000000000 +0200 @@ -32,7 +32,7 @@ # Proxy. The resulting configuration can be found in # /etc/sysconfig/proxy and /root/.curlrc (authentication data). # -# $Id: yup.sh 215 2007-06-21 00:44:49Z mge $ +# $Id: yup.sh 223 2007-07-09 08:59:27Z mge $ # # Fail on errors in simple commands. @@ -362,6 +362,15 @@ useSERVER=$YUP_SERVER_SLES fi fi + elif [ "${SLE}." = "OES2." ]; then + UPD="OES2$SVNSUFFIX$CHLSUFFIX/sles-10" + if [ "${YUP_ID_SLES}." != "." ] && [ "${YUP_PASS_SLES}." != "." ] ; then + useID=$YUP_ID_SLES + usePASS=$YUP_PASS_SLES + fi + if [ "${YUP_SERVER_SLES}." != "." ] ; then + useSERVER=$YUP_SERVER_SLES + fi else echo "Warning: SLE $SLE unknown. Proceeding anyways ..." # exit 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org