OSDN Git Service

2020.05.25 update
authorRafael Costa Rega <rcostarega@gmail.com>
Mon, 25 May 2020 15:52:38 +0000 (12:52 -0300)
committerRafael Costa Rega <rcostarega@gmail.com>
Mon, 25 May 2020 15:52:38 +0000 (12:52 -0300)
18 files changed:
CHANGELOG
Cnchi/adwaita-day.jpg
Cnchi/auto_partition.py [new file with mode: 0644]
Cnchi/desktop.py
Cnchi/desktop_info.py
Cnchi/info.py
Cnchi/main_window.py
Cnchi/packages.xml
Cnchi/postinstall.sh
Cnchi/rebornos-icon-new.png [moved from Cnchi/reborn-icon-new.png with 100% similarity, mode: 0644]
Cnchi/rebornos-icon.png [new file with mode: 0644]
Cnchi/rebornos-install.desktop [moved from Cnchi/antergos-install.desktop with 83% similarity]
Cnchi/rebornos-logo-mini2.png [new file with mode: 0644]
Cnchi/rebornos-logo-mini2.xcf [new file with mode: 0644]
Cnchi/refresh-keys.sh
build.sh
packages.both
packages2.both

index 3fcc5bd..3e91409 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,7 +36,12 @@ Location: https://repo.rebornos.org/RebornOS/sources/cnchi/
 
 2020.04.29
 
-Change load.conf (live efi boot) to:
+Change load.conf (live efi boot) from:
+
+timeout 3
+default archiso-x86_64
+
+to:
 
 timeout 5
 default archiso-x86_64.conf
@@ -49,6 +54,7 @@ Change to a new location/subgroup:
 
 https://gitlab.com/reborn-os-team/rebornos-cnchi/cnchi-gnome-based
 
+
 =========================================================================
 
 2020.05.07
@@ -70,4 +76,55 @@ File /etc/pacman.d/reborn-mirrorlist change:
 chmod 644 /etc/pacman.d/reborn-mirrorlist
 
 
+=========================================================================
+
+2020.05.22
+
+In file "desktop.py" change in line 65:
+
+self.desktop_choice = 'deepin'
+
+...to:
+
+self.desktop_choice = 'base'
+
+file 172:
+
+        # Set Gnome as default
+        self.select_default_row(desktop_info.NAMES["gnome"])
+        
+...changed to:
+
+        # Set base as default
+        self.select_default_row(desktop_info.NAMES["base"])
+
+...so that the default selection of the desktop at the time of installation goes
+from Deepin to base (base is chosen only because it is the first option
+existing in the list).
+
+
+
+In file "desktop_info.py" change the Deepin description from:
+
+    'deepin': _("Deepin desktop is a lightweight, elegant desktop environment that "
+                "has been commented as a mix between Windows and Macs by many of its' "
+                "users. It was originally created for the Linux Deepin distribution. "
+                "Now, DDE will support most Linux operating systems such as Arch "
+                "Linux, Ubuntu, Fedora, openSUSE etc."),
+                
+...to:
+
+   'deepin': _("IMPORTANT: Keep in mind that the Deepin desktop can often be unstable. "
+                "This does not depend on us, but on the developers of Deepin who "
+                "usually upload BETA versions of the desktop or some components in the "
+                "stable repositories of Arch Linux."),
+
+
+Added file "auto_partition.py" in Cnchi folder with changes to original one,
+and modified build.sh to make this change when compiling.
+Here we changed the references from AntergosRoot to RebornOSRoot, etc.
+To return to the previous condition, remove the modification in build.sh.
+
+
+
 
