- YaST Commits

[yast-commit] r38157 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: package/yast2-product-creator.changes scripts/y2mkiso src/ProductCreator.ycp src/complex.ycp src/wizards.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 11:11:35 2007 New Revision: 38157 URL: http://svn.opensuse.org/viewcvs/yast?rev=38157&view=rev Log: - install "yast2-instserver" package (.content_file agent) - fixed signing of addon products - allow spaces in the file names (#275918) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon May 28 11:11:35 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 28 09:01:06 CEST 2007 - lslezak(a)suse.cz + +- install "yast2-instserver" package (.content_file agent) +- fixed signing of addon products +- allow spaces in the file names (#275918) + +------------------------------------------------------------------- Wed May 23 15:59:07 CEST 2007 - lslezak(a)suse.cz - 2.13.1 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/scripts/y2mkiso Mon May 28 11:11:35 2007 @@ -55,7 +55,7 @@ fi # set it later in pmac branch PPC_HFS_APPID="" -if [ -f $SOURCE/content ] ; then +if [ -f "$SOURCE/content" ] ; then BOOT_BASE_DIR=boot BOOT_IMAGE=$BOOT_BASE_DIR/image BOOT_ISOLINUX=$BOOT_BASE_DIR/$BOOT_ARCH/loader @@ -85,18 +85,18 @@ esac ;; esac - done < $SOURCE/content + done < "$SOURCE/content" DISTVERSION=`echo $DISTVERSION | tr '-' '#'` DISTIDENT="$DISTPRODUCT-$DISTVERSION" - for i in $SOURCE/media.? ; do - test -d $i || continue + for i in "$SOURCE/media.?" ; do + test -d "$i" || continue { read VENDOR read CREATIONDATE - } < $i/media + } < "$i"/media done else - if [ -d $SOURCE/boot/$BOOT_ARCH/loader -a -d $SOURCE/i386/update ]; then + if [ -d "$SOURCE/boot/$BOOT_ARCH/loader" -a -d "$SOURCE/i386/update" ]; then # We have a bootable Patch-CD BOOT_BASE_DIR=boot BOOT_IMAGE=$BOOT_BASE_DIR/image @@ -105,30 +105,30 @@ fi -TMP_LS=`/bin/ls -d $SOURCE/*/update 2> /dev/null` -if [ -d $SOURCE/$BOOT_BASE_DIR -o -d $SOURCE/$ROOT_ON_CD -o ! -z "$TMP_LS" ] ; then +TMP_LS=`/bin/ls -d "$SOURCE/*/update" 2> /dev/null` +if [ -d "$SOURCE/$BOOT_BASE_DIR" -o -d "$SOURCE/$ROOT_ON_CD" -o ! -z "$TMP_LS" ] ; then - if test -e $SOURCE/$ROOT_ON_CD/inst-sys-test ; then + if test -e "$SOURCE/$ROOT_ON_CD/inst-sys-test" ; then echo $SOURCE/$ROOT_ON_CD/inst-sys-test exist. Please remove it. exit fi - if test -f $SOURCE/$BOOT_IMAGE -o -f $SOURCE/.boot \ - -o -d $SOURCE/$BOOT_ISOLINUX \ - -o -f $SOURCE/ppc/bootinfo.txt -o -d $SOURCE/suseboot \ - -o -d $SOURCE/etc -o -f $SOURCE/boot/silo.conf ; then + if test -f "$SOURCE/$BOOT_IMAGE" -o -f "$SOURCE/.boot" \ + -o -d "$SOURCE/$BOOT_ISOLINUX" \ + -o -f "$SOURCE/ppc/bootinfo.txt" -o -d "$SOURCE/suseboot" \ + -o -d "$SOURCE/etc" -o -f "$SOURCE/boot/silo.conf" ; then #test -d $SOURCE2 && { echo "tmpdir $SOURCE2 already exists" ; exit 1 ; } mkdir -p $SOURCE2 || { echo "can't create tmpdir $SOURCE2" ; exit 1 ; } - chmod 755 $SOURCE2 - if [ -f $SOURCE/.boot ] ; then + chmod 755 "$SOURCE2" + if [ -f "$SOURCE/.boot" ] ; then PARAMS="$PARAMS -b .boot -c boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -f $SOURCE/$BOOT_IMAGE ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -f "$SOURCE/$BOOT_IMAGE" ] ; then # needed for ia64 - xx=`filesize $SOURCE/$BOOT_IMAGE` + xx=`filesize "$SOURCE/$BOOT_IMAGE"` if [ $ "$xx" -ne 1474560 $ -a $ "$xx" -ne 2949120 $ ] ; then - if head -c 200 $SOURCE/$BOOT_IMAGE | grep -a -q 'Sorry, didn.t find boot loader, stopped.' ; then + if head -c 200 "$SOURCE/$BOOT_IMAGE" | grep -a -q 'Sorry, didn.t find boot loader, stopped.' ; then PARAMS="$PARAMS -hard-disk-boot" else PARAMS="$PARAMS -no-emul-boot" @@ -139,12 +139,12 @@ PARAMS="$PARAMS -sort $SORTFILE -b $BOOT_IMAGE -c $BOOT_BASE_DIR/boot.catalog \ -hide $BOOT_BASE_DIR/boot.catalog -hide-joliet $BOOT_BASE_DIR/boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -d $SOURCE/$BOOT_ISOLINUX ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -d "$SOURCE/$BOOT_ISOLINUX" ] ; then echo "$SOURCE2/$BOOT_BASE_DIR/boot.catalog 3" >$SORTFILE echo "$BOOT_BASE_DIR/boot.catalog 3" >>$SORTFILE echo "$SOURCE/$BOOT_BASE_DIR/boot.catalog 3" >>$SORTFILE - find $SOURCE/$BOOT_ISOLINUX -printf "%p 1\n" >>$SORTFILE + find "$SOURCE/$BOOT_ISOLINUX" -printf "%p 1\n" >>$SORTFILE # last priority wins echo "$SOURCE/$BOOT_ISOLINUX/isolinux.bin 2" >>$SORTFILE echo "sortfile has" @@ -155,8 +155,8 @@ -b $BOOT_ISOLINUX/isolinux.bin -c $BOOT_BASE_DIR/boot.catalog \ -hide $BOOT_BASE_DIR/boot.catalog -hide-joliet $BOOT_BASE_DIR/boot.catalog" echo found boot image. Making CD bootable. - mkdir -p $SOURCE2/$BOOT_BASE_DIR || exit 1 - elif [ -f $SOURCE/ppc/bootinfo.txt -o -d $SOURCE/suseboot ] ; then + mkdir -p "$SOURCE2/$BOOT_BASE_DIR" || exit 1 + elif [ -f "$SOURCE/ppc/bootinfo.txt" -o -d "$SOURCE/suseboot" ] ; then # various ppc boards, no -J option echo removing follow-symlinks and joilet from mkisofs options echo adding long filenames, translation table, Untranslated filenames @@ -191,7 +191,7 @@ fi # check now for CHRP/iSeries vs PReP/pmac if the above is false if [ "$PPC_MKISOFS_CHRPBOOT" = "no" ] ; then - if [ -f $SOURCE/ppc/bootinfo.txt ] ; then + if [ -f "$SOURCE/ppc/bootinfo.txt" ] ; then # assume thats a pSeries/iSeries CD echo generic chrp bootblock missing echo upgrade mkisofs @@ -199,15 +199,15 @@ else # assume thats a PReP/Pmac CD # check if a PReP install file is available - if [ -f $SOURCE/boot/zImage.prep.initrd ] ; then + if [ -f "$SOURCE/boot/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot boot/zImage.prep.initrd" echo using boot/zImage.prep.initrd for PReP boot - elif [ -f $SOURCE/suse/images/zImage.prep.initrd ] ; then + elif [ -f "$SOURCE/suse/images/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot suse/images/zImage.prep.initrd" echo using suse/images/zImage.prep.initrd for PReP boot fi # check if a pmac kernel is available - if [ -d $SOURCE/suseboot ] ; then + if [ -d "$SOURCE/suseboot" ] ; then # create a mac partition table # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable @@ -227,21 +227,21 @@ fi else # new mkisofs with -chrp-boot option - if [ -f $SOURCE/ppc/bootinfo.txt ] ; then + if [ -f "$SOURCE/ppc/bootinfo.txt" ] ; then # assume thats a pSeries/iSeries CD echo "adding -chrp-boot for CHRP boot" PARAMS="$PARAMS -chrp-boot" fi # check if a PReP install file is available - if [ -f $SOURCE/boot/zImage.prep.initrd ] ; then + if [ -f "$SOURCE/boot/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot boot/zImage.prep.initrd" echo using boot/zImage.prep.initrd for PReP boot - elif [ -f $SOURCE/suse/images/zImage.prep.initrd ] ; then + elif [ -f "$SOURCE/suse/images/zImage.prep.initrd" ] ; then PARAMS="$PARAMS -prep-boot suse/images/zImage.prep.initrd" echo using suse/images/zImage.prep.initrd for PReP boot fi # check if a pmac kernel is available - if [ -d $SOURCE/suseboot ] ; then + if [ -d "$SOURCE/suseboot" ] ; then # create a mac partition table # use netatalk and macbinary filename translation # bless a directory named suseboot, mark it bootable @@ -260,11 +260,11 @@ fi # end ppc boards else - if [ -d $SOURCE/etc ] ; then + if [ -d "$SOURCE/etc" ] ; then echo found $SOURCE/etc. making sure, it is at the beginning of iso image. mkdir -p $SOURCE2/etc || exit 1 else - if [ -f $SOURCE/boot/silo.conf ] ; then + if [ -f "$SOURCE/boot/silo.conf" ] ; then PARAMS="$PARAMS -silo-boot boot/second.b -s /boot/silo.conf" echo found SPARC boot config. Making CD bootable. mkdir -p $SOURCE2/boot || exit 1 @@ -276,17 +276,17 @@ echo found no boot image. No bootable CD. fi - if test -f $SOURCE/content -a -z "$TMP_LS" ; then + if test -f "$SOURCE/content" -a -z "$TMP_LS" ; then # we already collected this above APPID=$DISTIDENT - elif test -f $SOURCE/$DESCRDIR/info ; then - set -- `fgrep DIST_IDENT $SOURCE/$DESCRDIR/info` + elif test -f "$SOURCE/$DESCRDIR/info" ; then + set -- `fgrep DIST_IDENT "$SOURCE/$DESCRDIR/info"` APPID=$2 else # If we have directory "update" in the second level, we assume # this is a Patch-CD if test ! -z "$TMP_LS" ; then - if test -f $SOURCE/media.1/patches ; then + if test -f "$SOURCE/media.1/patches" ; then APPID="`cat $SOURCE/media.1/patches | sed -e "s|/ ||g" | tr " " _`" else APPID="`cat $SOURCE/.S.u.S.E-disk-* | tr " " _`" @@ -294,23 +294,23 @@ fi fi if test -z "$APPID" \ - -a -f $SOURCE/$ROOT_ON_CD/MD5SUMS -a -f $SOURCE/.S.u.S.E-disk-* ; then - APPID=`cat $SOURCE/.S.u.S.E-disk-* | tr " " - | sed -e "s@-Version-@-@"` + -a -f "$SOURCE/$ROOT_ON_CD/MD5SUMS" -a -f "$SOURCE/.S.u.S.E-disk-*" ; then + APPID=`cat "$SOURCE/.S.u.S.E-disk-*" | tr " " - | sed -e "s@-Version-@-@"` APPID="$APPID.0#0" fi APPID=`echo $APPID | tr " " -` test -n "$APPID" && PARAMS="$PARAMS -A $APPID" - if test -f $SOURCE/content ; then + if test -f "$SOURCE/content" ; then MEDIANUMBER=1 - for i in $SOURCE/media.? ; do - test -d $i || continue - MEDIADIR=`ls -d $SOURCE/media.?` + for i in "$SOURCE/media.?" ; do + test -d "$i" || continue + MEDIADIR=`ls -d "$SOURCE/media.?"` MEDIANUMBER=${MEDIADIR##$SOURCE/media.} done VOL="0$MEDIANUMBER" - elif test -f $SOURCE/.S.u.S.E-disk-* ; then - BASE=`basename $SOURCE/.S.u.S.E-disk-*` + elif test -f "$SOURCE/.S.u.S.E-disk-*" ; then + BASE=`basename "$SOURCE/.S.u.S.E-disk-*"` VOL=`echo $BASE | cut -c 16-17` fi if test -n "$VOL" ; then @@ -344,7 +344,7 @@ mkisofs \ -p "$CD_PREPARER" \ $PUB_OPT "$CD_PUBLISHER" \ - $PARAMS -o $DEST $XPARAMS $SOURCE + $PARAMS -o "$DEST" $XPARAMS "$SOURCE" set +x Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Mon May 28 11:11:35 2007 @@ -390,8 +390,6 @@ } ); - y2internal("Escaped sources: %1", sources); - v["sources"] = sources; } @@ -623,6 +621,7 @@ boolean ExportPublicKey(string keyid, string dir) { + y2debug("ExportPublicKey: %1 to %2", keyid, dir); // export the public key boolean ret = GPG::ExportAsciiPublicKey(keyid, dir + "/content.key"); @@ -687,7 +686,7 @@ string meta_sha1 = SHA1Meta(dir, prod_dir); string key_sha1 = SHA1Key(dir); - string command = sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' %1/content", dir); + string command = sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content'", String::Quote(dir)); map out = (map)SCR::Execute(.target.bash_output, command); if (out["exit"]:-1 != 0) { @@ -1029,7 +1028,7 @@ skel_root = sformat("%1/%2", Config["iso-directory"]:"", Config["name"]:""); SCR::Execute(.target.mkdir, skel_root); - Exec(sformat("/bin/mkdir -p %1/boot/%2", skel_root, arch)); + Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch))); list<integer> enabled = Pkg::SourceGetCurrent(true); if (size(enabled) == 0 ) @@ -1043,18 +1042,18 @@ { if (Config["code10"]:false) { - Exec(sformat("/bin/mkdir -p %1/boot/%2/loader", skel_root, arch)); + Exec(sformat("/bin/mkdir -p '%1/boot/%2/loader'", String::Quote(skel_root), String::Quote(arch))); } else { - Exec(sformat("/bin/mkdir -p %1/boot/loader", skel_root)); + Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); } } else if (Arch::ppc() || Arch::ppc64()) { - Exec(sformat("/bin/mkdir -p %1/etc", skel_root)); - Exec(sformat("/bin/mkdir -p %1/ppc", skel_root)); - Exec(sformat("/bin/mkdir -p %1/suseboot", skel_root)); + Exec(sformat("/bin/mkdir -p '%1/etc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); + Exec(sformat("/bin/mkdir -p '%1/suseboot'", String::Quote(skel_root))); } // detect the base source @@ -1065,7 +1064,7 @@ foreach(integer srcid, string dir, product_map, { if (dir != "/") { - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, dir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(dir))); } } ); @@ -1159,7 +1158,7 @@ // copy the descr directory - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrDir))); CopyDirectoryRec(id, 1, descrDir, sformat("%1/%2", skel_root, UpDir(descrDir))); sp = true; @@ -1175,14 +1174,14 @@ descrDir = this_source["productData","descrdir"]:"suse/setup/descr"; dataDir = this_source["productData", "datadir"]:"suse"; y2debug("source data: %1", this_source["sourceData", "url"]:"" ); - success = (boolean)SCR::Execute(.target.mkdir, sformat("%1/%2", skel_root, dataDir)); + success = (boolean)SCR::Execute(.target.mkdir, sformat("'%1/%2'", String::Quote(skel_root), String::Quote(dataDir))); if (!success) { - y2error("Cannot create directory: %1", sformat("%1/%2", skel_root, dataDir)); + y2error("Cannot create directory: %1", sformat("'%1/%2'", String::Quote(skel_root), String::Quote(dataDir))); return false; } - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrDir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrDir))); if (savespace) { @@ -1226,7 +1225,7 @@ // Prepare media files CopyDirectoryRec(id, 1, "media.1", skel_root); - Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %2/media.1/media.tmp && mv %2/media.1/media.tmp %2/media.1/media", skel_root, skel_root)); + Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %1/media.1/media.tmp && mv %1/media.1/media.tmp %1/media.1/media", String::Quote(skel_root))); } else { @@ -1326,7 +1325,7 @@ // copy descriptions string descrdir = meta[source_id, "productData","descrdir"]:"suse/setup/descr"; - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, descrdir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(descrdir))); CopyDirectoryRec(source_id, 1, descrdir, sformat("%1/%2", skel_root, UpDir(descrdir))); string datadir = meta[source_id, "productData", "datadir"]:"suse"; @@ -1345,22 +1344,22 @@ if (l_slidedir != nil && l_slidedir != "") { // copy slide show - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("/bin/cp -a %1/* %2/%3", l_slidedir, skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("/bin/cp -a -- '%1/*' '%2/%3'", String::Quote(l_slidedir), String::Quote(skel_root), String::Quote(slidedir))); } } else { y2milestone("Slideshow is missing"); - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("> %1/%2/directory.yast", skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); } } else { y2milestone("Save space - do not copy the slideshow"); - Exec(sformat("/bin/mkdir -p %1/%2", skel_root, slidedir)); - Exec(sformat("> %1/%2/directory.yast", skel_root, slidedir)); + Exec(sformat("/bin/mkdir -p '%1/%2'", String::Quote(skel_root), String::Quote(slidedir))); + Exec(sformat("> '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(slidedir))); } y2milestone("source: %1, descrDir: %2, skel_root: %3", source, descrDir, skel_root); @@ -1368,7 +1367,7 @@ // copy media.1 directory CopyDirectoryRec(source_id, 1, "media.1", skel_root); - Exec(sformat("/usr/bin/head -n 2 %1/media.1/media > %2/media.1/media.tmp && mv %2/media.1/media.tmp %2/media.1/media", skel_root, skel_root)); + Exec(sformat("/usr/bin/head -n 2 '%1/media.1/media' > '%1/media.1/media.tmp' && mv '%1/media.1/media.tmp' '%1/media.1/media'", String::Quote(skel_root))); // create a copy of the autoyast profile (the new profile accepts even unsigned source) string autoyast_copy = ""; @@ -1429,32 +1428,34 @@ if (autoyast_copy != "") { // save the original file and the copy - Exec(sformat("/bin/cp %1 %2/autoinst.xml", autoyast_copy, skel_root)); - Exec(sformat("/bin/cp %1 %2/autoinst.orig.xml", Config["profile"]:"", skel_root)); + Exec(sformat("/bin/cp -- '%1' '%2/autoinst.xml'", String::Quote(autoyast_copy), String::Quote(skel_root))); + Exec(sformat("/bin/cp -- '%1' '%2/autoinst.orig.xml'", String::Quote(Config["profile"]:""), String::Quote(skel_root))); } else { // save the original file (a copy is not available) - Exec(sformat("/bin/cp %1 %2/autoinst.xml", Config["profile"]:"", skel_root)); + Exec(sformat("/bin/cp '%1' '%2/autoinst.xml'", String::Quote(Config["profile"]:""), String::Quote(skel_root))); } } // Media nr. integer count = 1; - Exec(sformat("/bin/echo %1 >> %2/media.1/media ", count, skel_root)); + Exec(sformat("/bin/echo %1 >> '%2/media.1/media'", count, String::Quote(skel_root))); // make the source digitally unsigned (because signed descr/packages file has been modified) if (Config["code10"]:false) { // remove the key and the checksum - Exec(sformat("/bin/rm %1/content.asc %1/content.key", skel_root)); + Exec(sformat("/bin/rm '%1/content.asc' '%1/content.key'", String::Quote(skel_root))); // remove the meta information from content file - Exec(sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' %1/content > %1/content.new", skel_root)); - Exec(sformat("/bin/mv %1/content.new %1/content", skel_root)); + Exec(sformat("/usr/bin/grep -v -e '^KEY ' -e '^META ' '%1/content' > '%1/content.new'", String::Quote(skel_root))); + Exec(sformat("/bin/mv '%1/content.new' '%1/content'", String::Quote(skel_root))); // recreate the index file - Exec(sformat("/bin/rm -f %1/directory.yast && /usr/bin/create_directory.yast %1", skel_root)); +// FIXME: use create_directory when it supports parameter with spaces +// Exec(sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(skel_root))); + Exec(sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(skel_root))); } @@ -1498,7 +1499,7 @@ if (!match) { // remove the pattern - string cmd = sformat("/bin/rm %1/%2/%3", skel_root, descrDir, f); + string cmd = sformat("/bin/rm -- '%1/%2/%3'", String::Quote(skel_root), String::Quote(descrDir), String::Quote(f)); y2milestone("removing pattern %1", f); success = success && Exec(cmd); y2debug("success: %1", success); @@ -1510,11 +1511,12 @@ if (refresh_diryast) { // regenerate directory.yast and patterns file - string cmd = sformat("/bin/rm -f '%1/%2/directory.yast' && /usr/bin/create_directory.yast '%1/%2'", String::Quote(skel_root), String::Quote(descrDir)); + // FIXME: string cmd = sformat("/bin/rm -f -- '%1/%2/directory.yast' && /usr/bin/create_directory.yast '%1/%2'", String::Quote(skel_root), String::Quote(descrDir)); + string cmd = sformat("/bin/rm -f '%1/%2/directory.yast'; cd '%1/%2'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/%2/directory.yast'", String::Quote(skel_root), String::Quote(descrDir)); success = success && Exec(cmd); y2debug("success: %1", success); - cmd = sformat("cd %1/%2; ls *.pat > %1/%2/patterns", skel_root, descrDir); + cmd = sformat("cd '%1/%2'; ls *.pat > '%1/%2/patterns'", String::Quote(skel_root), String::Quote(descrDir)); success = success && Exec(cmd); y2debug("success: %1", success); } @@ -1525,6 +1527,8 @@ y2debug("success: %1", success); }); + skel_root = main_skel_root; + string addon_file = CreateAddonFile(product_map); if (size(addon_file) > 0) { @@ -1636,7 +1640,8 @@ if (success) { // update directory.yast file - string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + // FIXME string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + string command = sformat("/bin/rm -f '%1/directory.yast'; cd '%1'; ls | grep -v -e '^\\.$' -e '^\\.\\.$' > '%1/directory.yast'", String::Quote(dir)); y2milestone("Updating %1/directory.yast ...", dir); integer updated = (integer)SCR::Execute(.target.bash, command); y2milestone("Updated: %1", updated == 0); @@ -1739,13 +1744,13 @@ SCR::Write(.target.string, fname, Config["bootconfig"]:"" ); } cpCmd = (Config["code10"]:false) - ? sformat("cp %1/product-creator/message %2/boot/%3/loader", Directory::datadir, skel_root, arch) - : sformat("cp %1/product-creator/message %2/boot/loader", Directory::datadir, skel_root); + ? sformat("cp -- '%1/product-creator/message' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) + : sformat("cp -- '%1/product-creator/message' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); SCR::Execute (.target.bash, cpCmd); cpCmd = (Config["code10"]:false) - ? sformat("cp %1/product-creator/options.msg %2/boot/%3/loader", Directory::datadir, skel_root, arch) - : sformat("cp %1/product-creator/options.msg %2/boot/loader", Directory::datadir, skel_root); + ? sformat("cp -- '%1/product-creator/options.msg' '%2/boot/%3/loader'", String::Quote(Directory::datadir), String::Quote(skel_root), arch) + : sformat("cp -- '%1/product-creator/options.msg' '%2/boot/loader'", String::Quote(Directory::datadir), String::Quote(skel_root)); SCR::Execute (.target.bash, cpCmd); @@ -1917,7 +1922,7 @@ global boolean removeDestination() { string isodir = Config["iso-directory"]:"" + "/" + Config["name"]:""; - return (integer)SCR::Execute(.target.bash, "rm -rf " + isodir ) == 0; + return (integer)SCR::Execute(.target.bash, sformat("rm -rf -- '%1'", String::Quote(isodir)) ) == 0; } global boolean confirmDestinationRemoving() @@ -2100,7 +2105,7 @@ break; } - string cpCmd = sformat("cp -a %1 %2", l_packge, dir ); + string cpCmd = sformat("cp -a '%1' '%2'", String::Quote(l_packge), String::Quote(dir) ); y2debug("%1", cpCmd); @@ -2126,13 +2131,13 @@ // regenerate the metadata if (general_info["type"]:"" == "YUM") { - ret = ret && Exec(sformat("/usr/bin/createrepo %1/%2", basedir, subdir)); + ret = ret && Exec(sformat("/usr/bin/createrepo '%1/%2'", String::Quote(basedir), String::Quote(subdir))); } else { // TODO FIXME get datadir from the source - ret = ret && Exec(sformat("cd %1/%2/%3 && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV", - basedir, subdir, datadir)); + ret = ret && Exec(sformat("cd '%1/%2/%3' && /usr/bin/create_package_descr -x setup/descr/EXTRA_PROV", + String::Quote(basedir), String::Quote(subdir), String::Quote(datadir))); } } ); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Mon May 28 11:11:35 2007 @@ -16,6 +16,7 @@ import "Wizard_hw"; import "Report"; import "Arch"; + import "String"; import "ProductCreator"; @@ -107,7 +108,7 @@ contents = Wizard_hw::SpacingAround(contents2, 1.5, 1.5, 1.0, 1.0); Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", - Label::BackButton(), Label::FinishButton()); + Label::BackButton(), Label::CloseButton()); if (size(overview) == 0 ) { @@ -334,7 +335,7 @@ string pub = ProductCreator::Config["publisher"]:"anon"; string prep = ProductCreator::Config["preparer"]:"anon"; - map output = (map)SCR::Execute(.target.bash_output, sformat("du -s -b %1 | awk -F' ' ' { printf $1 }'", isodir )); + map output = (map)SCR::Execute(.target.bash_output, sformat("du -s -b '%1' | awk -F' ' ' { printf $1 }'", String::Quote(isodir) )); string du = output["stdout"]:""; y2milestone("Expected size: %1", du); @@ -343,7 +344,7 @@ Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); } - string command = sformat("/usr/lib/YaST2/bin/y2mkiso %1 %2 %3", isodir, isofile, (ProductCreator::Config["code10"]:false) ? Arch::architecture() : ""); + string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? Arch::architecture() : "")); y2milestone("command: %1", command); SCR::Execute (.target.bash, command, $["CD_PUBLISHER": pub, "CD_PREPARER": prep ]); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Mon May 28 11:11:35 2007 @@ -239,7 +239,8 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("cd-creator"); - if (!Package::InstallAll(["inst-source-utils", "mkisofs"])) + // .content_file agent is in yast2-instserver package - TODO: move it to yast2.rpm + if (!Package::InstallAll(["inst-source-utils", "mkisofs", "yast2-instserver"])) { Popup::Error(_("Installation of required packages failed.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38156 - /tags/stable-2_15_27/installation/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:21:07 2007 New Revision: 38156 URL: http://svn.opensuse.org/viewcvs/yast?rev=38156&view=rev Log: Created tag stable-2_15_27 for installation Added: tags/stable-2_15_27/installation/ - copied from r38155, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38155 - /tags/stable-2_15_34/network/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:20:48 2007 New Revision: 38155 URL: http://svn.opensuse.org/viewcvs/yast?rev=38155&view=rev Log: Created tag stable-2_15_34 for network Added: tags/stable-2_15_34/network/ - copied from r38154, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38154 - in /trunk/network: ./ package/ src/installation/ src/modules/ src/routines/ testsuite/tests/
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:20:39 2007 New Revision: 38154 URL: http://svn.opensuse.org/viewcvs/yast?rev=38154&view=rev Log: installation network changes: http://lists.opensuse.org/yast-devel/2007-05/msg00025.html Added: trunk/network/src/routines/save_network.ycp - copied, changed from r37972, trunk/network/src/routines/install.ycp Removed: trunk/network/src/installation/inst_netsetup.ycp trunk/network/src/routines/install.ycp trunk/network/testsuite/tests/install.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/installation/Makefile.am trunk/network/src/modules/Lan.ycp trunk/network/src/modules/NetworkStorage.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38154&r1=381… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon May 28 10:20:39 2007 @@ -1 +1 @@ -2.15.33 +2.15.34 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon May 28 10:20:39 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 28 10:20:08 CEST 2007 - mzugec(a)suse.cz + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.34 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/network/src/installation/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/Makefil… ============================================================================== --- trunk/network/src/installation/Makefile.am (original) +++ trunk/network/src/installation/Makefile.am Mon May 28 10:20:39 2007 @@ -8,7 +8,7 @@ client_DATA = inst_ask_net_test.ycp inst_do_net_test.ycp \ inst_hostname.ycp \ - inst_netprobe.ycp inst_netsetup.ycp + inst_netprobe.ycp EXTRA_DIST = $(ynclude_DATA) $(client_DATA) $(ybin_SCRIPTS) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon May 28 10:20:39 2007 @@ -189,11 +189,6 @@ // FIXME: MOD list<string> DeletedModules = []; /** - * /etc/install.inf data - */ -map InstallInf = $[]; - -/** * Data was modified? */ boolean modified = false; @@ -312,7 +307,7 @@ } include "network/hardware.ycp"; -include "network/install.ycp"; +//include "network/install.ycp"; include "network/routines.ycp"; include "network/runtime.ycp"; @@ -439,7 +434,7 @@ if(Abort()) return false; /* Progress step 7/9 */ ProgressNextStage(_("Reading installation information...")); - ReadInstallInf(); +// ReadInstallInf(); sleep(sl); if(Abort()) return false; @@ -1559,9 +1554,10 @@ } else { // this is the first interface, match the hardware with install.inf - +/* + // couldn't happen if (size(InstallInf)>0){ - /* Select the one from install.inf with the same MAC */ + // Select the one from install.inf with the same MAC // find H["mac"] == InstallInf["hwaddr"] if (tosel == nil ) { string hwaddr = InstallInf["hwaddr"]:""; @@ -1571,7 +1567,7 @@ y2milestone("Rule: matching hwaddr in install.inf"); } - /* Select the one from install.inf with the same module */ + // Select the one from install.inf with the same module // find H["module"] == InstallInf["module"] if (tosel == nil) { string infmodule = InstallInf["module"]:""; @@ -1580,7 +1576,9 @@ } y2milestone("Rule: matching module in install.inf"); } - } else{ + } else +*/ + { /* No install.inf -> select the first connected */ // find H["active"] == true if (tosel == nil) { @@ -1675,7 +1673,7 @@ global define boolean ProposeInterfaces () { y2milestone("Hardware=%1", Hardware); - y2milestone("InstallInf=%1", InstallInf); +// y2milestone("InstallInf=%1", InstallInf); y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config); y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP); @@ -1710,7 +1708,7 @@ /* Some HW found -> use it for proposal */ if(size(Hardware) > 0) { if (Arch::s390()){ - tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); +// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); } else tosel = FindMatchingDevice($[]); @@ -1720,6 +1718,7 @@ y2debug("Hardware=%1", Hardware); y2milestone ("Selected HW w/o install.inf patches: %1", tosel); +/* // do not select a card without a driver, #29296 if (tosel != nil) { @@ -1736,12 +1735,12 @@ // SelectHW relies on the detected info (eg. busid) from hwinfo // which is not in install.inf + if (InstallInf["module"]:"" != "") { y2milestone ("Using driver module from install.inf"); tosel["module"] = InstallInf["module"]:""; } - // L3 bug: 75720 // Setup module options available from /etc/install.inf string _options = InstallModuleOptions(tosel["module"]:""); @@ -1755,9 +1754,9 @@ // set layer2 status from /etc/install.inf qeth_layer2 = (InstallInf["QETH_LAYER2_SUPPORT"]:"0"=="1")?true:false; qeth_macaddress = InstallInf["LLADDR"]:""; - } - /* Nothing detected -> use InstallInf */ + // Nothing detected -> use InstallInf + else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1775,10 +1774,12 @@ type = InstallInf["type"]:"eth"; device = NetworkDevices::GetFreeDevice(type); } + else { y2milestone("No hardware, no install.inf -> no proposal."); return false; } +*/ // here we know the hardware and could fill the interface defaults for it, // like for wifi usercontrol and for eth|wifi ifplugd. @@ -1788,24 +1789,24 @@ SetDefaultsForHW (); // #145041 - ethtool_options = InstallInf["ethtool_options"]:""; +// ethtool_options = InstallInf["ethtool_options"]:""; // #176804 - if (NetworkStorage::RootIsOnNetwork ()) + if (NetworkStorage::RootIsOnNetwork ("/")) { startmode = "nfsroot"; y2milestone ("startmode nfsroot"); } - ipaddr = InstallInf["ipaddr"]:""; - bootproto = InstallInf["bootproto"]:"static"; +// ipaddr = InstallInf["ipaddr"]:""; +// bootproto = InstallInf["bootproto"]:"static"; y2debug("ipaddr,bootproto=%1,%2", ipaddr, bootproto); if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { y2milestone("static proposal"); /* propose address setup from /etc/install.inf */ - netmask = InstallInf["netmask"]:""; +// netmask = InstallInf["netmask"]:""; if(netmask == nil || netmask == "") netmask = "255.255.255.0"; } @@ -1854,12 +1855,13 @@ return false; } +/* y2milestone ("hostname from install.inf"); if (! DNS::ReadHostDomain (InstallInf["hostname"]:"", InstallInf["domain"]:"")) { y2milestone ("hostname from dns"); - /* try to get hostname from the network */ + // try to get hostname from the network string hnent = Detection::ResolveIP(ipaddr); //last resort - generate random hostname (#165269) @@ -1876,7 +1878,7 @@ } } - +*/ return true; } @@ -1887,10 +1889,10 @@ global define boolean ProposeRoutesAndResolver () { if(bootproto == "static" && ipaddr != "" && ipaddr != nil) { /* propose default gateway from /etc/install.inf */ - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); /* propose DNS setup from /etc/install.inf */ - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); ProposeHostname (); } return true; @@ -1946,6 +1948,7 @@ SelectHWMap(tosel); } /* Nothing detected -> use InstallInf */ +/* else if(size(InstallInf) > 0) { if(!haskey(InstallInf, "module")) { @@ -1955,9 +1958,10 @@ NetworkModules::Alias = InstallInf["module"]:""; NetworkModules::Options = InstallInf["options"]:""; - type = InstallInf["type"]:"eth"; +// type = InstallInf["type"]:"eth"; device = NetworkDevices::GetFreeDevice(type); } +*/ else { y2milestone("No hardware, no install.inf -> no autoinstallation possible."); return false; @@ -1990,7 +1994,7 @@ } Commit(); }); - } + } else { y2milestone ("no interface configuration, taking it from install.inf"); @@ -2002,12 +2006,12 @@ if (autoinstall_settings["routing", "routes"]:[] == []) { y2milestone ("gateway from install.inf"); - Routing::ReadFromGateway (InstallInf["gateway"]:""); +// Routing::ReadFromGateway (InstallInf["gateway"]:""); } if (autoinstall_settings["dns", "nameservers"]:[] == []) { y2milestone ("nameserver from install.inf"); - DNS::ReadNameserver (InstallInf["nameserver"]:""); +// DNS::ReadNameserver (InstallInf["nameserver"]:""); } if (autoinstall_settings["dns", "hostname"]:"" == "") { @@ -2037,7 +2041,7 @@ global define list<map> PrepareForAutoinst() { - ReadInstallInf(); +// ReadInstallInf(); Hardware = ReadHardware("netcard"); return Hardware; } Modified: trunk/network/src/modules/NetworkStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetworkStora… ============================================================================== --- trunk/network/src/modules/NetworkStorage.ycp (original) +++ trunk/network/src/modules/NetworkStorage.ycp Mon May 28 10:20:39 2007 @@ -13,16 +13,37 @@ module "NetworkStorage"; +global string getDevice(string mount_point){ + map out = (map)SCR::Execute(.target.bash_output, sformat("grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1|tr -d '\n'", mount_point)); + string device=deletechars(out["stdout"]:"", "1234567890"); + y2internal("%1", device); + return device; +} + +global boolean isDiskOnNetwork(string device){ + boolean ret=false; + foreach(map<string, any> disk, (list<map<string, any> >)SCR::Read(.probe.disk), { + y2milestone("%1", disk["dev_name"]:""); +y2internal("%1", device); + if (disk["dev_name"]:""==device){ + foreach(string row, disk["dev_names"]:[], { + if (issubstring(row, "iscsi")) ret=true; + }); + } + }); + return ret; +} + /** * If the root is on a networked device (NFS, ISCSI), * the main NIC needs STARTMODE nfsroot instead of auto. * @return root dev over network */ -global boolean RootIsOnNetwork () { +global boolean RootIsOnNetwork (string root) { // in create_interface script there is similar code (if some changes needed, don't forget check also that file) // in case that parameter "root=..." is not defined (read from /proc/cmdline) say that device is NOT network - string iscsi_cmd = " - ROOT_DISK=$(grep ' / ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); + string iscsi_cmd = sformat(" + ROOT_DISK=$(grep ' %1 ' /proc/mounts|grep -v rootfs|cut -d' ' -f1); if [ -n \"$(echo $ROOT_DISK|grep 'by-id\\|by-uuid\\|by-path\\|by-label')\" ] then echo by-id or by-UUID or by-path or by-label @@ -32,7 +53,6 @@ ROOTPART=${ROOT_DISK##*/} fi - echo ROOTPART=\"$ROOTPART\" # use * and .. to get to the device containing ROOTPART case `cd -P /sys/block/*/\"$ROOTPART\"/../device && pwd` in *session*) @@ -41,7 +61,7 @@ IS_ISCSI=false ;; esac $IS_ISCSI -"; +", root); map out = (map) SCR::Execute (.target.bash_output, iscsi_cmd); y2milestone ("%1", out); return out["exit"]:-1 == 0; Copied: trunk/network/src/routines/save_network.ycp (from r37972, trunk/network/src/routines/install.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/save_networ… ============================================================================== --- trunk/network/src/routines/install.ycp (original) +++ trunk/network/src/routines/save_network.ycp Mon May 28 10:20:39 2007 @@ -16,6 +16,16 @@ import "Hostname"; import "IP"; import "NetworkDevices"; +import "FileUtils"; +import "Netmask"; +import "NetworkStorage"; +import "Installation"; +import "String"; + +map <string, any> InstallInf = $[]; + +// global variable because chrooted environment +boolean network_disk=false; /** * Read one install.inf item @@ -26,8 +36,10 @@ define boolean ReadInstallInfItem(path install_inf, string item, string var) { if(item == nil || item == "" || var == nil || var == "") return false; string val = (string) SCR::Read(add(install_inf, var)); +//y2internal("val %1 %2", item, val); if(val == nil) return false; if(val != "") InstallInf[item] = val; +//y2internal("%1", InstallInf); return true; } @@ -42,8 +54,6 @@ */ define boolean ReadInstallInf() { - InstallInf = $[]; - /* Detect install.inf location */ path install_inf = nil; if(SCR::Read(.target.size,"/etc/install.inf") > 0) { @@ -60,15 +70,21 @@ /* Read install.inf items */ ReadInstallInfItem(install_inf, "ipaddr", "IP"); ReadInstallInfItem(install_inf, "netmask", "Netmask"); + ReadInstallInfItem(install_inf, "bcast", "Broadcast"); + ReadInstallInfItem(install_inf, "remote_ip", "Pointopoint"); + ReadInstallInfItem(install_inf, "mtu", "IP_MTU"); ReadInstallInfItem(install_inf, "bootproto", "NetConfig"); ReadInstallInfItem(install_inf, "netdevice", "Netdevice"); ReadInstallInfItem(install_inf, "gateway", "Gateway"); ReadInstallInfItem(install_inf, "nameserver", "Nameserver"); + ReadInstallInfItem(install_inf, "domain", "Domain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); - ReadInstallInfItem(install_inf, "options", "Options"); +// ReadInstallInfItem(install_inf, "options", "Options"); ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); ReadInstallInfItem(install_inf, "ethtool_options", "ethtool"); + ReadInstallInfItem(install_inf, "unique", "NetUniqueID"); + ReadInstallInfItem(install_inf, "connect_wait", "ConnectWait"); ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); @@ -77,9 +93,8 @@ string netdevice = InstallInf["netdevice"]:""; if(netdevice != "") { string devtype = NetworkDevices::device_type(netdevice); - if(devtype != nil && devtype != "") - InstallInf["type"] = devtype; - InstallInf = remove(InstallInf, "netdevice"); + if(devtype != nil && devtype != "") InstallInf["type"] = devtype; +// InstallInf = remove(InstallInf, "netdevice"); } /* Split FQ hostname */ @@ -150,6 +165,229 @@ return ""; } +map<string, any> getcfg(string options, string device){ + map <string, any> cfg=$[]; + map <string, any> output = (map <string, any>)SCR::Execute(.target.bash_output, + sformat("getcfg %1 %2", options, device)); +// if (output["exit"]:0==0){ + foreach(string row, splitstring(output["stdout"]:"", "\n"), { + row=deletechars(row, "\\\"\;"); + list<string> keyval=splitstring(row, "="); + if (size(keyval)>1) cfg[keyval[0]:""]=keyval[1]:""; + + }); +// } + y2milestone("%1 %2\n%3", options, device, cfg); + return cfg; +} + +string getHWFullPath(string hwfile){ + return sformat("%1/hwcfg-%2", "/etc/sysconfig/hardware", hwfile); +} + + +map <string,any> hwcfg=$[]; + +string CreateHardwareFile(){ + string hwfile=""; + + // read current hardware information and check if configuration file exists + hwcfg=getcfg("-f hwcfg- -d /etc/sysconfig/hardware", InstallInf["netdevice"]:""); + if( tointeger(hwcfg["HWD_CONFIG_N"]:"0")==0 ){ + y2internal("hwcfg doesn't exist"); + // check if deriver is connected to bus + if (tointeger(hwcfg["HWD_BUS_N"]:"0")>0){ + string busname = hwcfg[sformat("HWD_BUSNAME_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + string busid = hwcfg[sformat("HWD_BUSID_%1", tointeger(hwcfg["HWD_BUS_N"]:"0")-1)]:""; + if (busname == "vio" && FileUtils::IsDirectory("/proc/iSeries")){ + // Bug 159652 - LTC22358 - no hwcfg-static files created for iseries_veth + hwfile = sformat("static-0"); + y2warning("vio bus type, using %1", hwfile); + } else { + hwfile = sformat("bus-%1-%2", busname, busid); + y2internal("will create hwcfg file %1", hwfile); + } + + } else { + hwfile = sformat("static-0"); + y2error("Not connected to bus! Using %1", hwfile); + } + string content=sformat("STARTMODE='auto'\nMODULE='%1'\nMODULE_OPTIONS='%2'\n", InstallInf["module"]:"", InstallInf["options"]:""); + y2internal ("creating %1 file\n%2", hwfile, content); + SCR::Write(.target.string, getHWFullPath(hwfile), content); + }else { + // in case of s390 hwcfg is created by Linuxrc (uli) + y2warning("hwcfg already exists"); + hwfile = hwcfg[sformat("HWD_CONFIG_%1", tointeger(hwcfg["HWD_CONFIG_N"]:"0")-1)]:""; + y2internal("configuration name = %1", hwfile); + } + y2internal("Hardware file: %1", getHWFullPath(hwfile)); + + return hwfile; +} + +string getIfcName(string hwfile){ + string ifcfg=""; + string interfacetype = NetworkDevices::device_type( hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:"" ); + // for special s390 interface types write static configuration + if (contains(["qeth", "hsi", "ctc", "lcs", "iucv"], interfacetype)){ + y2internal("special device type %1", interfacetype); + ifcfg=sformat("ifcfg-%1", hwfile); + } else { + y2internal("usual type %1", interfacetype); + // if MAC available - use it for name + if (size(hwcfg["HWD_ID"]:"")>0){ + ifcfg = sformat("ifcfg-%1-id-%2", interfacetype, hwcfg["HWD_ID"]:""); + y2internal("MAC address available - use it for name %1", ifcfg); + } else { + // in case MAC is not available, use device name (eth0) + ifcfg = sformat("ifcfg-%1", hwcfg[sformat("HWD_INTERFACE_%1", tointeger(hwcfg["HWD_INTERFACE_N"]:"0")-1)]:""); + y2internal("MAC address not available - use device name %1", ifcfg); + } + } + y2internal("interface configuration file %1", ifcfg); + return ifcfg; +} + +void CreateIfcfg(string hwcfg, string ifcfg){ + string network_configuration=""; + // set BOOTPROTO=[ static | dhcp ] + if (InstallInf["bootproto"]:"dhcp"=="static") { + // add broadcast interface #suse49131 + network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", + InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); + } else { + network_configuration="BOOTPROTO='dhcp'\n"; + // set DHCP_SET_HOSTNAME=yes #suse30528 + y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); + SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + } + + // if available, write MTU + if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + + + if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); + + if (size(InstallInf["unique"]:"")>0) + { + // write UNIQUE - #suse25739 + network_configuration = sformat("%1UNIQUE='%2'\n", network_configuration, InstallInf["unique"]:""); + // write UDI + list<map> cards=(list<map>)SCR::Read(.probe.netcard); + foreach(map card, cards, { + if (card["unique_key"]:""==InstallInf["unique"]:"") network_configuration = sformat("%1udi='%2'\n", network_configuration, card["udi"]:""); + }); + } + + if (network_disk){ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + } else{network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + } + + // reference to hardware configuration + network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); + + // point to point interface + if (size(InstallInf["remote_ip"]:"")>0)network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); + + + y2internal("Network Configuration:\n%1\n%2", network_configuration, ifcfg); + + // write only if file doesn't exists + string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); +// string dev_file=sformat("/tmp/%1", ifcfg); + if (!FileUtils::Exists(dev_file)) { + SCR::Write(.target.string, dev_file, network_configuration); + y2internal("ifcfg file: %1", dev_file); + } + else y2warning("File exists %1", dev_file); +} + +/* + * create all network files except ifcfg and hwcfg + * directly to installed system + */ + +void CreateOtherNetworkFiles(){ + // create routes file + if (size(InstallInf["gateway"]:"")>0){ + y2milestone("Writing route : %1", InstallInf["gateway"]:""); + SCR::Write(.target.string, "/etc/sysconfig/network/routes", InstallInf["gateway"]:""); + } else y2warning("No routing information in install.inf"); + + // create hostname + if (size(InstallInf["hostname"]:"")>0){ + y2milestone("Write HOSTANAME: %1", InstallInf["hostname"]:""); + SCR::Write(.target.string, "/etc/HOSTNAME", InstallInf["hostname"]:""); + } + + // create resolv.conf + if (size(InstallInf["domain"]:"")>0 && size(InstallInf["nameserver"]:"")>0){ + string text=sformat("domain %1 +nameserver %2", InstallInf["domain"]:"", InstallInf["nameserver"]:""); + y2milestone("Write resolv.conf content: %1", text); + SCR::Write(.target.string, "/etc/resolv.conf", text); + } + + // create defaultdomain + if (size(InstallInf["domain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ + y2milestone("Write defaultdomain: %1", InstallInf["domain"]:""); + SCR::Write(.target.string, "/etc/defaultdomain", InstallInf["domain"]:""); + } + + // write wait_for_interfaces if needed + if (size(InstallInf["connect_wait"]:"")>0){ + SCR::Execute(.target.bash_output, sformat("sed -i s/^WAIT_FOR_INTERFACES=.*/WAIT_FOR_INTERFACES=%1/g /etc/sysconfig/network/config", InstallInf["connect_wait"]:"")); + } +} + +/* + * this replaces bash script create_interface + */ +void save_network(){ + + // skip from chroot + integer old_SCR = WFM::SCRGetDefault (); + integer new_SCR = WFM::SCROpen ("chroot=/:scr", false); + WFM::SCRSetDefault (new_SCR); + + SCR::Execute(.target.bash, sformat("cp /etc/sysconfig/hardware/* %1/etc/sysconfig/hardware/ 2>/dev/null", Installation::destdir)); + + // when root is on nfs/iscsi set startmode=nfsroot #176804 + string device = NetworkStorage::getDevice( Installation::destdir ); + y2internal("%1 directory is on %2 device", Installation::destdir, device); + network_disk = NetworkStorage::isDiskOnNetwork( device ); + + // -------------------------------------------------------------- + // Copy DHCP client cache so that we can request the same IP (#43974). + WFM::Execute (.local.bash, sformat ( + "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", + "/var/lib/dhcpcd", + String::Quote (Installation::destdir))); + + // close and chroot back + WFM::SCRClose (new_SCR); + WFM::SCRSetDefault (old_SCR); + + if(ReadInstallInf()){ + string hwcfg = CreateHardwareFile(); + string ifcfg = getIfcName(hwcfg); + + CreateIfcfg(hwcfg, ifcfg); + CreateOtherNetworkFiles(); + + SCR::Execute(.target.bash, "chkconfig network on"); + + // if portmap running - start it after reboot + WFM::Execute (.local.bash, + "pidofproc portmap && touch /var/lib/YaST2/network_install_portmap"); + + + } else + y2error("Error while reading install.inf!"); + +} +save_network(); /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38153 - in /trunk/installation: VERSION control/control.openSUSE.xml control/control.xml package/yast2-installation.changes src/clients/network_finish.ycp startup/Second-Stage/S07-medium
by mzugec＠svn.opensuse.org 28 May '07

