pisilocalayar.patch 4.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117
  1. diff -Nuar calamares-3.2-rc3/src/modules/mudur/main.py calamares-3.2-rc31/src/modules/mudur/main.py
  2. --- calamares-3.2-rc3/src/modules/mudur/main.py 1969-12-31 19:00:00.000000000 -0500
  3. +++ calamares-3.2-rc31/src/modules/mudur/main.py 2018-03-03 16:47:21.000000000 -0500
  4. @@ -0,0 +1,66 @@
  5. +#!/usr/bin/env python3
  6. +# -*- coding: utf-8 -*-
  7. +#
  8. +# === This file is part of Calamares - <http://github.com/calamares> ===
  9. +#
  10. +# Copyright 2014, Anke Boersma <demm@kaosx.us>
  11. +# Copyright 2015, Philip Müller <philm@manjaro.org>
  12. +#
  13. +# Calamares is free software: you can redistribute it and/or modify
  14. +# it under the terms of the GNU General Public License as published by
  15. +# the Free Software Foundation, either version 3 of the License, or
  16. +# (at your option) any later version.
  17. +#
  18. +# Calamares is distributed in the hope that it will be useful,
  19. +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  20. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  21. +# GNU General Public License for more details.
  22. +#
  23. +# You should have received a copy of the GNU General Public License
  24. +# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  25. +
  26. +import os
  27. +import shutil
  28. +
  29. +import libcalamares
  30. +
  31. +
  32. +
  33. +def run():
  34. +
  35. + install_path = libcalamares.globalstorage.value("rootMountPoint")
  36. +
  37. +
  38. + path = os.path.join(install_path, "etc/locale.conf")
  39. +
  40. + mloc = open(path,"r")
  41. + a=mloc.readline()
  42. + b=a.split("=")[1]
  43. +
  44. + languages = b.split("_")[0]
  45. +
  46. +
  47. + mudur_file_path = os.path.join(install_path, "etc/conf.d/mudur")
  48. + lines = []
  49. + for l in open(mudur_file_path, "r").readlines():
  50. + if l.strip().startswith('language=') or l.strip().startswith('# language='):
  51. + if languages == "pt":
  52. + l = 'language="pt_BR"\n'
  53. + else:
  54. + l = 'language="%s"\n' % languages
  55. + lines.append(l)
  56. +
  57. + open(mudur_file_path, "w").writelines(lines)
  58. +
  59. + if os.path.exists(os.path.join(install_path, "etc/sudoers")):
  60. + os.unlink(os.path.join(install_path, "etc/sudoers"))
  61. +
  62. +
  63. + source = os.path.join(install_path, "etc/sudoers.orig")
  64. + target = os.path.join(install_path, "etc/sudoers")
  65. +
  66. + shutil.copy(source, target)
  67. +
  68. + libcalamares.utils.target_env_call(['chmod', '440', '/etc/sudoers'])
  69. +
  70. + return None
  71. diff -Nuar calamares-3.2-rc3/src/modules/mudur/module.desc calamares-3.2-rc31/src/modules/mudur/module.desc
  72. --- calamares-3.2-rc3/src/modules/mudur/module.desc 1969-12-31 19:00:00.000000000 -0500
  73. +++ calamares-3.2-rc31/src/modules/mudur/module.desc 2018-02-24 08:15:23.000000000 -0500
  74. @@ -0,0 +1,5 @@
  75. +---
  76. +type: "job"
  77. +name: "mudur"
  78. +interface: "python"
  79. +script: "main.py"
  80. diff -Nuar calamares-3.2-rc3/src/modules/packages/main.py calamares-3.2-rc31/src/modules/packages/main.py
  81. --- calamares-3.2-rc3/src/modules/packages/main.py 2018-01-30 05:26:29.000000000 -0500
  82. +++ calamares-3.2-rc31/src/modules/packages/main.py 2018-03-03 16:45:20.000000000 -0500
  83. @@ -267,17 +267,17 @@
  84. check_target_env_call(["emerge", "--sync"])
  85. -class PMEntropy(PackageManager):
  86. - backend = "entropy"
  87. +class PMpisi(PackageManager):
  88. + backend = "pisi"
  89. def install(self, pkgs, from_local=False):
  90. - check_target_env_call(["equo", "i"] + pkgs)
  91. + check_target_env_call(["pisi", "it"] + pkgs)
  92. def remove(self, pkgs):
  93. - check_target_env_call(["equo", "rm"] + pkgs)
  94. + check_target_env_call(["pisi", "rm","--ignore-comar"] + pkgs)
  95. def update_db(self):
  96. - check_target_env_call(["equo", "update"])
  97. + pass
  98. class PMDummy(PackageManager):
  99. diff -Nuar calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp
  100. --- calamares-3.2-rc3/src/modules/partition/gui/EncryptWidget.cpp 2018-01-30 05:26:29.000000000 -0500
  101. +++ calamares-3.2-rc31/src/modules/partition/gui/EncryptWidget.cpp 2018-03-03 18:03:42.451021124 -0500
  102. @@ -31,6 +31,7 @@
  103. m_passphraseLineEdit->hide();
  104. m_confirmLineEdit->hide();
  105. m_iconLabel->hide();
  106. + m_encryptCheckBox->hide();
  107. connect( m_encryptCheckBox, &QCheckBox::stateChanged,
  108. this, &EncryptWidget::onCheckBoxStateChanged );