index 6d17793..5d8d14c 100644 (file)
Binary files a/Cnchi/adwaita-day.jpg and b/Cnchi/adwaita-day.jpg differ
diff --git a/Cnchi/auto_partition.py b/Cnchi/auto_partition.py
new file mode 100644 (file)
index 0000000..cedc193
--- /dev/null
@@ -0,0 +1,807 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# auto_partition.py
+#
+# Copyright © 2013-2018 Antergos
+#
+# Modify by Rafael from RebornOS in 2020
+#
+# This file is part of Cnchi.
+#
+# Cnchi is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Cnchi is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# The following additional terms are in effect as per Section 7 of the license:
+#
+# The preservation of all legal notices and author attributions in
+# the material or in the Appropriate Legal Notices displayed
+# by works containing it is required.
+#
+# You should have received a copy of the GNU General Public License
+# along with Cnchi; If not, see <http://www.gnu.org/licenses/>.
+
+""" AutoPartition module, used by automatic installation """
+
+import os
+import logging
+import math
+
+from misc.extra import InstallError
+from misc.run_cmd import call
+import misc.events as events
+import parted3.fs_module as fs
+
+from installation import luks
+from installation import mount
+from installation import wrapper
+
+# When testing, no _() is available
+try:
+    _("")
+except NameError as err:
+    def _(message):
+        return message
+
+# NOTE: Exceptions in this file
+# On a warning situation, Cnchi should try to continue, so we need to catch
+# the exception here. If we don't catch the exception here, it will be caught
+# in process.py and managed as a fatal error. On the other hand, if we want
+# to clarify the exception message we can catch it here and then raise an
+# InstallError exception.
+
+# Partition sizes are in MiB
+MAX_ROOT_SIZE = 30000
+
+# KDE (with all features) needs 8 GB for its files (including pacman cache xz files).
+# Vbox, by default, creates disks of 8GB. We should limit to this so vbox installations do not fail
+# (if installing kde and not enough free space is available is their fault, not ours)
+MIN_ROOT_SIZE = 8000
+
+
+class AutoPartition():
+    """ Class used by the automatic installation method """
+
+    LUKS_KEY_FILES = [".keyfile-root", ".keyfile-home"]
+
+    def __init__(self, dest_dir, auto_device, settings, callback_queue):
+        """ Class initialization """
+
+        self.dest_dir = dest_dir
+        self.auto_device = auto_device
+        self.temp = settings.get('temp')
+
+        # Use LUKS encryption
+        self.luks = settings.get("use_luks")
+        self.luks_password = settings.get("luks_root_password")
+
+        # Use LVM
+        self.lvm = settings.get("use_lvm")
+
+        # Make home a different partition or if using LVM, a different volume
+        self.home = settings.get("use_home")
+
+        self.bootloader = settings.get("bootloader").lower()
+
+        # Will use these queue to show progress info to the user
+        self.events = events.Events(callback_queue)
+
+        if os.path.exists("/sys/firmware/efi"):
+            # If UEFI use GPT
+            self.uefi = True
+            self.gpt = True
+        else:
+            # If BIOS, use MBR
+            self.uefi = False
+            self.gpt = False
+
+    def mkfs(self, device, fs_type, mount_point, label_name, fs_options="", btrfs_devices=""):
+        """ We have two main cases: "swap" and everything else. """
+        logging.debug("Will format device %s as %s", device, fs_type)
+        if fs_type == "swap":
+            err_msg = "Can't activate swap in {0}".format(device)
+            swap_devices = call(["swapon", "-s"], msg=err_msg)
+            if device in swap_devices:
+                call(["swapoff", device], msg=err_msg)
+            cmd = ["mkswap", "-L", label_name, device]
+            call(cmd, msg=err_msg)
+            cmd = ["swapon", device]
+            call(cmd, msg=err_msg)
+        else:
+            mkfs = {
+                "xfs": "mkfs.xfs {0} -L {1} -f {2}".format(
+                    fs_options, label_name, device),
+                "jfs": "yes | mkfs.jfs {0} -L {1} {2}".format(
+                    fs_options, label_name, device),
+                "reiserfs": "yes | mkreiserfs {0} -l {1} {2}".format(
+                    fs_options, label_name, device),
+                "ext2": "mkfs.ext2 -q {0} -F -L {1} {2}".format(
+                    fs_options, label_name, device),
+                "ext3": "mkfs.ext3 -q {0} -F -L {1} {2}".format(
+                    fs_options, label_name, device),
+                "ext4": "mkfs.ext4 -q {0} -F -L {1} {2}".format(
+                    fs_options, label_name, device),
+                "btrfs": "mkfs.btrfs {0} -L {1} {2}".format(
+                    fs_options, label_name, btrfs_devices),
+                "nilfs2": "mkfs.nilfs2 {0} -L {1} {2}".format(
+                    fs_options, label_name, device),
+                "ntfs-3g": "mkfs.ntfs {0} -f -L {1} {2}".format(
+                    fs_options, label_name, device),
+                "vfat": "mkfs.vfat {0} -F 32 -n {1} {2}".format(
+                    fs_options, label_name, device),
+                "fat32": "mkfs.vfat {0} -F 32 -n {1} {2}".format(
+                    fs_options, label_name, device),
+                "f2fs": "mkfs.f2fs {0} -l {1} {2}".format(
+                    fs_options, label_name, device)}
+
+            # Make sure the fs type is one we can handle
+            if fs_type not in mkfs.keys():
+                txt = _("Unknown filesystem type {0}").format(fs_type)
+                raise InstallError(txt)
+
+            command = mkfs[fs_type]
+
+            err_msg = "Can't create filesystem {0}".format(fs_type)
+            call(command.split(), msg=err_msg, fatal=True)
+
+            # Flush filesystem buffers
+            call(["sync"])
+
+            # Create our mount directory
+            path = self.dest_dir + mount_point
+            os.makedirs(path, mode=0o755, exist_ok=True)
+
+            # Mount our new filesystem
+
+            mopts = "rw,relatime"
+            if fs_type == "ext4":
+                mopts = "rw,relatime,data=ordered"
+            elif fs_type == "btrfs":
+                mopts = 'rw,relatime,space_cache,autodefrag,inode_cache'
+
+            err_msg = "Error trying to mount {0} in {1}".format(device, path)
+            cmd = ["mount", "-t", fs_type, "-o", mopts, device, path]
+            call(cmd, msg=err_msg, fatal=True)
+
+            # Change permission of base directories to avoid btrfs issues
+            if mount_point == "/tmp":
+                mode = 0o1777
+            elif mount_point == "/root":
+                mode = 0o750
+            else:
+                mode = 0o755
+            os.chmod(path, mode)
+
+        fs_uuid = fs.get_uuid(device)
+        fs_label = fs.get_label(device)
+        msg = "Device details: %s UUID=%s LABEL=%s"
+        logging.debug(msg, device, fs_uuid, fs_label)
+
+    @staticmethod
+    def get_partition_path(device, part_num):
+        """ This is awful and prone to fail. We should do some
+            type of test here """
+
+        # Remove /dev/
+        path = device.replace('/dev/', '')
+        partials = [
+            'rd/', 'ida/', 'cciss/', 'sx8/', 'mapper/', 'mmcblk', 'md', 'nvme']
+        found = [p for p in partials if path.startswith(p)]
+        if found:
+            return "{0}p{1}".format(device, part_num)
+        return "{0}{1}".format(device, part_num)
+
+    def get_devices(self):
+        """ Set (and return) all partitions on the device """
+        devices = {}
+        device = self.auto_device
+        logging.debug(device)
+
+        # device is of type /dev/sdX or /dev/hdX or /dev/mmcblkX
+
+        if self.gpt:
+            if not self.uefi:
+                # Skip BIOS Boot Partition
+                # We'll never get here as we use UEFI+GPT or BIOS+MBR
+                part_num = 2
+            else:
+                part_num = 1
+
+            if self.bootloader == "grub2":
+                devices['efi'] = self.get_partition_path(device, part_num)
+                part_num += 1
+
+            devices['boot'] = self.get_partition_path(device, part_num)
+            part_num += 1
+            devices['root'] = self.get_partition_path(device, part_num)
+            part_num += 1
+            if self.home:
+                devices['home'] = self.get_partition_path(device, part_num)
+                part_num += 1
+            devices['swap'] = self.get_partition_path(device, part_num)
+        else:
+            devices['boot'] = self.get_partition_path(device, 1)
+            devices['root'] = self.get_partition_path(device, 2)
+            if self.home:
+                devices['home'] = self.get_partition_path(device, 3)
+            devices['swap'] = self.get_partition_path(device, 5)
+
+        if self.luks:
+            if self.lvm:
+                # LUKS and LVM
+                devices['luks_root'] = devices['root']
+                devices['lvm'] = "/dev/mapper/cryptRebornOS"
+            else:
+                # LUKS and no LVM
+                devices['luks_root'] = devices['root']
+                devices['root'] = "/dev/mapper/cryptRebornOS"
+                if self.home:
+                    # In this case we'll have two LUKS devices, one for root
+                    # and the other one for /home
+                    devices['luks_home'] = devices['home']
+                    devices['home'] = "/dev/mapper/cryptRebornOSHome"
+        elif self.lvm:
+            # No LUKS but using LVM
+            devices['lvm'] = devices['root']
+
+        if self.lvm:
+            devices['root'] = "/dev/RebornOSVG/RebornOSRoot"
+            devices['swap'] = "/dev/RebornOSVG/RebornOSSwap"
+            if self.home:
+                devices['home'] = "/dev/RebornOSVG/RebornOSHome"
+
+        return devices
+
+    def get_mount_devices(self):
+        """ Specify for each mount point which device we must mount there """
+
+        devices = self.get_devices()
+        mount_devices = {}
+
+        if self.gpt and self.bootloader == "grub2":
+            mount_devices['/boot/efi'] = devices['efi']
+
+        mount_devices['/boot'] = devices['boot']
+        mount_devices['/'] = devices['root']
+
+        if self.home:
+            mount_devices['/home'] = devices['home']
+
+        if self.luks:
+            mount_devices['/'] = devices['luks_root']
+            if self.home and not self.lvm:
+                mount_devices['/home'] = devices['luks_home']
+
+        mount_devices['swap'] = devices['swap']
+
+        for mount_device in mount_devices:
+            logging.debug(
+                "%s assigned to be mounted in %s",
+                mount_devices[mount_device],
+                mount_device)
+
+        return mount_devices
+
+    def get_fs_devices(self):
+        """ Return which filesystem is in a selected device """
+
+        devices = self.get_devices()
+
+        fs_devices = {}
+
+        if self.gpt:
+            if self.bootloader == "grub2":
+                fs_devices[devices['efi']] = "vfat"
+                fs_devices[devices['boot']] = "ext4"
+            elif self.bootloader in ["systemd-boot", "refind"]:
+                fs_devices[devices['boot']] = "vfat"
+        else:
+            if self.uefi:
+                fs_devices[devices['boot']] = "vfat"
+            else:
+                fs_devices[devices['boot']] = "ext4"
+
+        fs_devices[devices['swap']] = "swap"
+        fs_devices[devices['root']] = "ext4"
+
+        if self.home:
+            fs_devices[devices['home']] = "ext4"
+
+        if self.luks:
+            fs_devices[devices['luks_root']] = "ext4"
+            if self.home:
+                if self.lvm:
+                    # luks, lvm, home
+                    fs_devices[devices['home']] = "ext4"
+                else:
+                    # luks, home
+                    fs_devices[devices['luks_home']] = "ext4"
+
+        for device in fs_devices:
+            logging.debug("Device %s will have a %s filesystem",
+                          device, fs_devices[device])
+
+        return fs_devices
+
+    def get_part_sizes(self, disk_size, start_part_sizes=1):
+        """ Returns a dict with all partition sizes """
+        part_sizes = {'disk': disk_size, 'boot': 512, 'efi': 0}
+
+        if self.gpt and self.bootloader == "grub2":
+            part_sizes['efi'] = 512
+
+        cmd = ["grep", "MemTotal", "/proc/meminfo"]
+        mem_total = call(cmd)
+        mem_total = int(mem_total.split()[1])
+        mem = mem_total / 1024
+
+        # Suggested swap sizes from Anaconda installer
+        if mem < 2048:
+            part_sizes['swap'] = 2 * mem
+        elif 2048 <= mem < 8192:
+            part_sizes['swap'] = mem
+        elif 8192 <= mem < 65536:
+            part_sizes['swap'] = mem // 2
+        else:
+            part_sizes['swap'] = 4096
+
+        # Max swap size is 10% of all available disk size
+        max_swap = disk_size * 0.1
+        if part_sizes['swap'] > max_swap:
+            part_sizes['swap'] = max_swap
+
+        part_sizes['swap'] = math.ceil(part_sizes['swap'])
+
+        other_than_root_size = start_part_sizes + \
+            part_sizes['efi'] + part_sizes['boot'] + part_sizes['swap']
+        part_sizes['root'] = disk_size - other_than_root_size
+
+        if self.home:
+            # Decide how much we leave to root and how much we leave to /home
+            # Question: why 5?
+            new_root_part_size = part_sizes['root'] // 5
+            if new_root_part_size > MAX_ROOT_SIZE:
+                new_root_part_size = MAX_ROOT_SIZE
+            elif new_root_part_size < MIN_ROOT_SIZE:
+                new_root_part_size = MIN_ROOT_SIZE
+
+            if new_root_part_size >= part_sizes['root']:
+                # new_root_part_size can't be bigger than part_sizes['root'] !
+                # this could happen if new_root_part_size == MIN_ROOT_SIZE but
+                # our harddisk is smaller (detected using vbox)
+                # Should we fail here or install without a separated /home partition?
+                logging.warning(
+                    "There's not enough free space to have a separate /home partition")
+                self.home = False
+                part_sizes['home'] = 0
+            else:
+                part_sizes['home'] = part_sizes['root'] - new_root_part_size
+                part_sizes['root'] = new_root_part_size
+        else:
+            part_sizes['home'] = 0
+
+        part_sizes['lvm_pv'] = part_sizes['swap'] + \
+            part_sizes['root'] + part_sizes['home']
+
+        for part in part_sizes:
+            part_sizes[part] = int(part_sizes[part])
+
+        return part_sizes
+
+    def log_part_sizes(self, part_sizes):
+        """ Log partition sizes for debugging purposes """
+        logging.debug("Total disk size: %dMiB", part_sizes['disk'])
+        if self.gpt and self.bootloader == "grub2":
+            logging.debug(
+                "EFI System Partition (ESP) size: %dMiB", part_sizes['efi'])
+        logging.debug("Boot partition size: %dMiB", part_sizes['boot'])
+
+        if self.lvm:
+            logging.debug("LVM physical volume size: %dMiB",
+                          part_sizes['lvm_pv'])
+
+        logging.debug("Swap partition size: %dMiB", part_sizes['swap'])
+        logging.debug("Root partition size: %dMiB", part_sizes['root'])
+
+        if self.home:
+            logging.debug("Home partition size: %dMiB", part_sizes['home'])
+
+    def get_disk_size(self):
+        """ Gets disk size in MiB """
+        # Partition sizes are expressed in MiB
+        # Get just the disk size in MiB
+        device = self.auto_device
+        device_name = os.path.split(device)[1]
+        size_path = os.path.join("/sys/block", device_name, 'size')
+        base_path = os.path.split(size_path)[0]
+        disk_size = 0
+        if os.path.exists(size_path):
+            logical_path = os.path.join(base_path, "queue/logical_block_size")
+            with open(logical_path, 'r') as logical_file:
+                logical_block_size = int(logical_file.read())
+            with open(size_path, 'r') as size_file:
+                size = int(size_file.read())
+            disk_size = ((logical_block_size * (size - 68)) / 1024) / 1024
+        else:
+            logging.error("Cannot detect %s device size", device)
+            txt = _("Setup cannot detect size of your device, please use advanced "
+                    "installation routine for partitioning and mounting devices.")
+            raise InstallError(txt)
+        return disk_size
+
+    def run_gpt(self, part_sizes):
+        """ Auto partition using a GPT table """
+        # Our computed sizes are all in mebibytes (MiB) i.e. powers of 1024, not metric megabytes.
+        # These are 'M' in sgdisk and 'MiB' in parted.
+        # If you use 'M' in parted you'll get MB instead of MiB, and you're gonna have a bad time.
+        device = self.auto_device
+
+        # Clean partition table to avoid issues!
+        wrapper.sgdisk("zap-all", device)
+
+        # Clear all magic strings/signatures - mdadm, lvm, partition tables etc.
+        wrapper.run_dd("/dev/zero", device)
+        wrapper.wipefs(device)
+
+        # Create fresh GPT
+        wrapper.sgdisk("clear", device)
+        wrapper.parted_mklabel(device, "gpt")
+
+        # Inform the kernel of the partition change.
+        # Needed if the hard disk had a MBR partition table.
+        err_msg = "Error informing the kernel of the partition change."
+        call(["partprobe", device], msg=err_msg, fatal=True)
+
+        part_num = 1
+
+        if not self.uefi:
+            # We don't allow BIOS+GPT right now, so this code will be never executed
+            # We leave here just for future reference
+            # Create BIOS Boot Partition
+            # GPT GUID: 21686148-6449-6E6F-744E-656564454649
+            # This partition is not required if the system is UEFI based,
+            # as there is no such embedding of the second-stage code in that case
+            wrapper.sgdisk_new(device, part_num, "BIOS_BOOT", 2, "EF02")
+            part_num += 1
+
+        if self.bootloader == "grub2":
+            # Create EFI System Partition (ESP)
+            # GPT GUID: C12A7328-F81F-11D2-BA4B-00A0C93EC93B
+            wrapper.sgdisk_new(
+                device, part_num, "UEFI_SYSTEM", part_sizes['efi'], "EF00")
+            part_num += 1
+
+        # Create Boot partition
+        if self.bootloader in ["systemd-boot", "refind"]:
+            wrapper.sgdisk_new(
+                device, part_num, "REBORNOS_BOOT", part_sizes['boot'], "EF00")
+        else:
+            wrapper.sgdisk_new(
+                device, part_num, "REBORNOS_BOOT", part_sizes['boot'], "8300")
+        part_num += 1
+
+        if self.lvm:
+            # Create partition for lvm
+            # (will store root, swap and home (if desired) logical volumes)
+            wrapper.sgdisk_new(
+                device, part_num, "REBORNOS_LVM", part_sizes['lvm_pv'], "8E00")
+            part_num += 1
+        else:
+            wrapper.sgdisk_new(
+                device, part_num, "REBORNOS_ROOT", part_sizes['root'], "8300")
+            part_num += 1
+            if self.home:
+                wrapper.sgdisk_new(
+                    device, part_num, "REBORNOS_HOME", part_sizes['home'], "8302")
+                part_num += 1
+            wrapper.sgdisk_new(
+                device, part_num, "REBORNOS_SWAP", 0, "8200")
+
+        output = call(["sgdisk", "--print", device])
+        logging.debug(output)
+
+    def run_mbr(self, part_sizes):
+        """ DOS MBR partition table """
+        # Our computed sizes are all in mebibytes (MiB) i.e. powers of 1024, not metric megabytes.
+        # These are 'M' in sgdisk and 'MiB' in parted.
+        # If you use 'M' in parted you'll get MB instead of MiB, and you're gonna have a bad time.
+        device = self.auto_device
+
+        # Start at sector 1 for 4k drive compatibility and correct alignment
+        # Clean partitiontable to avoid issues!
+        wrapper.run_dd("/dev/zero", device)
+        wrapper.wipefs(device)
+
+        # Create DOS MBR
+        wrapper.parted_mklabel(device, "msdos")
+
+        # Create boot partition (all sizes are in MiB)
+        # if start is -1 wrapper.parted_mkpart assumes that our partition
+        # starts at 1 (first partition in disk)
+        start = -1
+        end = part_sizes['boot']
+        wrapper.parted_mkpart(device, "primary", start, end)
+
+        # Set boot partition as bootable
+        wrapper.parted_set(device, "1", "boot", "on")
+
+        if self.lvm:
+            # Create partition for lvm (will store root, home (if desired),
+            # and swap logical volumes)
+            start = end
+            # end = start + part_sizes['lvm_pv']
+            end = "-1s"
+            wrapper.parted_mkpart(device, "primary", start, end)
+
+            # Set lvm flag
+            wrapper.parted_set(device, "2", "lvm", "on")
+        else:
+            # Create root partition
+            start = end
+            end = start + part_sizes['root']
+            wrapper.parted_mkpart(device, "primary", start, end)
+
+            if self.home:
+                # Create home partition
+                start = end
+                end = start + part_sizes['home']
+                wrapper.parted_mkpart(device, "primary", start, end)
+
+            # Create an extended partition where we will put our swap partition
+            start = end
+            # end = start + part_sizes['swap']
+            end = "-1s"
+            wrapper.parted_mkpart(device, "extended", start, end)
+
+            # Now create a logical swap partition
+            start += 1
+            end = "-1s"
+            wrapper.parted_mkpart(
+                device, "logical", start, end, "linux-swap")
+
+    def run_lvm(self, devices, part_sizes, start_part_sizes, disk_size):
+        """ Create lvm volumes """
+        logging.debug("Cnchi will setup LVM on device %s", devices['lvm'])
+
+        err_msg = "Error creating LVM physical volume in device {0}"
+        err_msg = err_msg.format(devices['lvm'])
+        cmd = ["pvcreate", "-f", "-y", devices['lvm']]
+        call(cmd, msg=err_msg, fatal=True)
+
+        err_msg = "Error creating LVM volume group in device {0}"
+        err_msg = err_msg.format(devices['lvm'])
+        cmd = ["vgcreate", "-f", "-y", "RebornOSVG", devices['lvm']]
+        call(cmd, msg=err_msg, fatal=True)
+
+        # Fix issue 180
+        # Check space we have now for creating logical volumes
+        cmd = ["vgdisplay", "-c", "RebornOSVG"]
+        vg_info = call(cmd, fatal=True)
+        # Get column number 12: Size of volume group in kilobytes
+        vg_size = int(vg_info.split(":")[11]) / 1024
+        if part_sizes['lvm_pv'] > vg_size:
+            logging.debug(
+                "Real RebornOSVG volume group size: %d MiB", vg_size)
+            logging.debug("Reajusting logical volume sizes")
+            diff_size = part_sizes['lvm_pv'] - vg_size
+            part_sizes = self.get_part_sizes(
+                disk_size - diff_size, start_part_sizes)
+            self.log_part_sizes(part_sizes)
+
+        # Create LVM volumes
+        err_msg = "Error creating LVM logical volume"
+
+        size = str(int(part_sizes['root']))
+        cmd = ["lvcreate", "--name", "RebornOSRoot", "--size", size, "RebornOSVG"]
+        call(cmd, msg=err_msg, fatal=True)
+
+        if not self.home:
+            # Use the remainig space for our swap volume
+            cmd = ["lvcreate", "--name", "RebornOSSwap", "--extents", "100%FREE", "RebornOSVG"]
+            call(cmd, msg=err_msg, fatal=True)
+        else:
+            size = str(int(part_sizes['swap']))
+            cmd = ["lvcreate", "--name", "RebornOSSwap", "--size", size, "RebornOSVG"]
+            call(cmd, msg=err_msg, fatal=True)
+            # Use the remaining space for our home volume
+            cmd = ["lvcreate", "--name", "RebornOSHome", "--extents", "100%FREE", "RebornOSVG"]
+            call(cmd, msg=err_msg, fatal=True)
+
+    def create_filesystems(self, devices):
+        """ Create filesystems in newly created partitions """
+        mount_points = {
+            'efi': '/boot/efi', 'boot': '/boot', 'root': '/', 'home': '/home', 'swap': ''}
+
+        labels = {
+            'efi': 'UEFI_SYSTEM', 'boot': 'RebornOSBoot', 'root': 'RebornOSRoot',
+            'home': 'RebornOSHome', 'swap': 'RebornOSSwap'}
+
+        fs_devices = self.get_fs_devices()
+
+        # Note: Make sure the "root" partition is defined first!
+        self.mkfs(devices['root'], fs_devices[devices['root']],
+                  mount_points['root'], labels['root'])
+        self.mkfs(devices['swap'], fs_devices[devices['swap']],
+                  mount_points['swap'], labels['swap'])
+
+        # NOTE: This will be formated in ext4 (bios or gpt+grub2) or
+        # fat32 (gpt+systemd-boot or refind bootloaders)
+        self.mkfs(devices['boot'], fs_devices[devices['boot']],
+                  mount_points['boot'], labels['boot'])
+
+        # NOTE: Make sure the "boot" partition is defined before the "efi" one!
+        if self.gpt and self.bootloader == "grub2":
+            # Format EFI System Partition (ESP) with vfat (fat32)
+            self.mkfs(devices['efi'], fs_devices[devices['efi']],
+                      mount_points['efi'], labels['efi'])
+
+        if self.home:
+            self.mkfs(devices['home'], fs_devices[devices['home']],
+                      mount_points['home'], labels['home'])
+
+    def copy_luks_keyfiles(self):
+        """ Copy root keyfile to boot partition and home keyfile to root partition
+            user will choose what to do with it
+            THIS IS NONSENSE (BIG SECURITY HOLE), BUT WE TRUST THE USER TO FIX THIS
+            User shouldn't store the keyfiles unencrypted unless the medium itself
+            is reasonably safe (boot partition is not) """
+
+        key_files = AutoPartition.LUKS_KEY_FILES
+        key_file = os.path.join(self.temp, key_files[0])
+        os.chmod(key_file, 0o400)
+        boot_path = os.path.join(self.dest_dir, "boot")
+        cmd = ['mv', key_file, boot_path]
+        call(cmd, msg="Can't copy root LUKS keyfile to the installation device.")
+        if self.home and not self.lvm:
+            key_file = os.path.join(self.temp, key_files[1])
+            os.chmod(key_files, 0o400)
+            luks_dir = os.path.join(self.dest_dir, 'etc/luks-keys')
+            os.makedirs(luks_dir, mode=0o755, exist_ok=True)
+            cmd = ['mv', key_file, luks_dir]
+            call(cmd, msg="Can't copy home LUKS keyfile to the installation device.")
+
+    @staticmethod
+    def remove_lvm(device):
+        """ Remove all previous LVM volumes
+        (it may have been left created due to a previous failed installation) """
+
+        err_msg = "Can't delete existent LVM volumes in device {0}".format(device)
+
+        cmd = ["/usr/bin/lvs", "-o", "lv_name,vg_name,devices", "--noheadings"]
+        lvolumes = call(cmd, msg=err_msg)
+        if lvolumes:
+            lvolumes = lvolumes.split("\n")
+            for lvolume in lvolumes:
+                if lvolume:
+                    (lvolume, vgroup, ldevice) = lvolume.split()
+                    if device in ldevice:
+                        lvdev = "/dev/" + vgroup + "/" + lvolume
+                        call(["/usr/bin/wipefs", "-a", lvdev], msg=err_msg)
+                        call(["/usr/bin/lvremove", "-f", lvdev], msg=err_msg)
+
+        cmd = ["/usr/bin/vgs", "-o", "vg_name,devices", "--noheadings"]
+        vgnames = call(cmd, msg=err_msg)
+        if vgnames:
+            vgnames = vgnames.split("\n")
+            for vgname in vgnames:
+                (vgname, vgdevice) = vgname.split()
+                if vgname and device in vgdevice:
+                    call(["/usr/bin/vgremove", "-f", vgname], msg=err_msg)
+
+        cmd = ["/usr/bin/pvs", "-o", "pv_name", "--noheadings"]
+        pvolumes = call(cmd, msg=err_msg)
+        if pvolumes:
+            pvolumes = pvolumes.split("\n")
+            for pvolume in pvolumes:
+                pvolume = pvolume.strip()
+                if device in pvolume:
+                    cmd = ["/usr/bin/pvremove", "-ff", "-y", pvolume]
+                    call(cmd, msg=err_msg)
+    @staticmethod
+    def printk(enable):
+        """ Enables / disables printing kernel messages to console """
+        with open("/proc/sys/kernel/printk", "w") as fpk:
+            if enable:
+                fpk.write("4")
+            else:
+                fpk.write("0")
+
+    def log_devices(self, devices):
+        """ Log all devices for debugging purposes """
+        if self.gpt and self.bootloader == "grub2":
+            logging.debug("EFI: %s", devices['efi'])
+        logging.debug("Boot: %s", devices['boot'])
+        logging.debug("Root: %s", devices['root'])
+        if self.home:
+            logging.debug("Home: %s", devices['home'])
+        logging.debug("Swap: %s", devices['swap'])
+
+    def run(self):
+        """ Main method. Runs auto partition sequence """
+        disk_size = self.get_disk_size()
+        device = self.auto_device
+        start_part_sizes = 1
+
+        part_sizes = self.get_part_sizes(disk_size, start_part_sizes)
+        self.log_part_sizes(part_sizes)
+
+        # Disable swap and unmount all partitions inside dest_dir
+        mount.unmount_all_in_directory(self.dest_dir)
+        # Disable swap and unmount all partitions of device
+        mount.unmount_all_in_device(device)
+        # Remove lvm in destination device
+        self.remove_lvm(device)
+        # Close luks devices in destination device
+        luks.close_antergos_devices()
+
+        self.printk(False)
+        if self.gpt:
+            self.run_gpt(part_sizes)
+        else:
+            self.run_mbr(part_sizes)
+        self.printk(True)
+
+        # Wait until /dev initialized correct devices
+        call(["udevadm", "settle"])
+
+        devices = self.get_devices()
+
+        self.log_devices(devices)
+
+        if self.luks:
+            luks_options = {'password': self.luks_password,
+                            'key': AutoPartition.LUKS_KEY_FILES[0]}
+            luks.setup(devices['luks_root'], 'cryptRebornOS', luks_options)
+            if self.home and not self.lvm:
+                luks_options = {'password': self.luks_password,
+                                'key': AutoPartition.LUKS_KEY_FILES[1]}
+                luks.setup(devices['luks_home'], 'cryptRebornOSHome', luks_options)
+
+        if self.lvm:
+            self.run_lvm(devices, part_sizes, start_part_sizes, disk_size)
+
+        # We have all partitions and volumes created. Let's create its filesystems with mkfs.
+        self.create_filesystems(devices)
+
+        # NOTE: encrypted and/or lvm2 hooks will be added to mkinitcpio.conf
+        #       in mkinitcpio.py, if necessary.
+        # NOTE: /etc/default/grub, /etc/stab and /etc/crypttab will be modified
+        #       in post_install.py, if necessary.
+
+        if self.luks and self.luks_password == "":
+            self.copy_luks_keyfiles()
+
+
+def test_module():
+    """ Test autopartition module """
+    import gettext
+
+    _ = gettext.gettext
+
+    os.makedirs("/var/log/cnchi")
+    logging.basicConfig(
+        filename="/var/log/cnchi/cnchi-autopartition.log",
+        level=logging.DEBUG)
+
+    settings = {
+        'use_luks': True,
+        'luks_password': "luks",
+        'use_lvm': True,
+        'use_home': True,
+        'bootloader': "grub2"}
+
+    AutoPartition(
+        dest_dir="/install",
+        auto_device="/dev/sdb",
+        settings=settings,
+        callback_queue=None).run()
+
+if __name__ == '__main__':
+    test_module()
index b6eabe2..d7ec33c 100644 (file)
@@ -62,7 +62,7 @@ class DesktopAsk(GtkBaseBox):
         self.listbox.set_selection_mode(Gtk.SelectionMode.BROWSE)
         self.listbox.set_sort_func(self.listbox_sort_by_name, None)
 