28 May '07

Author: mzugec Date: Mon May 28 10:16:01 2007 New Revision: 38153 URL: http://svn.opensuse.org/viewcvs/yast?rev=38153&view=rev Log: installation network changes: http://lists.opensuse.org/yast-devel/2007-05/msg00025.html Modified: trunk/installation/VERSION trunk/installation/control/control.openSUSE.xml trunk/installation/control/control.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/network_finish.ycp trunk/installation/startup/Second-Stage/S07-medium Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38153&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon May 28 10:16:01 2007 @@ -1 +1 @@ -2.15.26 +2.15.27 Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 28 10:16:01 2007 @@ -512,12 +512,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -596,12 +590,6 @@ </module> <module> <label>Check Installation</label> - <name>netsetup</name> - <enable_back>no</enable_back> - <enable_next>no</enable_next> - </module> - <module> - <label>Check Installation</label> <name>netprobe</name> <enable_back>no</enable_back> <enable_next>no</enable_next> @@ -754,10 +742,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/control/control.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.xml… ============================================================================== --- trunk/installation/control/control.xml (original) +++ trunk/installation/control/control.xml Mon May 28 10:16:01 2007 @@ -501,10 +501,6 @@ <modules config:type="list"> <module> <label>Perform Update</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Update</label> <name>rpmcopy</name> </module> <module> @@ -573,10 +569,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> @@ -732,10 +724,6 @@ <modules config:type="list"> <module> <label>Perform Installation</label> - <name>netsetup</name> - </module> - <module> - <label>Perform Installation</label> <name>netprobe</name> </module> <module> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon May 28 10:16:01 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun May 27 14:49:37 CEST 2007 - mzugec(a)suse.de + +- installation network changes: +http://lists.opensuse.org/yast-devel/2007-05/msg00025.html +- 2.15.27 + +------------------------------------------------------------------- Tue May 22 10:51:57 CEST 2007 - ug(a)suse.de - reactivate hardware detection during autoinstall Modified: trunk/installation/src/clients/network_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/network… ============================================================================== --- trunk/installation/src/clients/network_finish.ycp (original) +++ trunk/installation/src/clients/network_finish.ycp Mon May 28 10:16:01 2007 @@ -48,19 +48,18 @@ } else if (func == "Write") { - if (Linuxrc::display_ip () || Linuxrc::vnc () || Linuxrc::usessh ()) + + // if network running, write network configuration + map output = (map)SCR::Execute(.target.bash_output, + "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'"); + if (issubstring(output["stdout"]:"", "network")) { - y2milestone("Creating network interface"); - WFM::Execute (.local.bash, - "/sbin/create_interface '" + String::Quote (Installation::destdir) + "'"); + y2milestone("Save network configuration"); + WFM::CallFunction ("save_network"); ModulesConf::RunDepmod (false); + + } - // -------------------------------------------------------------- - // Copy DHCP client cache so that we can request the same IP (#43974). - WFM::Execute (.local.bash, sformat ( - "mkdir -p '%2%1'; /bin/cp -p %1/dhcpcd-*.cache '%2%1'", - "/var/lib/dhcpcd", - String::Quote (Installation::destdir))); } else { Modified: trunk/installation/startup/Second-Stage/S07-medium URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/Second-Stag… ============================================================================== --- trunk/installation/startup/Second-Stage/S07-medium (original) +++ trunk/installation/startup/Second-Stage/S07-medium Mon May 28 10:16:01 2007 @@ -1,5 +1,5 @@ #!/bin/sh -log "Starting S08-medium..." +log "Starting S07-medium..." log "======================" #============================================= @@ -7,43 +7,36 @@ #--------------------------------------------- Y2_NETWORK_ACTIVE=0 Y2_SSH_ACTIVE=0 -USE_SSH=0 -VNC=0 log "\tChecking kernel commandline..." #============================================= # 11.1 start shell on second virtual console #--------------------------------------------- if ! got_install_param '^NoShell:.*1' ; then - log "\tGot kernel parameter <NoShell> -> start shell on tty2" - SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` + log "\tGot kernel parameter <NoShell> -> start shell on tty2" + SPID=`/usr/lib/YaST2/bin/startshell /dev/tty2` fi + #============================================= -# 11.2) prepare for VNC installation +# 11.1) activate network if counfiguration found #--------------------------------------------- -if got_install_param '^VNC:.*1' ; then - log "\tGot kernel parameter VNC -> export VNC variable" - export VNC=1 +if [ ! -z $(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo') ] ;then + log "\tnetwork configuration found -> activate network" + rcnetwork start && Y2_NETWORK_ACTIVE=1 + +# firewall is started by rcnetwork +# rcSuSEfirewall2 reload + + +# if nfs:// is used for install source or add-on (reminder /var/lib/YaST2/network_install_portmap), +# start rcportmap + +[ -f /var/lib/YaST2/network_install_portmap ] && rcportmap start + fi -#============================================= -# 11.3) prepare for SSH installation -#--------------------------------------------- if got_install_param '^UseSSH:.*1' ; then log "\tGot kernel parameter UseSSH -> export UseSSH variable" - export USE_SSH=1 -fi -#============================================= -# 11.4) activate network for SSH, VNC, or remote X11 inst. -#--------------------------------------------- -if [ $VNC -eq 1 ] || [ $USE_SSH -eq 1 ] || [ -n "$Display_IP" ] ;then - log "\tVNC/SSH/remote X11 installation used -> activate network" - rcnetwork start && Y2_NETWORK_ACTIVE=1 - rcSuSEfirewall2 reload -fi -if [ $USE_SSH -eq 1 ];then rcsshd start && Y2_SSH_ACTIVE=1 fi log "\tSummary for commandline checks:" log "\tY2_NETWORK_ACTIVE = $Y2_NETWORK_ACTIVE" log "\tY2_SSH_ACTIVE = $Y2_SSH_ACTIVE" -log "\tUSE_SSH = $USE_SSH" -log "\tVNC = $VNC" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38152 - /tags/stable-2_15_3/sysconfig/
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 07:22:52 2007 New Revision: 38152 URL: http://svn.opensuse.org/viewcvs/yast?rev=38152&view=rev Log: Created tag stable-2_15_3 for sysconfig Added: tags/stable-2_15_3/sysconfig/ - copied from r38151, trunk/sysconfig/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38151 - in /trunk/sysconfig: VERSION package/yast2-sysconfig.changes src/sysconfig.ycp src/wizards.ycp
by lslezak＠svn.opensuse.org 28 May '07

