From 3003feed61e20170923cee27c02ced3bb76d957c Mon Sep 17 00:00:00 2001 From: BrLi Date: Sun, 21 Oct 2018 21:12:32 +0800 Subject: [PATCH] install octopi in live session, remove db for overlay --- config/packages.conf | 2 +- config/postinstall_packages.conf | 2 +- src/iso.py | 6 +----- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/config/packages.conf b/config/packages.conf index a399b83..0149c68 100644 --- a/config/packages.conf +++ b/config/packages.conf @@ -282,7 +282,7 @@ clementine-qt5 imagewriter octopi -#octopi-notifier-qt5 will be installed at the end +octopi-notifier ark spectacle okular diff --git a/config/postinstall_packages.conf b/config/postinstall_packages.conf index 9254668..0246a3a 100644 --- a/config/postinstall_packages.conf +++ b/config/postinstall_packages.conf @@ -3,4 +3,4 @@ # Version: 20151103 #kapudan -octopi-notifier \ No newline at end of file +#octopi-notifier diff --git a/src/iso.py b/src/iso.py index c215507..4671630 100755 --- a/src/iso.py +++ b/src/iso.py @@ -79,12 +79,9 @@ class IsoBuilder: # download packages package_dir = os.path.join(self.overlay_packages_dir, "opt/chakra/pkgs") package_dir = os.path.abspath(package_dir) - db_dir = os.path.join(self.overlay_packages_dir, "var/lib/pacman/") - db_dir = os.path.abspath(db_dir) - os.makedirs(package_dir, exist_ok=True) pacman_config = pjoin(self.configdir, "pacman.conf") - command = "pacman -Sywdd --noconfirm --dbpath {} --cachedir {} --config {} {}" + command = "pacman -Sywdd --noconfirm --cachedir {} --config {} {}" # pacman -Sw doesn't check dependencies with installed system, but it will fetch required packages altogether with open(os.path.join(self.configdir, "overlay-packages.conf")) as packages: for line in packages: @@ -93,7 +90,6 @@ class IsoBuilder: continue subprocess.check_call( command.format( - db_dir, package_dir, pacman_config, line -- GitLab