-        self.desktop_choice = 'deepin'
+        self.desktop_choice = 'base'
 
         self.enabled_desktops = self.settings.get("desktops")
 
@@ -169,8 +169,8 @@ class DesktopAsk(GtkBaseBox):
 
                 self.listbox.add(box)
 
-        # Set Gnome as default
-        self.select_default_row(desktop_info.NAMES["gnome"])
+        # Set base as default
+        self.select_default_row(desktop_info.NAMES["base"])
 
     @staticmethod
     def listbox_sort_by_name(row1, row2, _user_data):
index d183aff..e74b5e0 100644 (file)
@@ -131,11 +131,10 @@ DESCRIPTIONS = {
                   "innovative features and a traditional desktop user experience. "
                   "Cinnamon aims to make users feel at home by providing them with "
                   "an easy-to-use and comfortable desktop experience."),
-    'deepin': _("Deepin desktop is a lightweight, elegant desktop environment that "
-                "has been commented as a mix between Windows and Macs by many of its' "
-                "users. It was originally created for the Linux Deepin distribution. "
-                "Now, DDE will support most Linux operating systems such as Arch "
-                "Linux, Ubuntu, Fedora, openSUSE etc."),
+    'deepin': _("IMPORTANT: Keep in mind that the Deepin desktop can often be unstable. "
+                "This does not depend on us, but on the developers of Deepin who "
+                "usually upload BETA versions of the desktop or some components in the "
+                "stable repositories of Arch Linux."),
     'pantheon': _("Pantheon is the desktop environment that Elementary OS runs on. "
                   "While true Pantheon is too unstable for RebornOS to offer, we "
                   "have tried to offer the next best thing. By selecting Pantheon, "
index 91c8cf8..fa53251 100755 (executable)
@@ -29,7 +29,7 @@
 
 """ Set some Cnchi global constants """
 
-CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.14"
+CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.25"
 CNCHI_WEBSITE = "https://rebornos.org"
 CNCHI_RELEASE_STAGE = "production"
 
index d0699d1..7de0d40 100644 (file)
@@ -3,7 +3,7 @@
 #
 # main_window.py
 #
-# Copyright © 2013-2018 Antergos
+# Copyright © 2013-2018 RebornOS
 #
 # This file is part of Cnchi.
 #
@@ -167,7 +167,7 @@ class MainWindow(Gtk.ApplicationWindow):
 
         self.logo = self.header_ui.get_object("logo")
         path = os.path.join(
-            data_dir, "images", "antergos", "antergos-logo-mini2.png")
+            data_dir, "images", "antergos", "rebornos-logo-mini2.png")
         self.logo.set_from_file(path)
 
         # To honor our css
