From 7e302bda9620cea150bac48898bcd1cba3e9cbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 31 Aug 2019 02:05:10 -0400 Subject: [PATCH 1/6] [officechooser] update cmakelists --- src/modules/officechooser/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/officechooser/CMakeLists.txt b/src/modules/officechooser/CMakeLists.txt index 59e3e928a..7185c996d 100644 --- a/src/modules/officechooser/CMakeLists.txt +++ b/src/modules/officechooser/CMakeLists.txt @@ -32,7 +32,7 @@ if( ECM_FOUND AND BUILD_TESTING ) ecm_add_test( Tests.cpp TEST_NAME - packagechoosertest + officechoosertest LINK_LIBRARIES ${CALAMARES_LIBRARIES} calamares_viewmodule_officechooser @@ -41,5 +41,5 @@ if( ECM_FOUND AND BUILD_TESTING ) Qt5::Gui ${_extra_libraries} ) - calamares_automoc( packagechoosertest) + calamares_automoc( officechoosertest) endif() From 2797322f0b4af80ffddcb3a4c7ca74fa9c6a6747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 31 Aug 2019 05:11:00 -0400 Subject: [PATCH 2/6] [postcfg] don't mount opt as readonly --- src/modules/postcfg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py index d847df73f..94f6f61b7 100644 --- a/src/modules/postcfg/main.py +++ b/src/modules/postcfg/main.py @@ -66,7 +66,7 @@ class ConfigController: subprocess.call(["umount", "-l", join(self.root, 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): self.init_keyring() From f95aa970e98c42a13e454698cd46e0d2c5a59874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 31 Aug 2019 05:14:22 -0400 Subject: [PATCH 3/6] [mhwdcfg] mount also var --- src/modules/mhwdcfg/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py index 7ae532dd1..0e829e5d3 100644 --- a/src/modules/mhwdcfg/main.py +++ b/src/modules/mhwdcfg/main.py @@ -70,12 +70,13 @@ class MhwdController: call(["umount", "-l", join(self.root, 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): cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)] if self.local: self.mount("opt") + self.mount("var") cmd.extend(["--pmconfig", self.repo]) self.mount("etc/resolv.conf") @@ -83,6 +84,7 @@ class MhwdController: if self.local: self.umount("opt") + self.umount("var") self.umount("etc/resolv.conf") def run(self): From 1b2af1c63572b26776212e2468088280421f6689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 31 Aug 2019 05:16:19 -0400 Subject: [PATCH 4/6] [mhwdcfg] mount also var/lib/mhwd --- src/modules/mhwdcfg/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py index 0e829e5d3..34b959a12 100644 --- a/src/modules/mhwdcfg/main.py +++ b/src/modules/mhwdcfg/main.py @@ -76,7 +76,7 @@ class MhwdController: cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)] if self.local: self.mount("opt") - self.mount("var") + self.mount("var/lib/mhwd") cmd.extend(["--pmconfig", self.repo]) self.mount("etc/resolv.conf") @@ -84,7 +84,7 @@ class MhwdController: if self.local: self.umount("opt") - self.umount("var") + self.umount("var/lib/mhwd") self.umount("etc/resolv.conf") def run(self): From 91b32f9c5ab9929cd5d37627ca2b63eac3f5a520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 31 Aug 2019 05:19:57 -0400 Subject: [PATCH 5/6] [mhwdcfg] use 'opt/mhwd' folder --- src/modules/mhwdcfg/main.py | 4 ++-- src/modules/mhwdcfg/mhwdcfg.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/mhwdcfg/main.py b/src/modules/mhwdcfg/main.py index 34b959a12..717596c57 100644 --- a/src/modules/mhwdcfg/main.py +++ b/src/modules/mhwdcfg/main.py @@ -75,7 +75,7 @@ class MhwdController: def configure(self, name, id): cmd = ["mhwd", "-a", str(name), str(self.driver), str(id).zfill(4)] if self.local: - self.mount("opt") + self.mount("opt/mhwd") self.mount("var/lib/mhwd") cmd.extend(["--pmconfig", self.repo]) @@ -83,7 +83,7 @@ class MhwdController: target_env_call(cmd) if self.local: - self.umount("opt") + self.umount("opt/mhwd") self.umount("var/lib/mhwd") self.umount("etc/resolv.conf") diff --git a/src/modules/mhwdcfg/mhwdcfg.conf b/src/modules/mhwdcfg/mhwdcfg.conf index 18db7fbea..1233ab9bb 100644 --- a/src/modules/mhwdcfg/mhwdcfg.conf +++ b/src/modules/mhwdcfg/mhwdcfg.conf @@ -16,4 +16,4 @@ driver: free local: true -repo: /opt/pacman-mhwd.conf +repo: /opt/mhwd/pacman-mhwd.conf From 4e5f5eaf481bd7244bf6bc41e602022f9a2c8e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 31 Aug 2019 05:21:11 -0400 Subject: [PATCH 6/6] [postcfg] adopt to 'opt/mhwd' folder --- src/modules/postcfg/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/postcfg/main.py b/src/modules/postcfg/main.py index 94f6f61b7..89182b927 100644 --- a/src/modules/postcfg/main.py +++ b/src/modules/postcfg/main.py @@ -116,12 +116,12 @@ class ConfigController: if not office_package: libcalamares.utils.warning("no office suite selected, {!s}".format(office_package)) else: - # For PoC we added the Office Packages to mhwd-live overlay in 18.1-rc7 - cmd = ["pacman", "-S", office_package, "--noconfirm", "--config", "/opt/pacman-mhwd.conf" ] - self.mount("opt") + # For PoC we added the Office Packages to mhwd-live overlay in 18.1.0 + cmd = ["pacman", "-S", office_package, "--noconfirm", "--config", "/opt/mhwd/pacman-mhwd.conf" ] + self.mount("opt/mhwd") self.mount("etc/resolv.conf") target_env_call(cmd) - self.umount("opt") + self.umount("opt/mhwd") self.umount("etc/resolv.conf") return None