From 216222009c9932c398ea84f6a742610d7cf0960d Mon Sep 17 00:00:00 2001 From: debianpepper Date: Thu, 28 Sep 2023 12:09:08 +0900 Subject: [PATCH] Trouble Shoot: The hook was causing the issue with the LightDm Signed-off-by: debianpepper --- iso_configs/hooks/normal/0540-misc.hook.chroot | 8 -------- python_modules/build_iso.py | 10 +++------- python_modules/infra.py | 8 -------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/iso_configs/hooks/normal/0540-misc.hook.chroot b/iso_configs/hooks/normal/0540-misc.hook.chroot index 9907184b..b7096137 100755 --- a/iso_configs/hooks/normal/0540-misc.hook.chroot +++ b/iso_configs/hooks/normal/0540-misc.hook.chroot @@ -35,14 +35,6 @@ rm -f /etc/alternatives/desktop-grub # Then recreate it with the Pep Background ln -s /usr/share/desktop-base/active-theme/grub/pep-grub-16x9.png /etc/alternatives/desktop-grub -# for devuan the sgx group is not added... this will add it. -# when this runs for debian nothing will happen since the group is -# there already the script will just return group already exists. -# this group is related to a Kernel feature for the intel sgx -# # https://gramine.readthedocs.io/en/latest/sgx-intro.html -# we are not adding any permissions or members just the group -# the corrects the boot up error. -groupadd sgx # This will install hblock - a local ad-blocker utility diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index fc506f8d..d29f2185 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -143,7 +143,6 @@ class BuildXfce: logger.info(BUILD_COMPLETED) - def build_deb_arm(self): """ Builds the arm ISO XFCE""" current_working_directory = os.getcwd() @@ -245,7 +244,6 @@ class BuildXfce: logger.info(BUILD_COMPLETED) - def build_dev_32(self): """ Builds the 32bit ISO XFCE""" current_working_directory = os.getcwd() @@ -333,7 +331,6 @@ class BuildXfce: logger.info(BUILD_COMPLETED) - def devuan_build(self): """ Used to build the devuan base XFCE ISO @@ -409,7 +406,6 @@ class BuildGflashback: logger.info(BUILD_COMPLETED) - def build_deb_32(self): """ Builds the 32bit ISO GNOME FlashBack""" current_working_directory = os.getcwd() @@ -453,7 +449,6 @@ class BuildGflashback: logger.info(BUILD_COMPLETED) - def build_deb_arm(self): """ Builds the arm ISO GNOME FlashBack""" current_working_directory = os.getcwd() @@ -497,7 +492,6 @@ class BuildGflashback: logger.info(BUILD_COMPLETED) - def debian_build(self): """ Used to build the Debian base GNOME FlashBack ISO @@ -600,7 +594,6 @@ class BuildGflashback: logger.info(BUILD_COMPLETED) - def build_dev_arm(self): """ Builds the arm ISO GNOME FlashBack""" current_working_directory = os.getcwd() @@ -706,6 +699,7 @@ class Decsions: elif self.arguments.e == 'e-openbox': self.dopenbox() + def dxfce(self): """ Arguments for the XFCE """ if self.arguments.e == 'e-xfce': @@ -730,6 +724,7 @@ class Decsions: else: logger.critical("You have not specified a build to process!") + def dgnomefb(self): """ Arguments for the gnomefb """ if self.arguments.e == 'e-gnomefb': @@ -754,6 +749,7 @@ class Decsions: else: logger.critical("You have not specified a build to process!") + def dopenbox(self): """ Arguments for the openbox """ if self.arguments.e == 'e-openbox': diff --git a/python_modules/infra.py b/python_modules/infra.py index 40de38af..376ed600 100644 --- a/python_modules/infra.py +++ b/python_modules/infra.py @@ -439,14 +439,6 @@ def xfce_configs(): dirs_exist_ok = True ) logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des_thunar) - # Copy the XFCE Light DM files - # src_light_dm = '/lightdm/50-xfce.conf' - # des_light_dm = '/etc/lightdm/lightdm.conf.d/50-xfce.conf' - # logger.info(MSG_COPY+ HOME_FOLDER + src_thunar) - # shutil.copy(HOME_FOLDER + src_light_dm, - # HOME_FOLDER + WPCHROOT + des_light_dm - # ) - # logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des_thunar) def gnome_flahsbak_configs():