138255 2006-06-27 12:35 0000 Fix support for livecd/fsops in livecd-stage2 2006-06-28 05:59:57 0000 1 1 1 Unclassified Gentoo Hosted Projects Catalyst unspecified All Linux RESOLVED FIXED InCVS P2 minor --- 1 kumba@gentoo.org catalyst@gentoo.org kumba@gentoo.org 2006-06-27 12:35:33 0000 The livecd/fsops parameter in livecd-stage2 has suffered some bitrot it appears. At one point, it was known as livecd/fs-ops, but has since moved. The attached patch allows catalyst to recognize livecd/fsops, removes the deprecation notice regarding fs-ops --> fsops, and fixes up a bash variable referencing the old deprecated variable name. kumba@gentoo.org 2006-06-27 12:36:08 0000 Created an attachment (id=90301) Fix livecd/fsops in livecd-stage2 kumba@gentoo.org 2006-06-27 12:44:27 0000 Created an attachment (id=90303) Remove redundant options from valid_values in livecd-stage2 Noticed in modules/livecd_stage2_target.py, that "livecd/users" and "gamecd/conf" is specified twice in self.valid_values. Fix this as well (apply this after the fsops patch) wolf31o2@gentoo.org 2006-06-28 05:53:58 0000 Added to CVS wolf31o2@gentoo.org 2006-06-28 05:59:57 0000 Fixed in 2.0_rc49 90301 2006-06-27 12:36 0000 Fix livecd/fsops in livecd-stage2 cat2-fix-fsops-option.patch text/plain ZGlmZiAtTmF1cnAgY2F0YWx5c3Qub3JpZy9tb2R1bGVzL2dlbmVyaWNfc3RhZ2VfdGFyZ2V0LnB5 IGNhdGFseXN0L21vZHVsZXMvZ2VuZXJpY19zdGFnZV90YXJnZXQucHkKLS0tIGNhdGFseXN0Lm9y aWcvbW9kdWxlcy9nZW5lcmljX3N0YWdlX3RhcmdldC5weQkyMDA2LTA2LTI2IDAyOjQ0OjU2IC0w NDAwCisrKyBjYXRhbHlzdC9tb2R1bGVzL2dlbmVyaWNfc3RhZ2VfdGFyZ2V0LnB5CTIwMDYtMDYt MjggMDE6NTU6NDIgLTA0MDAKQEAgLTM0NSwxMiArMzQ1LDYgQEAgY2xhc3MgZ2VuZXJpY19zdGFn ZV90YXJnZXQoZ2VuZXJpY190YXJnZQogCWRlZiBzZXRfZnNvcHMoc2VsZik6CiAJCWlmIHNlbGYu c2V0dGluZ3MuaGFzX2tleSgiZnN0eXBlIik6CiAJCQlzZWxmLnZhbGlkX3ZhbHVlcy5hcHBlbmQo ImZzb3BzIikKLQkJCWlmIHNlbGYuc2V0dGluZ3MuaGFzX2tleShzZWxmLnNldHRpbmdzWyJzcGVj X3ByZWZpeCJdKyIvZnMtb3BzIik6Ci0JCQkJcHJpbnQgIlxuXG5cbldhcm5pbmchISEiK3NlbGYu c2V0dGluZ3NbInNwZWNfcHJlZml4Il0rIi9mcy1vcHMiICsgImlzIGRlcHJlY2F0ZWQgYW5kIG1h eSBiZSByZW1vdmVkLiIKLQkJCQlwcmludCAiXHRVc2UgIitzZWxmLnNldHRpbmdzWyJzcGVjX3By ZWZpeCJdKyIvZnNvcHMiICsgImluc3RlYWQuXG5cblxuIgotCQkJCXNlbGYuc2V0dGluZ3NbImZz b3BzIl09c2VsZi5zZXR0aW5nc1tzZWxmLnNldHRpbmdzWyJzcGVjX3ByZWZpeCJdKyIvZnMtb3Bz Il0KLQkJCQlkZWwgc2VsZi5zZXR0aW5nc1tzZWxmLnNldHRpbmdzWyJzcGVjX3ByZWZpeCJdKyIv ZnMtb3BzIl0KLQkJCQogCQkJaWYgc2VsZi5zZXR0aW5ncy5oYXNfa2V5KHNlbGYuc2V0dGluZ3Nb InNwZWNfcHJlZml4Il0rIi9mc29wcyIpOgogCQkJCXNlbGYuc2V0dGluZ3NbImZzb3BzIl09c2Vs Zi5zZXR0aW5nc1tzZWxmLnNldHRpbmdzWyJzcGVjX3ByZWZpeCJdKyIvZnNvcHMiXQogCQkJCWRl bCBzZWxmLnNldHRpbmdzW3NlbGYuc2V0dGluZ3NbInNwZWNfcHJlZml4Il0rIi9mc29wcyJdCmRp ZmYgLU5hdXJwIGNhdGFseXN0Lm9yaWcvbW9kdWxlcy9saXZlY2Rfc3RhZ2UyX3RhcmdldC5weSBj YXRhbHlzdC9tb2R1bGVzL2xpdmVjZF9zdGFnZTJfdGFyZ2V0LnB5Ci0tLSBjYXRhbHlzdC5vcmln L21vZHVsZXMvbGl2ZWNkX3N0YWdlMl90YXJnZXQucHkJMjAwNi0wMS0xOCAwODowNjo0MCAtMDUw MAorKysgY2F0YWx5c3QvbW9kdWxlcy9saXZlY2Rfc3RhZ2UyX3RhcmdldC5weQkyMDA2LTA2LTI4 IDAxOjU0OjAzIC0wNDAwCkBAIC0yNCw4ICsyNCw4IEBAIGNsYXNzIGxpdmVjZF9zdGFnZTJfdGFy Z2V0KGdlbmVyaWNfc3RhZ2UKIAkJCSJsaXZlY2QvcmNhZGQiLCJsaXZlY2QvcmNkZWwiLCJsaXZl Y2QvZnNzY3JpcHQiLCJsaXZlY2QveGluaXRyYyIsXAogCQkJImxpdmVjZC9yb290X292ZXJsYXki LCJsaXZlY2QvZGV2bWFuYWdlciIsImxpdmVjZC91c2VycyIsXAogCQkJImdhbWVjZC9jb25mIiwi bGl2ZWNkL3VzZXJzIiwicG9ydGFnZV9vdmVybGF5IiwibGl2ZWNkL2NkZnN0eXBlIixcCi0JCQki bGl2ZWNkL2ZzdHlwZSIsImxpdmVjZC9saW51eHJjIiwibGl2ZWNkL2Jvb3RhcmdzIiwiZ2FtZWNk L2NvbmYiLFwKLQkJCSJsaXZlY2QveGRtIiwibGl2ZWNkL3hzZXNzaW9uIiwibGl2ZWNkL3ZvbGlk Il0pCisJCQkibGl2ZWNkL2ZzdHlwZSIsImxpdmVjZC9mc29wcyIsImxpdmVjZC9saW51eHJjIiwi bGl2ZWNkL2Jvb3RhcmdzIixcCisJCQkiZ2FtZWNkL2NvbmYiLCJsaXZlY2QveGRtIiwibGl2ZWNk L3hzZXNzaW9uIiwibGl2ZWNkL3ZvbGlkIl0pCiAJCQogCQlnZW5lcmljX3N0YWdlX3RhcmdldC5f X2luaXRfXyhzZWxmLHNwZWMsYWRkbGFyZ3MpCiAJCWlmIG5vdCBzZWxmLnNldHRpbmdzLmhhc19r ZXkoImxpdmVjZC90eXBlIik6CmRpZmYgLU5hdXJwIGNhdGFseXN0Lm9yaWcvdGFyZ2V0cy9zdXBw b3J0L2ZpbGVzeXN0ZW0tZnVuY3Rpb25zLnNoIGNhdGFseXN0L3RhcmdldHMvc3VwcG9ydC9maWxl c3lzdGVtLWZ1bmN0aW9ucy5zaAotLS0gY2F0YWx5c3Qub3JpZy90YXJnZXRzL3N1cHBvcnQvZmls ZXN5c3RlbS1mdW5jdGlvbnMuc2gJMjAwNS0xMi0xNiAxMzo1Nzo1NyAtMDUwMAorKysgY2F0YWx5 c3QvdGFyZ2V0cy9zdXBwb3J0L2ZpbGVzeXN0ZW0tZnVuY3Rpb25zLnNoCTIwMDYtMDYtMjggMDI6 MDQ6NDMgLTA0MDAKQEAgLTUzLDcgKzUzLDcgQEAgY3JlYXRlX25vbG9vcCgpIHsKIGNyZWF0ZV9z cXVhc2hmcygpIHsKIAllY2hvICJDcmVhdGluZyBzcXVhc2hmcy4uLiIKIAlleHBvcnQgbG9vcG5h bWU9ImltYWdlLnNxdWFzaGZzIgotCW1rc3F1YXNoZnMgIiR7Y2xzdF9kZXN0cGF0aH0iICIkMS8k e2xvb3BuYW1lfSIgJHtjbHN0X2ZzX29wc30gLW5vYXBwZW5kIFwKKwlta3NxdWFzaGZzICIke2Ns c3RfZGVzdHBhdGh9IiAiJDEvJHtsb29wbmFtZX0iICR7Y2xzdF9mc29wc30gLW5vYXBwZW5kIFwK IAkJfHwgZGllICJta3NxdWFzaGZzIGZhaWxlZCwgZGlkIHlvdSBlbWVyZ2Ugc3F1YXNoZnMtdG9v bHM/IgogfQogCkBAIC02MSw3ICs2MSw3IEBAIGNyZWF0ZV9qZmZzKCkgewogCWVjaG8gIkNyZWF0 aW5nIGpmZnMuLi4iCiAJZXhwb3J0IGxvb3BuYW1lPSJpbWFnZS5qZmZzIgogCSMgZnNfY2hlY2sg L3Vzci9zYmluL21rZnMuamZmcyBqZmZzIHN5cy1mcy9tdGQKLQlta2ZzLmpmZnMgLWQgJHtjbHN0 X2Rlc3RwYXRofSAtbyAkMS8ke2xvb3BuYW1lfSAke2Nsc3RfZnNfb3BzfSBcCisJbWtmcy5qZmZz IC1kICR7Y2xzdF9kZXN0cGF0aH0gLW8gJDEvJHtsb29wbmFtZX0gJHtjbHN0X2Zzb3BzfSBcCiAJ CXx8IGRpZSAiQ291bGQgbm90IGNyZWF0ZSBhIGpmZnMgZmlsZXN5c3RlbSIKIH0KIApAQCAtNjks NyArNjksNyBAQCBjcmVhdGVfamZmczIoKXsKIAllY2hvICJDcmVhdGluZyBqZmZzMi4uLiIKIAll eHBvcnQgbG9vcG5hbWU9ImltYWdlLmpmZnMiCiAJIyBmc19jaGVjayAvdXNyL3NiaW4vbWtmcy5q ZmZzMiBqZmZzMiBzeXMtZnMvbXRkCi0JbWtmcy5qZmZzMiAtLXJvb3Q9JHtjbHN0X2Rlc3RwYXRo fSAtLW91dHB1dD0kMS8ke2xvb3BuYW1lfSAke2Nsc3RfZnNfb3BzfSBcCisJbWtmcy5qZmZzMiAt LXJvb3Q9JHtjbHN0X2Rlc3RwYXRofSAtLW91dHB1dD0kMS8ke2xvb3BuYW1lfSAke2Nsc3RfZnNv cHN9IFwKIAkJfHwgZGllICJDb3VsZCBub3QgY3JlYXRlIGEgamZmczIgZmlsZXN5c3RlbSIKIH0K IApAQCAtNzcsNiArNzcsNiBAQCBjcmVhdGVfY3JhbWZzKCl7CiAJZWNobyAiQ3JlYXRpbmcgY3Jh bWZzLi4uIgogCWV4cG9ydCBsb29wbmFtZT0iaW1hZ2UuY3JhbWZzIgogCSNmc19jaGVjayAvc2Jp bi9ta2NyYW1mcyBjcmFtZnMgc3lzLWZzL2NyYW1mcwotCW1rY3JhbWZzICR7Y2xzdF9mc19vcHN9 ICR7Y2xzdF9kZXN0cGF0aH0gJDEvJHtsb29wbmFtZX0gXAorCW1rY3JhbWZzICR7Y2xzdF9mc29w c30gJHtjbHN0X2Rlc3RwYXRofSAkMS8ke2xvb3BuYW1lfSBcCiAJCXx8IGRpZSAiQ291bGQgbm90 IGNyZWF0ZSBhIGNyYW1mcyBmaWxlc3lzdGVtIgogfQo= 90303 2006-06-27 12:44 0000 Remove redundant options from valid_values in livecd-stage2 cat2-fix-typos2.patch text/plain ZGlmZiAtTmF1cnAgY2F0YWx5c3Qub3JpZy9tb2R1bGVzL2xpdmVjZF9zdGFnZTJfdGFyZ2V0LnB5 IGNhdGFseXN0L21vZHVsZXMvbGl2ZWNkX3N0YWdlMl90YXJnZXQucHkKLS0tIGNhdGFseXN0Lm9y aWcvbW9kdWxlcy9saXZlY2Rfc3RhZ2UyX3RhcmdldC5weQkyMDA2LTA2LTI4IDAxOjU0OjAzIC0w NDAwCisrKyBjYXRhbHlzdC9tb2R1bGVzL2xpdmVjZF9zdGFnZTJfdGFyZ2V0LnB5CTIwMDYtMDYt MjggMDI6MTg6MjggLTA0MDAKQEAgLTIzLDkgKzIzLDkgQEAgY2xhc3MgbGl2ZWNkX3N0YWdlMl90 YXJnZXQoZ2VuZXJpY19zdGFnZQogCQkJImxpdmVjZC9tb2RibGFja2xpc3QiLCJsaXZlY2Qvc3Bs YXNoX3RoZW1lIiwibGl2ZWNkL3NwbGFzaF90eXBlIixcCiAJCQkibGl2ZWNkL3JjYWRkIiwibGl2 ZWNkL3JjZGVsIiwibGl2ZWNkL2Zzc2NyaXB0IiwibGl2ZWNkL3hpbml0cmMiLFwKIAkJCSJsaXZl Y2Qvcm9vdF9vdmVybGF5IiwibGl2ZWNkL2Rldm1hbmFnZXIiLCJsaXZlY2QvdXNlcnMiLFwKLQkJ CSJnYW1lY2QvY29uZiIsImxpdmVjZC91c2VycyIsInBvcnRhZ2Vfb3ZlcmxheSIsImxpdmVjZC9j ZGZzdHlwZSIsXAotCQkJImxpdmVjZC9mc3R5cGUiLCJsaXZlY2QvZnNvcHMiLCJsaXZlY2QvbGlu dXhyYyIsImxpdmVjZC9ib290YXJncyIsXAotCQkJImdhbWVjZC9jb25mIiwibGl2ZWNkL3hkbSIs ImxpdmVjZC94c2Vzc2lvbiIsImxpdmVjZC92b2xpZCJdKQorCQkJInBvcnRhZ2Vfb3ZlcmxheSIs ImxpdmVjZC9jZGZzdHlwZSIsImxpdmVjZC9mc3R5cGUiLCJsaXZlY2QvZnNvcHMiLFwKKwkJCSJs aXZlY2QvbGludXhyYyIsImxpdmVjZC9ib290YXJncyIsImdhbWVjZC9jb25mIiwibGl2ZWNkL3hk bSIsXAorCQkJImxpdmVjZC94c2Vzc2lvbiIsImxpdmVjZC92b2xpZCJdKQogCQkKIAkJZ2VuZXJp Y19zdGFnZV90YXJnZXQuX19pbml0X18oc2VsZixzcGVjLGFkZGxhcmdzKQogCQlpZiBub3Qgc2Vs Zi5zZXR0aW5ncy5oYXNfa2V5KCJsaXZlY2QvdHlwZSIpOgo=