Author: charlesa Date: Thu Mar 15 00:10:52 2012 New Revision: 67631 URL: http://svn.opensuse.org/viewcvs/yast?rev=67631&view=rev Log: - bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 re-adds "x0..respawn..xterm" to inittab Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/vm_finish.ycp Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=67631&r1=67630&r2=67631&view=diff ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Thu Mar 15 00:10:52 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=67631&r1=67630&r2=67631&view=diff ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Thu Mar 15 00:10:52 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 14 17:00:46 MDT 2012 - carnold@novell.com + +- bnc#720929 - OES11LH: Upgrade from OES 2 SP2 to OES 11 RC3 + re-adds "x0..respawn..xterm" to inittab + +------------------------------------------------------------------- Mon Jan 16 14:54:33 UTC 2012 - coolo@suse.com - confirm license Modified: trunk/vm/src/vm_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/vm_finish.ycp?rev=67631&r1=67630&r2=67631&view=diff ============================================================================== --- trunk/vm/src/vm_finish.ycp (original) +++ trunk/vm/src/vm_finish.ycp Thu Mar 15 00:10:52 2012 @@ -97,14 +97,20 @@ y2milestone("check for xvc0 in inittab and securetty"); if ( !contains(SCR::Dir(.etc.inittab), "x0") ) { - y2milestone("Adding the x0 entry in the inittab file"); - SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); - SCR::Write (.etc.inittab, nil); - string dev_xvc0 = "/dev/xvc0"; - if ( ! FileUtils::Exists(dev_xvc0) ) + // On an upgrade, don't add new entry if existing one is commented out - bnc#720929 + if ( 0 != SCR::Execute(.target.bash,"/usr/bin/grep -q '^#x0:' /etc/inittab") ) { - y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); - SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + y2milestone("Adding the x0 entry in the inittab file"); + SCR::Write (.etc.inittab.x0, sformat ("12345:respawn:/sbin/agetty -L 9600 xvc0 xterm")); + SCR::Write (.etc.inittab, nil); + string dev_xvc0 = "/dev/xvc0"; + if ( ! FileUtils::Exists(dev_xvc0) ) + { + y2milestone("%1 not found, commenting out the x0 entry in the inittab", dev_xvc0); + SCR::Execute(.target.bash,"/bin/sed --in-place 's/^x0:/#x0:/g' /etc/inittab"); + } + } else { + y2milestone("The x0 entry in the inittab is there but commented out"); } } SCR::Execute(.target.bash,"/usr/bin/grep -q xvc0 /etc/securetty || echo xvc0 >> /etc/securetty"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org