28 May '07

Author: lslezak Date: Mon May 28 07:21:56 2007 New Revision: 38151 URL: http://svn.opensuse.org/viewcvs/yast?rev=38151&view=rev Log: - check UID after evaluating command line arguments (#269909) - 2.15.3 Modified: trunk/sysconfig/VERSION trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/sysconfig.ycp trunk/sysconfig/src/wizards.ycp Modified: trunk/sysconfig/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/VERSION?rev=38151&r1=3… ============================================================================== --- trunk/sysconfig/VERSION (original) +++ trunk/sysconfig/VERSION Mon May 28 07:21:56 2007 @@ -1 +1 @@ -2.15.2 +2.15.3 Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfi… ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Mon May 28 07:21:56 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 28 07:16:57 CEST 2007 - lslezak(a)suse.cz + +- check UID after evaluating command line arguments (#269909) +- 2.15.3 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/sysconfig/src/sysconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/sysconfig.ycp?rev=… ============================================================================== --- trunk/sysconfig/src/sysconfig.ycp (original) +++ trunk/sysconfig/src/sysconfig.ycp Mon May 28 07:21:56 2007 @@ -23,7 +23,6 @@ import "Sysconfig"; import "CommandLine"; -import "Confirm"; include "sysconfig/wizards.ycp"; include "sysconfig/cmdline.ycp"; @@ -97,11 +96,6 @@ ] ]; -if (!Confirm::MustBeRoot()) -{ - return (any)`abort; -} - /* main ui function */ any ret = CommandLine::Run(cmdline); Modified: trunk/sysconfig/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/wizards.ycp?rev=38… ============================================================================== --- trunk/sysconfig/src/wizards.ycp (original) +++ trunk/sysconfig/src/wizards.ycp Mon May 28 07:21:56 2007 @@ -17,6 +17,7 @@ import "Popup"; import "Label"; import "Sequencer"; +import "Confirm"; include "sysconfig/complex.ycp"; include "sysconfig/dialogs.ycp"; @@ -65,6 +66,17 @@ return ret; } +define symbol CheckRoot() +{ + if (!Confirm::MustBeRoot()) + { + return `abort; + } + + return `next; +} + + /** * Whole configuration of sysconfig * @return sequence result @@ -72,13 +84,18 @@ define boolean SysconfigSequence() ``{ map aliases = $[ + "check" : [ ``( CheckRoot() ), true ], "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainSequence() ), "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ - "ws_start" : "read", + "ws_start" : "check", + "check" : $[ + `next : "read", + `abort : `abort + ], "read" : $[ `abort : `abort, `next : "main" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38150 - in /trunk/ncurses/src/pkg: NCPackageSelector.cc NCPkgNames.cc NCPkgNames.h
by kmachalkova＠svn.opensuse.org 25 May '07

