diff --git a/iso_configs/hooks/live/0040-set-plymouth b/iso_configs/hooks/live/0040-set-plymouth index f1f39b9d..3023431b 100755 --- a/iso_configs/hooks/live/0040-set-plymouth +++ b/iso_configs/hooks/live/0040-set-plymouth @@ -8,27 +8,4 @@ rm -f /etc/alternatives/desktop-theme # Then re-add it ln -s /usr/share/desktop-base/lines-theme /etc/alternatives/desktop-theme -set -e -# install dependencies use for calamares -apt install \ - qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev \ - cmake python3-pyqt5 qttools5-dev libqt5svg5-dev \ - libyaml-cpp-dev libpolkit-qt5-1-dev libkf5coreaddons-dev \ - qttools5-dev-tools extra-cmake-modules libkf5crash-dev -y - - -# Clone the Calamares installer -git clone https://github.com/calamares/calamares.git /opt/calamares -# change to Calamares -cd /opt/calamares -# Create a folder called build -mkdir build -# Change into the build directory -cd /opt/calamares/build -# Check the make source -cmake .. -# Compile it -make -# Install Calamares -make install diff --git a/python_modules/conf.py b/python_modules/conf.py index e5e35519..6d4b998b 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -355,7 +355,7 @@ LBSET_MAIN_SHARED = ('lb config noauto' ' --iso-publisher "Peppermint OS Team"' ' --iso-volume "PeppermintOS" --mode debian --quiet' ' --security false --uefi-secure-boot enable' - ' --updates false --win32-loader false --zsync false' + ' --updates false --win32-loader false --zsync false' ) # Shared by architecture diff --git a/python_modules/infra.py b/python_modules/infra.py index 50daca16..76b76f57 100644 --- a/python_modules/infra.py +++ b/python_modules/infra.py @@ -212,7 +212,7 @@ def shared_folders(): src_paths = ('/plymouth/lines', '/application', '/font', - '/hooks/live', + #'/hooks/live', '/issue', '/issue', '/polkit', @@ -231,7 +231,7 @@ def shared_folders(): des_paths =('/usr/share/plymouth/themes/lines', '/usr/share/applications', '/usr/share/fonts/pepconf', - '/usr/lib/live/config', + #'/usr/lib/live/config', '/etc', '/opt/pepconf', '/usr/share/polkit-1/actions', @@ -381,9 +381,15 @@ def fusato_configs(): src_paths = ('/hooks/normal',) des_paths = ('/hooks/normal',) + src_paths_l = ('/hooks/live',) + des_paths_l = ('/hooks/live',) + src_q = collections.deque(src_paths) des_q = collections.deque(des_paths) + src_q_l = collections.deque(src_paths_l) + des_q_l = collections.deque(des_paths_l) size_q = len(src_q) + size_q_l = len(src_q_l) for size_length in range(size_q): source = src_q.popleft() des = des_q.popleft() @@ -392,6 +398,14 @@ def fusato_configs(): HOME_FOLDER + FUSATOCONFIG + des, dirs_exist_ok = True ) + for size_length in range(size_q_l): + source = src_q_l.popleft() + des = des_q_l.popleft() + logger.info(MSG_COPY+ HOME_FOLDER + source) + shutil.copytree(HOME_FOLDER + source, + HOME_FOLDER + FUSATOCONFIG + des, + dirs_exist_ok = True + ) logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des)