[yast-commit] r40132 - in /trunk/update: VERSION package/yast2-update.changes src/modules/RootPart.ycp
Author: locilka Date: Thu Aug 9 16:22:21 2007 New Revision: 40132 URL: http://svn.opensuse.org/viewcvs/yast?rev=40132&view=rev Log: - Using cryptsetup instead of losetup, patch created by Thomas Fehr (#258222). - 2.15.20 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=40132&r1=40131&r2=40132&view=diff ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Thu Aug 9 16:22:21 2007 @@ -1 +1 @@ -2.15.19 +2.15.20 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=40132&r1=40131&r2=40132&view=diff ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu Aug 9 16:22:21 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 9 16:20:58 CEST 2007 - locilka@suse.cz + +- Using cryptsetup instead of losetup, patch created by Thomas Fehr + (#258222). +- 2.15.20 + +------------------------------------------------------------------- Wed Aug 1 10:19:50 CEST 2007 - mvidner@suse.cz - Removed Provides/Obsoletes for ancient yast package names, Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?rev=40132&r1=40131&r2=40132&view=diff ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Thu Aug 9 16:22:21 2007 @@ -73,7 +73,7 @@ * * Keys/values are: * - * `type The type, one of "mount", "swap" or "loop". + * `type The type, one of "mount", "swap" or "crypt". * * `device The device. * @@ -219,13 +219,14 @@ y2error("Cannot deactivate swap %1", device); } } - else if (type == "loop") + else if (type == "crypt") { - string device = info[`device]:""; + string dmname = info[`device]:""; + dmname = "cr_" + substring( dmname, findlastof( dmname, "/" )+1 ); // FIXME? is it safe? - if (WFM::Execute(.local.bash, "losetup -d " + device) != 0) + if (WFM::Execute(.local.bash, "cryptsetup remove " + dmname) != 0) { - y2error("Cannot deactivate loopback device %1", device); + y2error("Cannot remove dm device %1", dmname); } } } @@ -818,7 +819,7 @@ "passno" : 0, "vfstype": vfstype ]; fstab = prepend (fstab, add_fs); - AddMountedPartition ($[`type : "loop", `device : device]); + AddMountedPartition ($[`type : "crypt", `device : device]); again = false; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
locilka@svn.opensuse.org