25 May '07

Author: kmachalkova Date: Fri May 25 17:18:13 2007 New Revision: 38150 URL: http://svn.opensuse.org/viewcvs/yast?rev=38150&view=rev Log: Fix disappearing 'Etc./All Packages List' submenu after unchecking AutoDependency Check Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc trunk/ncurses/src/pkg/NCPkgNames.cc trunk/ncurses/src/pkg/NCPkgNames.h Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Fri May 25 17:18:13 2007 @@ -1589,23 +1589,18 @@ "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," "`item( `id(\"testcase\"), \"%s\" )" -#ifdef FIXME "," - "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" -#endif + "`menu( \"%s\", [`item( `id(\"export\"), \"%s\" ), `item( `id(\"import\"), \"%s\" ) ] )" "] )", NCPkgNames::MenuEtc().c_str(), NCPkgNames::MenuDeps().c_str(), NCPkgNames::MenuCheckDeps().c_str(), NCPkgNames::MenuNoAutoDeps().c_str(), NCPkgNames::MenuVerifySystem().c_str(), - NCPkgNames::MenuTestCase().c_str() -#ifdef FIXME - , - NCPkgNames::MenuSel().c_str(), - NCPkgNames::MenuSaveSel().c_str(), - NCPkgNames::MenuLoadSel().c_str() -#endif + NCPkgNames::MenuTestCase().c_str(), + NCPkgNames::MenuList().c_str(), + NCPkgNames::MenuExportList().c_str(), + NCPkgNames::MenuImportList().c_str() ); @@ -1628,23 +1623,18 @@ "`MenuButton( \"%s\", [" "`menu( \"%s\", [`item( `id(\"showdeps\"), \"%s\" ), `item( `id(\"autodeps\"), \"%s\" ), `item ( `id(\"verifysystem\"), \"%s\" ) ] )," "`item( `id(\"testcase\"), \"%s\" )" -#ifdef FIXME "," - "`menu( \"%s\", [`item( `id(\"save\"), \"%s\" ), `item( `id(\"load\"), \"%s\" ) ] )" -#endif + "`menu( \"%s\", [`item( `id(\"export\"), \"%s\" ), `item( `id(\"import\"), \"%s\" ) ] )" "] )", NCPkgNames::MenuEtc().c_str(), NCPkgNames::MenuDeps().c_str(), NCPkgNames::MenuCheckDeps().c_str(), NCPkgNames::MenuAutoDeps().c_str(), NCPkgNames::MenuVerifySystem().c_str(), - NCPkgNames::MenuTestCase().c_str() -#ifdef FIXME - , - NCPkgNames::MenuSel().c_str(), - NCPkgNames::MenuSaveSel().c_str(), - NCPkgNames::MenuLoadSel().c_str() -#endif + NCPkgNames::MenuTestCase().c_str(), + NCPkgNames::MenuList().c_str(), + NCPkgNames::MenuExportList().c_str(), + NCPkgNames::MenuImportList().c_str() ); Modified: trunk/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.cc?re… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.cc (original) +++ trunk/ncurses/src/pkg/NCPkgNames.cc Fri May 25 17:18:13 2007 @@ -1339,24 +1339,24 @@ return value; } -const string NCPkgNames::MenuSel() +const string NCPkgNames::MenuList() { // submenu: selections - static const string value = _( "&Selections" ); + static const string value = _( "All &Packages List" ); return value; } -const string NCPkgNames::MenuSaveSel() +const string NCPkgNames::MenuExportList() { // menu entry - static const string value = _( "S&ave Selection" ); + static const string value = _( "&Export to File" ); return value; } -const string NCPkgNames::MenuLoadSel() +const string NCPkgNames::MenuImportList() { // last menu entry of the Etc. menu - static const string value = _( "&Load Selection" ); + static const string value = _( "&Import from File" ); return value; } Modified: trunk/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgNames.h?rev… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgNames.h (original) +++ trunk/ncurses/src/pkg/NCPkgNames.h Fri May 25 17:18:13 2007 @@ -879,9 +879,9 @@ static const string MenuNoAutoDeps(); static const string MenuVerifySystem(); static const string MenuTestCase(); - static const string MenuSel(); - static const string MenuSaveSel(); - static const string MenuLoadSel(); + static const string MenuList(); + static const string MenuExportList(); + static const string MenuImportList(); static const string MoreText(); static const string TabooText(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38149 - /tags/stable-2_15_14/online-update/
by jsuchome＠svn.opensuse.org 25 May '07

