napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into 3.2.x-stable

Browse Source
This commit is contained in:
Philip Müller 2019-08-31 05:49:44 -04:00
commit 931f6829ed
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/mhwdcfg/main.py
View File

@ -70,19 +70,21 @@ class MhwdController:
call(["umount", "-l", join(self.root, mp)]) call(["umount", "-l", join(self.root, mp)])
def mount(self, mp): def mount(self, mp):
call(["mount", "-Br", "/" + mp, join(self.root, mp)]) call(["mount", "-B", "/" + mp, join(self.root, mp)])
def configure(self, name, id): def configure(self, name, id):
cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)] cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)]
if self.local: if self.local:
self.mount("opt") self.mount("opt/mhwd")
self.mount("var/lib/mhwd")
cmd.extend(["--pmconfig", self.repo]) cmd.extend(["--pmconfig", self.repo])
self.mount("etc/resolv.conf") self.mount("etc/resolv.conf")
target_env_call(cmd) target_env_call(cmd)
if self.local: if self.local:
self.umount("opt") self.umount("opt/mhwd")
self.umount("var/lib/mhwd")
self.umount("etc/resolv.conf") self.umount("etc/resolv.conf")
def run(self): def run(self):

2
src/modules/mhwdcfg/mhwdcfg.conf
View File

@ -16,4 +16,4 @@ driver: free
local: true local: true
repo: /opt/pacman-mhwd.conf repo: /opt/mhwd/pacman-mhwd.conf

10
src/modules/postcfg/main.py
View File

@ -66,7 +66,7 @@ class ConfigController:
subprocess.call(["umount", "-l", join(self.root, mp)]) subprocess.call(["umount", "-l", join(self.root, mp)])
def mount(self, mp): def mount(self, mp):
subprocess.call(["mount", "-Br", "/" + mp, join(self.root, mp)]) subprocess.call(["mount", "-B", "/" + mp, join(self.root, mp)])
def run(self): def run(self):
self.init_keyring() self.init_keyring()
@ -116,12 +116,12 @@ class ConfigController:
if not office_package: if not office_package:
libcalamares.utils.warning("no office suite selected, {!s}".format(office_package)) libcalamares.utils.warning("no office suite selected, {!s}".format(office_package))
else: else:
# For PoC we added the Office Packages to mhwd-live overlay in 18.1-rc7 # For PoC we added the Office Packages to mhwd-live overlay in 18.1.0
cmd = ["pacman", "-S", office_package, "--noconfirm", "--config", "/opt/pacman-mhwd.conf" ] cmd = ["pacman", "-S", office_package, "--noconfirm", "--config", "/opt/mhwd/pacman-mhwd.conf" ]
self.mount("opt") self.mount("opt/mhwd")
self.mount("etc/resolv.conf") self.mount("etc/resolv.conf")
target_env_call(cmd) target_env_call(cmd)
self.umount("opt") self.umount("opt/mhwd")
self.umount("etc/resolv.conf") self.umount("etc/resolv.conf")
return None return None