Author: jsrain Date: Wed Jan 19 15:39:07 2011 New Revision: 63232 URL: http://svn.opensuse.org/viewcvs/yast?rev=63232&view=rev Log: don't delete /etc/mtab if it is a symlink (bnc#665437) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/inst_finish/umount_finish.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63232&r1=63231&r2=63232&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Jan 19 15:39:07 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=63232&r1=63231&r2=63232&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jan 19 15:39:07 2011 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Wed Jan 19 15:09:08 CET 2011 - jsrain@suse.cz +Wed Jan 19 15:38:20 CET 2011 - jsrain@suse.cz - adaptations for unattended migration (fate#310481) +- don't delete /etc/mtab if it is a symlink (bnc#665437) +- 2.20.3 ------------------------------------------------------------------- Wed Jan 19 12:53:00 CET 2011 - jsrain@suse.cz Modified: trunk/installation/src/inst_finish/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/umount_finish.ycp?rev=63232&r1=63231&r2=63232&view=diff ============================================================================== --- trunk/installation/src/inst_finish/umount_finish.ycp (original) +++ trunk/installation/src/inst_finish/umount_finish.ycp Wed Jan 19 15:39:07 2011 @@ -22,6 +22,7 @@ import "Vendor"; import "String"; import "Internet"; +import "FileUtils"; any ret = nil; string func = ""; @@ -74,9 +75,12 @@ } }); - // remove [Installation::destdir]/etc/mtab which was faked for %post - // scripts in inst_rpmcopy - SCR::Execute(.target.remove, "/etc/mtab"); + // symlink points to /proc, keep it (bnc#665437) + if (! FileUtils::IsLink ("/etc/mtab")) { + // remove [Installation::destdir]/etc/mtab which was faked for %post + // scripts in inst_rpmcopy + SCR::Execute(.target.remove, "/etc/mtab"); + } // Stop SCR on target WFM::SCRClose (Installation::scr_handle); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org