Rmys
117 lines
4.2 KiB
Plaintext
117 lines
4.2 KiB
Plaintext
diff -Nuar calamares-3.2-rc3/src/modules/mudur/main.py calamares-3.2-rc31/src/modules/mudur/main.py
|
|
--- calamares-3.2-rc3/src/modules/mudur/main.py 1969-12-31 19:00:00.000000000 -0500
|
|
+++ calamares-3.2-rc31/src/modules/mudur/main.py 2018-03-03 16:47:21.000000000 -0500
|
|
@@ -0,0 +1,66 @@
|
|
+#!/usr/bin/env python3
|
|
+# -*- coding: utf-8 -*-
|
|
+#
|
|
+# === This file is part of Calamares - <http://github.com/calamares> ===
|
|
+#
|
|
+# Copyright 2014, Anke Boersma <demm@kaosx.us>
|
|
+# Copyright 2015, Philip Müller <philm@manjaro.org>
|
|
+#
|
|
+# Calamares is free software: you can redistribute it and/or modify
|
|
+# it under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation, either version 3 of the License, or
|
|
+# (at your option) any later version.
|
|
+#
|
|
+# Calamares is distributed in the hope that it will be useful,
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+# GNU General Public License for more details.
|
|
+#
|
|
+# You should have received a copy of the GNU General Public License
|
|
+# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
+
|
|
+import os
|
|
+import shutil
|
|
+
|
|
+import libcalamares
|
|
+
|
|
+
|
|
+
|
|
+def run():
|
|
+
|
|
+ install_path = libcalamares.globalstorage.value("rootMountPoint")
|
|
+
|
|
+
|
|
+ path = os.path.join(install_path, "etc/locale.conf")
|
|
+
|
|
+ mloc = open(path,"r")
|
|
+ a=mloc.readline()
|
|
+ b=a.split("=")[1]
|
|
+
|
|
+ languages = b.split("_")[0]
|
|
+
|
|
+
|
|
+ mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur")
|
|
+ lines = []
|
|
+ for l in open(mudur_file_path, "r").readlines():
|
|
+ if l.strip().startswith('language=') or l.strip().startswith('# language='):
|
|
+ if languages == "pt":
|
|
+ l = 'language="pt_BR"\n'
|
|
+ else:
|
|
+ l = 'language="%s"\n' % languages
|
|
+ lines.append(l)
|
|
+
|
|
+ open(mudur_file_path, "w").writelines(lines)
|
|
+
|
|
+ if os.path.exists(os.path.join(install_path, "etc/sudoers")):
|
|
+ os.unlink(os.path.join(install_path, "etc/sudoers"))
|
|
+
|
|
+
|
|
+ source = os.path.join(install_path, "etc/sudoers.orig")
|
|
+ target = os.path.join(install_path, "etc/sudoers")
|
|
+
|
|
+ shutil.copy(source, target)
|
|
+
|
|
+ libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers'])
|
|
+
|
|
+ return None
|
|
diff -Nuar calamares-3.2-rc3/src/modules/mudur/module.desc calamares-3.2-rc31/src/modules/mudur/module.desc
|
|
--- calamares-3.2-rc3/src/modules/mudur/module.desc 1969-12-31 19:00:00.000000000 -0500
|
|
+++ calamares-3.2-rc31/src/modules/mudur/module.desc 2018-02-24 08:15:23.000000000 -0500
|
|
@@ -0,0 +1,5 @@
|
|
+---
|
|
+type: "job"
|
|
+name: "mudur"
|
|
+interface: "python"
|
|
+script: "main.py"
|
|
diff -Nuar calamares-3.2-rc3/src/modules/packages/main.py calamares-3.2-rc31/src/modules/packages/main.py
|
|
--- calamares-3.2-rc3/src/modules/packages/main.py 2018-01-30 05:26:29.000000000 -0500
|
|
+++ calamares-3.2-rc31/src/modules/packages/main.py 2018-03-03 16:45:20.000000000 -0500
|
|
@@ -267,17 +267,17 @@
|
|
check_target_env_call(["emerge", "--sync"])
|
|
|
|
|
|
-class PMEntropy(PackageManager):
|
|
- backend = "entropy"
|
|
+class PMpisi(PackageManager):
|
|
+ backend = "pisi"
|
|
|
|
def install(self, pkgs, from_local=False):
|
|
- check_target_env_call(["equo", "i"] + pkgs)
|
|
+ check_target_env_call(["pisi", "it"] + pkgs)
|
|
|
|
def remove(self, pkgs):
|
|
- check_target_env_call(["equo", "rm"] + pkgs)
|
|
+ check_target_env_call(["pisi", "rm","--ignore-comar"] + pkgs)
|
|
|
|
def update_db(self):
|
|
- check_target_env_call(["equo", "update"])
|
|
+ pass
|
|
|
|
|
|
class PMDummy(PackageManager):
|
|
diff -Nuar calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp
|
|
--- calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp 2018-01-30 05:26:29.000000000 -0500
|
|
+++ calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp 2018-03-03 18:03:42.451021124 -0500
|
|
@@ -31,6 +31,7 @@
|
|
m_passphraseLineEdit->hide();
|
|
m_confirmLineEdit->hide();
|
|
m_iconLabel->hide();
|
|
+ m_encryptCheckBox->hide();
|
|
|
|
connect( m_encryptCheckBox, &QCheckBox::stateChanged,
|
|
this, &EncryptWidget::onCheckBoxStateChanged );
|