@@ -236,7 +236,7 @@ class MainWindow(Gtk.ApplicationWindow):
         self.pages = dict()
         self.pages["welcome"] = pages.welcome.Welcome(self.params)
 
-        if os.path.exists('/home/reborn/.config/openbox'):
+        if os.path.exists('/home/antergos/.config/openbox'):
             # In minimal iso, load language screen now
             self.pages["language"] = pages.language.Language(self.params)
 
@@ -267,13 +267,13 @@ class MainWindow(Gtk.ApplicationWindow):
             data_dir,
             "images",
             "antergos",
-            "antergos-icon.png")
+            "rebornos-icon.png")
         self.set_icon_from_file(icon_path)
 
         # Set the first page to show
 
         # If minimal iso is detected, skip the welcome page.
-        if os.path.exists('/home/reborn/.config/openbox'):
+        if os.path.exists('/home/antergos/.config/openbox'):
             self.current_page = self.pages["language"]
             self.settings.set('timezone_start', True)
         else:
@@ -309,7 +309,7 @@ class MainWindow(Gtk.ApplicationWindow):
 
         # Do not hide progress bar for minimal iso as it would break
         # the widget alignment on language page.
-        if not os.path.exists('/home/reborn/.config/openbox'):
+        if not os.path.exists('/home/antergos/.config/openbox'):
             # Hide progress bar
             self.progressbar.hide()
 
