Bug 169363 - catalyst-2.0.3_pre2 removes # from beginning of all lines in rc.conf
|
Bug#:
169363
|
Product: Gentoo Hosted Projects
|
Version: unspecified
|
Platform: All
|
|
OS/Version: Linux
|
Status: RESOLVED
|
Severity: normal
|
Priority: P2
|
|
Resolution: FIXED
|
Assigned To: catalyst@gentoo.org
|
Reported By: agaffney@gentoo.org
|
|
Component: Catalyst
|
|
|
URL:
|
|
Summary: catalyst-2.0.3_pre2 removes # from beginning of all lines in rc.conf
|
|
Keywords: InSVN
|
|
Status Whiteboard:
|
|
Opened: 2007-03-04 20:54 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.
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.
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
This is fixed in 2.0.3 which should be hitting the tree shortly.