25 May '07

Author: jsuchome Date: Fri May 25 16:36:22 2007 New Revision: 38149 URL: http://svn.opensuse.org/viewcvs/yast?rev=38149&view=rev Log: Created tag stable-2_15_14 for online-update Added: tags/stable-2_15_14/online-update/ - copied from r38148, trunk/online-update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38148 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/OnlineUpdateCallbacks.ycp
by jsuchome＠svn.opensuse.org 25 May '07

25 May '07

Author: jsuchome Date: Fri May 25 16:36:12 2007 New Revision: 38148 URL: http://svn.opensuse.org/viewcvs/yast?rev=38148&view=rev Log: - DonePackage and DoneProvide callbacks return "I" (#277351) - 2.15.14 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/OnlineUpdateCallbacks.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=38148&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Fri May 25 16:36:12 2007 @@ -1 +1 @@ -2.15.13 +2.15.14 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Fri May 25 16:36:12 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 25 16:12:47 CEST 2007 - jsuchome(a)suse.cz + +- DonePackage and DoneProvide callbacks return "I" (#277351) +- 2.15.14 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/online-update/src/OnlineUpdateCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/OnlineUpdateCa… ============================================================================== --- trunk/online-update/src/OnlineUpdateCallbacks.ycp (original) +++ trunk/online-update/src/OnlineUpdateCallbacks.ycp Fri May 25 16:36:12 2007 @@ -31,7 +31,8 @@ */ global define boolean PatchProgressCallback (integer num) { - last_callback = "PatchProgressCallback"; + // do not save this one - we need to store Start/Done pairs + // last_callback = "PatchProgressCallback"; y2debug("PatchProgressCallback %1", num); @@ -161,7 +162,7 @@ */ global string DonePackage (integer error, string reason) { string ret = PackageCallbacks::DonePackage (error, reason); - if (ret == "") + if (ret == "I") { FinishLine (true); total_progress = total_progress + 1; @@ -182,7 +183,7 @@ */ global string DoneProvide (integer error, string reason, string name) { string ret = PackageCallbacks::DoneProvide (error, reason, name); - if (ret == "") + if (ret == "I") { if (last_callback == "StartProvide") FinishLine (false); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0