Author: locilka Date: Tue Jun 3 13:46:44 2008 New Revision: 48002 URL: http://svn.opensuse.org/viewcvs/yast?rev=48002&view=rev Log: - Umounting temporary directory in inst_pre_install (if already mounted) before new mount is called. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_pre_install.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=48002&r1=48001&r2=48002&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jun 3 13:46:44 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 3 13:44:56 CEST 2008 - locilka@suse.cz + +- Umounting temporary directory in inst_pre_install (if already + mounted) before new mount is called. + +------------------------------------------------------------------- Mon Jun 2 12:33:57 CEST 2008 - locilka@suse.cz - Return `next when going back to the automatic configuration Modified: trunk/installation/src/clients/inst_pre_install.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pre_install.ycp?rev=48002&r1=48001&r2=48002&view=diff ============================================================================== --- trunk/installation/src/clients/inst_pre_install.ycp (original) +++ trunk/installation/src/clients/inst_pre_install.ycp Tue Jun 3 13:46:44 2008 @@ -108,6 +108,17 @@ string partition_device = (string) partition["device"]:""; y2milestone("Mounting %1 to %2", partition_device, mnt_tmpdir); + string already_mounted = sformat ("grep '[\\t ]%1[\\t ]' /proc/mounts", mnt_tmpdir); + integer am_exit = (integer) SCR::Execute (.target.bash, already_mounted); + + if (am_exit != 0) { + y2warning ("%1 is already mounted, trying to umount...", mnt_tmpdir); + integer umount = (integer) SCR::Execute (.target.umount, mnt_tmpdir); + if (umount != 0) { + y2error ("Cannot umount %1", mnt_tmpdir); + } + } + // mounting read-only if (! (boolean) SCR::Execute(.target.mount, [partition_device, mnt_tmpdir], "-o ro")) { y2error("Mounting falied!"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org