fix infra.py and conf.py

python_modules/conf.py

@@ -350,6 +350,7 @@ GENERAL_SHARED_LIST = ('alsa-utils\n'
                        'libgtk2.0-0\n'
                        'libgtk2.0-common\n'
                        'nala\n'
+                       'neofetch\n'
                        'network-manager-gnome\n'
                        'ntp\n'
                        'pulseaudio-module-bluetooth\n'

python_modules/infra.py

@@ -56,52 +56,6 @@ class Archive:
                             )
             logger.info(MSG_FIN + HOME_FOLDER + FUSATOCONFIG + des)
 
-<<<<<<< HEAD
-
-class ChrootFolders:
-    """ 
-        Copy all the needed folders to CHROOT Depending on 
-        the architecture it will, copy folders as needed 
-    """
-    # It would be better to move the calamares and /opt/pepconf files 
-    # to a def or other solution since they are not necessary in server 
-    # builds.
-    # Mini builds are not affected because the chroot is deleted in the 
-    # binary phase.
-    def __init__(self,sbase,sarch):
-        logger.info("Copy Chroot")
-        self.sbase = sbase
-        self.sarch = sarch
-        src_chroot = ('/osrelease/' + self.sbase + self.sarch,
-                      '/osrelease/' + self.sbase + self.sarch,
-                      '/grub/'+ self.sbase + self.sarch,
-                      #'/calamares_settings/' + self.sbase  +  self.sarch  + 
-                      #'/calamares/modules',
-                      '/grub/' + self.sbase + '_themes'
-                      )
-        des_chroot =('/usr/lib',
-                     '/opt/pepconf',
-                     '/etc/default',
-                     #'/etc/calamares/modules',
-                     '/boot/grub/themes'
-                     )
-        # Chroot Folders.
-        chroot_src_q = collections.deque(src_chroot)
-        chroot_des_q = collections.deque(des_chroot)
-        chroot_size_q = len(chroot_src_q)
-        for size_length in range(chroot_size_q):
-            source = chroot_src_q.popleft()
-            des = chroot_des_q.popleft()
-            logger.info(MSG_COPY + HOME_FOLDER + source)
-            shutil.copytree(HOME_FOLDER + source,
-                            HOME_FOLDER + WPCHROOT + des,
-                            dirs_exist_ok = True
-                            )
-            logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des)
-
-
-=======
->>>>>>> 412189ca0d7eb516b872e742cc7dc32a18ba7545
 class ChrootInstallerFiles:
     """ 
     Copies all installer folders to CHROOT depending on the base.