@@ -326,7 +326,7 @@ class MainWindow(Gtk.ApplicationWindow):
 
     def load_pages(self):
         """ Preload all installer pages """
-        if not os.path.exists('/home/reborn/.config/openbox'):
+        if not os.path.exists('/home/antergos/.config/openbox'):
             self.pages["language"] = pages.language.Language(self.params)
 
         self.pages["check"] = pages.check.Check(self.params)
@@ -369,7 +369,7 @@ class MainWindow(Gtk.ApplicationWindow):
         self.pages["slides"] = pages.slides.Slides(self.params)
 
         diff = 2
-        if os.path.exists('/home/reborn/.config/openbox'):
+        if os.path.exists('/home/antergos/.config/openbox'):
             # In minimal (openbox) we don't have a welcome screen
             diff = 3
 
index 37e37d8..8d46cf8 100755 (executable)
@@ -3,8 +3,8 @@
     <editions>
         <edition name="common" description="Packages common to all DE and base">
             <packages>
-                <pkgname>common-cosmic-reborn</pkgname>
-                <pkgname>full-base-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-common</pkgname>
+                <pkgname>rebornos-cosmic-full-base</pkgname>
                 <pkgname>base</pkgname>
                 <pkgname>base-devel</pkgname>
             </packages>
                 <pkgname lang="zh_SG">noto-fonts-cjk</pkgname>
                 <pkgname lang="zh_TW">noto-fonts-cjk</pkgname>
                 <pkgname lang="ko_KR">noto-fonts-cjk</pkgname>
