169363 2007-03-04 20:54 0000 catalyst-2.0.3_pre2 removes # from beginning of all lines in rc.conf 2007-03-20 17:17:24 0000 1 1 1 Unclassified Gentoo Hosted Projects Catalyst unspecified All Linux RESOLVED FIXED InSVN P2 normal --- 1 agaffney@gentoo.org catalyst@gentoo.org agaffney@gentoo.org 2007-03-04 20:54:16 0000 The sed statement that sets DISPLAYMANAGER in rc.conf in targets/support/livecdfs-update.sh is a bit off: sed -i \ -e "s:DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ -e ":^DISPLAYMANAGER: s:^#::" \ /etc/rc.conf The first regex in the 2nd part of the command is ignored since it's not wrapped in / /. This causes sed to remove # from the beginning of all lines in rc.conf. agaffney@gentoo.org 2007-03-04 20:54:35 0000 Created an attachment (id=112115) patch to fix the problem agaffney@gentoo.org 2007-03-04 20:56:47 0000 The patch merges the two parts into a single regex that takes care of an existing DISPLAYMANAGER line with or without a beginning #. It also handles the case of the default possibly changing from "xdm" in the future. I made the same modification to the sed statement for /etc/conf.d/xdm. agaffney@gentoo.org 2007-03-04 21:09:47 0000 I just re-ran livecd-stage2 with my patch, and it appears that both rc.conf and conf.d/xdm were modified properly. Also, it appears that the current sed statement doesn't work with / /, either. Perhaps it's the space between the 2 parts of the second statement. Whatever... :P wolf31o2@gentoo.org 2007-03-06 17:41:17 0000 Fixed in SVN/2.0.3_pre3 wolf31o2@gentoo.org 2007-03-20 17:17:24 0000 This is fixed in 2.0.3 which should be hitting the tree shortly. 112115 2007-03-04 20:54 0000 patch to fix the problem catalyst.patch text/plain SW5kZXg6IHRhcmdldHMvc3VwcG9ydC9saXZlY2Rmcy11cGRhdGUuc2gKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g dGFyZ2V0cy9zdXBwb3J0L2xpdmVjZGZzLXVwZGF0ZS5zaAkocmV2aXNpb24gMTIxOCkKKysrIHRh cmdldHMvc3VwcG9ydC9saXZlY2Rmcy11cGRhdGUuc2gJKHdvcmtpbmcgY29weSkKQEAgLTE0Mywx MSArMTQzLDEwIEBACiBpZiBbIC1uICIke2Nsc3RfbGl2ZWNkX3hkbX0iIF0KIHRoZW4KIAlzZWQg LWkgXAotCQktZSAiczpESVNQTEFZTUFOQUdFUj1cInhkbVwiOkRJU1BMQVlNQU5BR0VSPVwiJHtj bHN0X2xpdmVjZF94ZG19XCI6IiBcCi0JCS1lICI6XkRJU1BMQVlNQU5BR0VSOiBzOl4jOjoiIFwK KwkJLWUgInM6XiNcXD9ESVNQTEFZTUFOQUdFUj0uXCskOkRJU1BMQVlNQU5BR0VSPVwiJHtjbHN0 X2xpdmVjZF94ZG19XCI6IiBcCiAJCS9ldGMvcmMuY29uZgogCXNlZCAtaSBcCi0JCS1lICJzOkRJ U1BMQVlNQU5BR0VSPVwieGRtXCI6RElTUExBWU1BTkFHRVI9XCIke2Nsc3RfbGl2ZWNkX3hkbX1c IjoiIFwKKwkJLWUgInM6XiNcXD9ESVNQTEFZTUFOQUdFUj0uXCskOkRJU1BMQVlNQU5BR0VSPVwi JHtjbHN0X2xpdmVjZF94ZG19XCI6IiBcCiAJCS9ldGMvY29uZi5kL3hkbQogZmkKIAo=