Author: jsuchome Date: Wed Mar 4 13:36:09 2009 New Revision: 55918 URL: http://svn.opensuse.org/viewcvs/yast?rev=55918&view=rev Log: - add GPG key correctly to the installkey.gpg keyring inside initrd (bnc#478975) - before signing a file check for its existence (bnc#481838) - 2.17.16 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/VERSION?rev=55918&r1=55917&r2=55918&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Wed Mar 4 13:36:09 2009 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes?rev=55918&r1=55917&r2=55918&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Wed Mar 4 13:36:09 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Mar 4 13:20:33 CET 2009 - jsuchome@suse.cz + +- add GPG key correctly to the installkey.gpg keyring inside initrd + (bnc#478975) +- before signing a file check for its existence (bnc#481838) +- 2.17.16 + +------------------------------------------------------------------- Thu Feb 19 15:46:59 CET 2009 - jsuchome@suse.cz - Image Creator: use SLES11 as a default target in template Modified: branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp?rev=55918&r1=55917&r2=55918&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Wed Mar 4 13:36:09 2009 @@ -778,8 +778,11 @@ // sign the content file boolean ret = GPG::SignAsciiDetached(keyid, dir + "/content", passphrase); - // sign the product file - ret = ret && GPG::SignAsciiDetached(keyid, dir + "/media.1/products", passphrase); + // sign the product file if exists + if (FileUtils::Exists (dir + "/media.1/products")) + { + ret = ret && GPG::SignAsciiDetached(keyid, dir + "/media.1/products", passphrase); + } y2milestone("Signed source: %1", ret); return ret; @@ -2034,6 +2037,29 @@ ret = Exec(command); if (!ret) return false; + if (new_file != "linuxrc.config") + { + // extract installkey.gpg from cpio archive + command = sformat ("cd '%1'; cpio -i -H newc -F '%2.cpio' installkey.gpg", + String::Quote(base), String::Quote(initrd_file)); + + ret = Exec(command); + if (!ret) return false; + + // add our new key to installkey.gpg keyring + command = sformat ("cd '%1'; gpg --no-default-keyring --keyring ./installkey.gpg --import '%2'", + String::Quote(base), String::Quote(new_file)); + ret = Exec(command); + if (!ret) return false; + + // place new installkey.gpg back to the archive + command = sformat ("cd '%1' && echo installkey.gpg | cpio -o -H newc -A -F '%2.cpio'", + String::Quote(base), String::Quote(initrd_file)); + + ret = Exec(command); + if (!ret) return false; + } + // compress the archive, remove the temporary files command = sformat("gzip --best < '%1.cpio' > '%1' && rm -f '%1.cpio' '%2'", String::Quote(initrd_file), String::Quote(new_file)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org