-                <pkgname>graphic-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-graphic</pkgname>
             </packages>
         </edition>
 
         <edition name="base" description="Without X">
             <packages>
-                <pkgname>full-base-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-full-base</pkgname>
             </packages>
         </edition>
 
         <edition name="Gnome" description="Gnome Desktop">
             <packages>
-                <pkgname>gnome-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-gnome</pkgname>
                 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
                 <pkgname>gnome</pkgname>
             </packages>
@@ -45,7 +45,7 @@
 
         <edition name="Apricity" description="Apricity Desktop">
             <packages>
-                <pkgname>gnome-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-gnome</pkgname>
                 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
                 <pkgname>gnome</pkgname>
                 <pkgname>apricity-theme</pkgname>
@@ -55,7 +55,7 @@
         <edition name="Cinnamon" description="Cinnamon desktop">
             <packages>
                 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
-                <pkgname>cinnamon-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-cinnamon</pkgname>
                 <pkgname>cinnamon</pkgname>
                 <!-- <pkgname>lightdm</pkgname> -->
                 <!-- <pkgname>lightdm-webkit2-greeter</pkgname> -->
@@ -65,7 +65,7 @@
         <edition name="Pantheon" description="Pantheon desktop">
             <packages>
                 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
-                <pkgname>elementary-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-pantheon</pkgname>
                 <pkgname>pantheon</pkgname>
             </packages>
         </edition>
@@ -73,7 +73,7 @@
         <edition name="Windows" description="Windows Interface">
             <packages>
                 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
-                <pkgname>cinnamon-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-cinnamon</pkgname>
                 <pkgname>cinnamon</pkgname>
                 <!-- <pkgname>lightdm</pkgname> -->
                 <!-- <pkgname>lightdm-webkit2-greeter</pkgname> -->
@@ -83,7 +83,7 @@
 
         <edition name="XFCE" description="XFCE Desktop">
             <packages>
-                <pkgname>xfce-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-xfce</pkgname>
                 <pkgname>xfce4-goodies</pkgname>
                 <pkgname>xfce4</pkgname>
                 <pkgname>sddm-theme-gracilis-git</pkgname>
@@ -93,7 +93,7 @@
 
         <edition name="Mate" description="MATE Desktop">
             <packages>
-                <pkgname>mate-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-mate</pkgname>
                 <pkgname>mate</pkgname>
                 <pkgname>mate-extra</pkgname>
             </packages>
         <edition name="openbox" description="Openbox Window Manager">
             <packages>
                 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
-                <pkgname>openbox-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-openbox</pkgname>
                 <pkgname>lxde-gtk3</pkgname>
             </packages>
         </edition>
 
         <edition name="KDE" description="KDE Desktop">
             <packages>
-                <pkgname>kde-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-kde</pkgname>
                 <pkgname>plasma</pkgname>
                 <pkgname>kdebase</pkgname>
                 <pkgname>kdeutils</pkgname>
 
         <edition name="lxqt" description="LXQT Desktop">
             <packages>
-                <pkgname>lxqt-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-lxqt</pkgname>
                 <pkgname>lxqt</pkgname>
             </packages>
         </edition>
 
         <edition name="Enlightenment" description="Enlightenment Desktop">
             <packages>
-                <pkgname>enlightenment-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-enlightenment</pkgname>
                 <pkgname>enlightenment</pkgname>
                 <!-- <pkgname nm='true' name='connman'>connman</pkgname> -->
             </packages>
 
         <edition name="Budgie" description="Solus desktop">
             <packages>
-                <pkgname>budgie-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-budgie</pkgname>
             </packages>
         </edition>
 
         <edition name="i3" description="Tiling window manager">
             <packages>
-                <pkgname>i3-cosmic-reborn</pkgname>
+                <pkgname>rebornos-cosmic-i3</pkgname>
             </packages>
         </edition>
 
         <edition name="Deepin" description="Deepin Desktop">
            <packages>
-               <pkgname>deepin-cosmic-reborn</pkgname>
+               <pkgname>rebornos-cosmic-deepin</pkgname>
                <!-- <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname> -->
-               <pkgname>reborn-deepin-schemas</pkgname>
+               <!-- <pkgname>reborn-deepin-schemas</pkgname> -->
                <!-- <pkgname>deepin-file-manager-root</pkgname> -->
                <!-- <pkgname>flatplat-blue-theme</pkgname> -->
                <pkgname dm='true' name='lightdm'>lightdm</pkgname>
             <pkgname>broadcom-wl</pkgname>
         </feature>
         <feature name="cups">
-            <pkgname>cups-cosmic-reborn</pkgname>
+            <pkgname>rebornos-cosmic-cups</pkgname>
             <pkgname lib='qt'>print-manager</pkgname>
             <pkgname lib='gtk'>system-config-printer</pkgname>
             <!-- <pkgname lib='gtk'>python2-gnomekeyring</pkgname> -->
