From b213cdbf7f5a4b9effa8ffb581a6a82cb1eee01a Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Fri, 28 Mar 2014 13:45:13 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20UEFI=20#639?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/distr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/distr.py b/install/distr.py index ae94ddb..e6202e8 100644 --- a/install/distr.py +++ b/install/distr.py @@ -754,7 +754,7 @@ class PartitionDistributive(Distributive): mulipartDataNotBind = filter(lambda x: x[2]!="bind", self.getMultipartData()) for dev, mountPoint, fileSystem, isFormat, partTable\ - in mulipartDataNotBind: + in sorted(mulipartDataNotBind, key=lambda x:x[1]): if fileSystem!="swap": realMountPoint = pathJoin(mdirectory, mountPoint) self._mountPartition(dev,realMountPoint,"-t %s"%fileSystem) From d8b9d618665a7c82a21276b9cfa6931afad43249 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Mon, 21 Apr 2014 17:16:44 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=92=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B8=D0=B2=D0=B0=D1=82=D1=8C=20=D1=81=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D0=BC=D1=83=20=D0=BD=D0=B0=20btrfs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit для liveCD --- install/variables/system.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/install/variables/system.py b/install/variables/system.py index f810ea8..69e800e 100644 --- a/install/variables/system.py +++ b/install/variables/system.py @@ -86,8 +86,6 @@ class VariableOsFormatUse(ReadonlyVariable): 'value': "off"} def checkFunc(self,fs): - if fs == "btrfs" and self.Get('os_root_type') == 'livecd': - return "no" if "format" in FileSystemManager.supportFS[fs] and \ path.exists(FileSystemManager.supportFS[fs]["format"]): return "yes" From 7605f9f6d3f773766c404aad3b366fd99a9cd6c7 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Mon, 21 Apr 2014 17:59:43 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D1=80=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=80=D1=82=D0=B5=D0=B6=D0=B5=D0=B9=20=D0=B2=20?= =?UTF-8?q?init.d/calculate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/calculate | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/calculate b/data/calculate index c7f60b9..60a24b0 100644 --- a/data/calculate +++ b/data/calculate @@ -134,10 +134,6 @@ start() { touch /* /bin/* /sbin/* udevadm trigger --action="add" --subsystem-match=net fi - if [[ $roottype != "livecd" ]] - then - /usr/bin/eix-checkout &>/dev/null & - fi /sbin/rc-update --update return 0