index 6a27f70..7dea709 100755 (executable)
@@ -325,12 +325,12 @@ postinstall() {
 
     for file in "${env_files[@]}"
     do
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based <---" >> "${file}"
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based <--- #" >> "${file}"
         if [ "${CN_BROWSER}" != "" ]; then
             echo "BROWSER=/usr/bin/${CN_BROWSER}" >> "${file}"
         fi
         echo "EDITOR=/usr/bin/nano" >> "${file}"
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based <---" >> "${file}"
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based <--- #" >> "${file}"
     done
 
     # Uncomplicated Firewall Workaround (Rafael from RebornOS)
@@ -370,9 +370,9 @@ postinstall() {
         cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
         cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
         cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
         cp /usr/share/cnchi/101_gnome.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/
@@ -387,9 +387,9 @@ postinstall() {
 #        cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
 #        cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
 #        cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-#        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
+#        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
 #        echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-#        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
+#        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
 #        chroot ${CN_DESTDIR} systemctl enable earlyoom
 #        chroot ${CN_DESTDIR} systemctl enable ufw
 #    fi
@@ -417,9 +417,9 @@ postinstall() {
         cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
         cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
         cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
     fi
@@ -433,9 +433,9 @@ postinstall() {
         cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
         cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
         cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for i3 Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for i3 Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for i3 Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for i3 Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
     fi
@@ -449,9 +449,9 @@ postinstall() {
  #       cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
  #       cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
  #       cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
- #       echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
+ #       echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
  #       echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
- #       echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
+ #       echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
  #       chroot ${CN_DESTDIR} systemctl enable earlyoom
  #       chroot ${CN_DESTDIR} systemctl enable ufw
  #   fi
@@ -501,9 +501,9 @@ postinstall() {
         chroot ${CN_DESTDIR} mate-panel --reset --layout default
         # chroot ${CN_DESTDIR} mate-panel --reset --layout cinnamon
         # chroot ${CN_DESTDIR} sudo mate-panel --reset --layout cinnamon
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for MATE Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for MATE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for MATE Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for MATE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
     fi
@@ -517,9 +517,9 @@ if [[ xfce = "${CN_DESKTOP}" ]]; then
         cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
         cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
         cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
 fi
@@ -533,9 +533,9 @@ if [[ cinnamon = "${CN_DESKTOP}" ]]; then
         cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
         cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
         cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
         cp /usr/share/cnchi/95_cinnamon.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/
@@ -551,9 +551,9 @@ if [[ pantheon = "${CN_DESKTOP}" ]]; then
         cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
         cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
         cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <---" >> ${CN_DESTDIR}/etc/environment
+        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
 fi
@@ -567,9 +567,9 @@ fi
 #        cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
 #        cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
 #        cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
-#        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
+#        echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
 #        echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
-#        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
+#        echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
 #        chroot ${CN_DESTDIR} systemctl enable earlyoom
 #        chroot ${CN_DESTDIR} systemctl enable ufw
 #fi
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Cnchi/reborn-icon-new.png
rename to Cnchi/rebornos-icon-new.png
diff --git a/Cnchi/rebornos-icon.png b/Cnchi/rebornos-icon.png
new file mode 100644 (file)
index 0000000..181725b
Binary files /dev/null and b/Cnchi/rebornos-icon.png differ
similarity index 83%
rename from Cnchi/antergos-install.desktop
rename to Cnchi/rebornos-install.desktop
index 344da88..0e5c06f 100644 (file)
@@ -4,12 +4,11 @@ Comment[pl]=Zainstaluj system RebornOS
 Comment[sk]=Nainštaluje operačný systém na disk
 Exec=sudo /usr/bin/cnchi-start.sh
 GenericName=RebornOS Installer
-Icon=/usr/share/pixmaps/reborn-icon-new.png
-Name=Reborn Installer
+Icon=/usr/share/pixmaps/rebornos-icon-new.png
+Name=RebornOS Installer
 Name[en_US]=RebornOS Installer
 Name[pl]=Zainstaluj RebornOS
 Name[sk]=Inštalovať RebornOS
 Terminal=True
 Type=Application
 Categories=System;
-
diff --git a/Cnchi/rebornos-logo-mini2.png b/Cnchi/rebornos-logo-mini2.png
new file mode 100644 (file)
index 0000000..f2bd332
Binary files /dev/null and b/Cnchi/rebornos-logo-mini2.png differ
diff --git a/Cnchi/rebornos-logo-mini2.xcf b/Cnchi/rebornos-logo-mini2.xcf
new file mode 100644 (file)
index 0000000..0958148
Binary files /dev/null and b/Cnchi/rebornos-logo-mini2.xcf differ
index 56667c9..787278f 100755 (executable)
@@ -1,4 +1,4 @@
-gsettings set org.gnome.shell favorite-apps "['firefox.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'gparted.desktop', 'antergos-install.desktop', 'org.gnome.Terminal.desktop']"
+gsettings set org.gnome.shell favorite-apps "['firefox.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'gparted.desktop', 'rebornos-install.desktop', 'org.gnome.Terminal.desktop']"
 sudo systemctl start NetworkManager.service
 sudo rm -rf /etc/pacman.d/gnupg
 sudo pacman-key --init
index 9561714..f8f0d4c 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -297,8 +297,6 @@ cp ${script_path}/Cnchi/check.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/sr
 #cp ${script_path}/Cnchi/timezone.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/welcome.py
 cp ${script_path}/Cnchi/welcome.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
-#rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
-#cp ${script_path}/Cnchi/desktop.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
 #rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/download/metalink.py
 #cp ${script_path}/Cnchi/metalink.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/download/
 #rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/pac.py
@@ -357,7 +355,7 @@ cp ${script_path}/images/desktop-environment-budgie.svg ${work_dir}/${arch}/airo
 cp ${script_path}/images/desktop-environment-i3.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/icons/scalable/
 cp ${script_path}/Cnchi/reborn-mirrorlist ${work_dir}/${arch}/airootfs/etc/pacman.d/
 #
-# Replacement made by Rafael from RebornOS
+# ===>>> Replacement made by Rafael from RebornOS <<<=== #
 #
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/pacman.conf
 cp ${script_path}/Cnchi/pacman.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/
@@ -395,47 +393,59 @@ rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/slides.py
 cp ${script_path}/Cnchi/slides.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pacman/pac.py
 cp ${script_path}/Cnchi/pac.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pacman/
-# Use neofetch to show in terminal RebornOS logo and info
+# ===>>> Use neofetch to show in terminal RebornOS logo and info <<<=== #
 rm ${work_dir}/${arch}/airootfs/home/rebornos/.bashrc
 cp ${script_path}/Cnchi/bashrc ${work_dir}/${arch}/airootfs/home/rebornos/.bashrc
-# Correct GeoIP timeout
+# ===>>> Correct GeoIP timeout <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/geoip.py
 cp ${script_path}/Cnchi/geoip.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
-# cnchi-start.sh is modified in its original location
+# ===>>> cnchi-start.sh is modified in its original location <<<=== #
 # rm ${work_dir}/${arch}/airootfs/usr/bin/cnchi-start.sh
 # cp ${script_path}/Cnchi/cnchi-start.sh ${work_dir}/${arch}/airootfs/usr/bin/
-# Replace access to the RebornOS installer with another one with "sudo"
+# ===>>> Replace access to the RebornOS installer with another one with "sudo" <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/applications/antergos-install.desktop
-cp ${script_path}/Cnchi/antergos-install.desktop ${work_dir}/${arch}/airootfs/usr/share/applications/
-# Add new cnchi icon for RebornOS Installer
+cp ${script_path}/Cnchi/rebornos-install.desktop ${work_dir}/${arch}/airootfs/usr/share/applications/
+# ===>>> Add new cnchi icon for RebornOS Installer (change her name from reborn to rebornos) <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/pixmaps/cnchi.png
 cp ${script_path}/Cnchi/cnchi.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
-cp ${script_path}/Cnchi/reborn-icon-new.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
+cp ${script_path}/Cnchi/rebornos-icon-new.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
 cp ${script_path}/Cnchi/cnchi.png ${work_dir}/${arch}/airootfs/usr/share/applications/
-# Add new wallpaper for RebornOS Live
+# ===>>> Add new wallpaper for RebornOS Live <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-day.jpg
 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/
 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-morning.jpg
 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-morning.jpg
 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-night.jpg
 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-night.jpg
-# Delete refresh.desktop in ~/.config/autostart and add new refresh-keys.desktop
-# to refresh keys and run cnchi-start.sh when Live start
+# ===>>> Delete refresh.desktop in ~/.config/autostart and add new refresh-keys.desktop
+# to refresh keys and run cnchi-start.sh when Live start <<<=== #
 rm ${work_dir}/${arch}/airootfs/home/rebornos/.config/autostart/refresh.desktop
 cp ${script_path}/Cnchi/refresh-keys.desktop ${work_dir}/${arch}/airootfs/home/rebornos/.config/autostart/
-# Add refresh-keys.sh to /usr/bin (called by install.desktop)
-# In the end, call cnchi-start.sh
+# ===>>> Add refresh-keys.sh to /usr/bin (called by install.desktop)
+# In the end, call cnchi-start.sh <<<=== #
 cp ${script_path}/Cnchi/refresh-keys.sh ${work_dir}/${arch}/airootfs/usr/bin/
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/scripts/10_antergos
 cp ${script_path}/Cnchi/10_antergos ${work_dir}/${arch}/airootfs/usr/share/cnchi/scripts/
-# Uncomplicated Firewall Workaround
+# ===>>> Uncomplicated Firewall Workaround <<<=== #
 cp ${script_path}/Cnchi/gufw.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/
 cp ${script_path}/Cnchi/gufw.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/
 cp ${script_path}/Cnchi/gufw.desktop ${work_dir}/${arch}/airootfs/usr/share/cnchi/
-# Cinnamon gschema
+# ===>>> Cinnamon gschema <<<=== #
 cp ${script_path}/Cnchi/95_cinnamon.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
-# Gnome gschema
+# ===>>> Gnome gschema <<<=== #
 cp ${script_path}/Cnchi/101_gnome.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
+# ===>>> auto_partition.py modifications (change AntergosRoot by RebornOSRoot and others things...) <<<=== #
+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/auto_partition.py
+cp ${script_path}/Cnchi/auto_partition.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/
+# ===>>> Replace desktop.py to start with the default "base" desktop <<<=== #
+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
+cp ${script_path}/Cnchi/desktop.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
+# ===>>> Change main_window.py with new rebornos-logo-mini2.png and rebornos-icon.png <<<=== #
+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
+cp ${script_path}/Cnchi/main_window.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
+# ===>>> Add new png files used by modify main_window.py  <<<=== #
+cp ${script_path}/Cnchi/rebornos-logo-mini2.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/
+cp ${script_path}/Cnchi/rebornos-icon.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/
 echo "DONE"
 echo
 echo "Replacing Antergos mentions with RebornOS"
@@ -456,9 +466,9 @@ sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/wireless.py
 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/zfs.py
 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
-sed -i "s/gnome/deepin/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
-#sed -i "s/Antergos/Reborn/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/encfs.py
-sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
+# sed -i "s/gnome/deepin/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py ==>> Commented to run "base" desktop preselected
+# sed -i "s/Antergos/Reborn/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/encfs.py
+sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
 echo "DONE"
 echo
 echo "Removing Mycroft-RebornOS's startup file from the ISO..."
index 242d93b..22c1a41 100755 (executable)
@@ -1,13 +1,10 @@
 # Random Stuff. Bit bloated, contains both core packages and random other ones. Basically, this section is a wreck
 rebornos-keyring
-btrfs-progs
 clonezilla
 darkhttpd
 ddrescue
 dhclient
 dialog
-dmraid
-dnsutils
 elinks
 ethtool
 exfat-utils
@@ -16,9 +13,7 @@ fping
 fsarchiver
 gnu-netcat
 gpm
-gptfdisk
 grml-zsh-config
-grub
 gtk3
 hdparm
 irssi
@@ -29,15 +24,12 @@ lftp
 linux-atm
 lsscsi
 mc
-mtools
 ndisc6
 nfs-utils
 nilfs-utils
 nmap
-ntp
 openconnect
 partclone
-parted
 partimage
 ppp
 pptpclient
@@ -58,15 +50,19 @@ yay
 base
 base-devel
 
-# Comsic packages
-common-cosmic-reborn
-full-base-cosmic-reborn
-graphic-cosmic-reborn
+# ===>>> Comsic packages <<<=== #
+# common-cosmic-reborn
+# full-base-cosmic-reborn
+# graphic-cosmic-reborn
+rebornos-cosmic-common
+rebornos-cosmic-full-base
+rebornos-cosmic-graphic
 
 
-# GNOME install start here
+# ===>>> GNOME install start here <<<=== #
 gnome
-gnome-cosmic-reborn
+# gnome-cosmic-reborn
+rebornos-cosmic-gnome
 gdm
 network-manager-applet
 gnome-shell-extension-appindicator
@@ -82,7 +78,7 @@ yaru-icon-theme
 yaru-sound-theme
 
 
-# VirtualBox
+# ===>>> VirtualBox <<<=== #
 #Virtualbox and xf86 packages? Whose bright idea was it to combine these? Oh wait... probably mine at one point
 # virtualbox-guest-modules-arch --> It is no longer in the repository. Now present in the kernel.
 # virtualbox-guest-utils
@@ -96,11 +92,11 @@ xorg-apps
 xorg-fonts
 
 
-# VMWare
+# ===>>> VMWare <<<=== #
 xf86-video-vmware
 
 
-# Scripts to aid in installing Arch Linux
+# ===>>> Scripts to aid in installing Arch Linux <<<=== #
 arch-install-scripts
 
 
@@ -120,7 +116,7 @@ rebornos-fire
 bubblewrap
 
 
-# Firefox web browser
+# ===>>> Firefox web browser <<<=== #
 firefox
 firefox-adblock-plus
 firefox-extension-privacybadger
@@ -146,7 +142,7 @@ ufw
 gufw
 
 
-# Fonts
+# ===>>> Fonts <<<=== #
 opendesktop-fonts
 ttf-arphic-uming
 ttf-baekmuk
@@ -157,14 +153,14 @@ ttf-ubuntu-font-family
 noto-fonts-cjk
 
 
-#Linux-y things
+# ===>>> Linux-y things <<<=== #
 btrfs-progs
 linux-api-headers
 mtools
 squashfs-tools
 
 
-#Things related to booting
+# ===>>> Things related to booting <<<=== #
 dmraid
 efitools
 fakeroot
@@ -175,14 +171,13 @@ hwdetect
 hwinfo
 ntp
 os-prober
-parted
 
 #Random group I sort of didn't ever pay attention to until writing this comment
 expect
 git
 
 
-#Network packages
+# ===>>> Network packages <<<=== #
 b43-firmware
 broadcom-wl-dkms
 dnsutils
@@ -197,7 +192,7 @@ xf86-video-nouveau
 nvidia
 nvidia-settings
 
-#Necessary for Cnchi. Enter Cnchi bloat!
+# ===>>> Necessary for Cnchi. Enter Cnchi bloat! <<<=== #
 encfs
 pam_encfs
 libinput
@@ -227,7 +222,6 @@ python-pyparted
 webkit2gtk
 python-mako
 iso-codes
-gptfdisk
 python-whither
 python-bugsnag
 # reborn-welcome --> Removed to allow cnchi-start.sh to be the only thing to start automatically
index f6ba9cf..a86c9de 100755 (executable)
@@ -64,9 +64,12 @@ base
 base-devel
 deepin
 deepin-extra
-common-cosmic-reborn
-full-base-cosmic-reborn
-graphic-cosmic-reborn
+# common-cosmic-reborn
+# full-base-cosmic-reborn
+# graphic-cosmic-reborn
+rebornos-cosmic-common
+rebornos-cosmic-full-base
+rebornos-cosmic-graphic
 deepin-cosmic-reborn
 bubblewrap
 chromium-widevine