• R/O
  • HTTP
  • SSH
  • HTTPS

cnchi-gnome-osdn: Commit

RebornOS cnchi Gnome based install code


Commit MetaInfo

Revision1823d7d1e3a5a62db8bbe8f6fd9e0e3f5663aa68 (tree)
Time2020-05-26 00:52:38
AuthorRafael Costa Rega <rcostarega@gmai...>
CommiterRafael Costa Rega

Log Message

2020.05.25 update

Change Summary

Incremental Difference

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,7 +36,12 @@ Location: https://repo.rebornos.org/RebornOS/sources/cnchi/
3636
3737 2020.04.29
3838
39-Change load.conf (live efi boot) to:
39+Change load.conf (live efi boot) from:
40+
41+timeout 3
42+default archiso-x86_64
43+
44+to:
4045
4146 timeout 5
4247 default archiso-x86_64.conf
@@ -49,6 +54,7 @@ Change to a new location/subgroup:
4954
5055 https://gitlab.com/reborn-os-team/rebornos-cnchi/cnchi-gnome-based
5156
57+
5258 =========================================================================
5359
5460 2020.05.07
@@ -70,4 +76,55 @@ File /etc/pacman.d/reborn-mirrorlist change:
7076 chmod 644 /etc/pacman.d/reborn-mirrorlist
7177
7278
79+=========================================================================
80+
81+2020.05.22
82+
83+In file "desktop.py" change in line 65:
84+
85+self.desktop_choice = 'deepin'
86+
87+...to:
88+
89+self.desktop_choice = 'base'
90+
91+file 172:
92+
93+ # Set Gnome as default
94+ self.select_default_row(desktop_info.NAMES["gnome"])
95+
96+...changed to:
97+
98+ # Set base as default
99+ self.select_default_row(desktop_info.NAMES["base"])
100+
101+...so that the default selection of the desktop at the time of installation goes
102+from Deepin to base (base is chosen only because it is the first option
103+existing in the list).
104+
105+
106+
107+In file "desktop_info.py" change the Deepin description from:
108+
109+ 'deepin': _("Deepin desktop is a lightweight, elegant desktop environment that "
110+ "has been commented as a mix between Windows and Macs by many of its' "
111+ "users. It was originally created for the Linux Deepin distribution. "
112+ "Now, DDE will support most Linux operating systems such as Arch "
113+ "Linux, Ubuntu, Fedora, openSUSE etc."),
114+
115+...to:
116+
117+ 'deepin': _("IMPORTANT: Keep in mind that the Deepin desktop can often be unstable. "
118+ "This does not depend on us, but on the developers of Deepin who "
119+ "usually upload BETA versions of the desktop or some components in the "
120+ "stable repositories of Arch Linux."),
121+
122+
123+Added file "auto_partition.py" in Cnchi folder with changes to original one,
124+and modified build.sh to make this change when compiling.
125+Here we changed the references from AntergosRoot to RebornOSRoot, etc.
126+To return to the previous condition, remove the modification in build.sh.
127+
128+
129+
73130
Binary files a/Cnchi/adwaita-day.jpg and b/Cnchi/adwaita-day.jpg differ
--- /dev/null
+++ b/Cnchi/auto_partition.py
@@ -0,0 +1,807 @@
1+#!/usr/bin/env python
2+# -*- coding: utf-8 -*-
3+#
4+# auto_partition.py
5+#
6+# Copyright © 2013-2018 Antergos
7+#
8+# Modify by Rafael from RebornOS in 2020
9+#
10+# This file is part of Cnchi.
11+#
12+# Cnchi is free software; you can redistribute it and/or modify
13+# it under the terms of the GNU General Public License as published by
14+# the Free Software Foundation; either version 3 of the License, or
15+# (at your option) any later version.
16+#
17+# Cnchi is distributed in the hope that it will be useful,
18+# but WITHOUT ANY WARRANTY; without even the implied warranty of
19+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20+# GNU General Public License for more details.
21+#
22+# The following additional terms are in effect as per Section 7 of the license:
23+#
24+# The preservation of all legal notices and author attributions in
25+# the material or in the Appropriate Legal Notices displayed
26+# by works containing it is required.
27+#
28+# You should have received a copy of the GNU General Public License
29+# along with Cnchi; If not, see <http://www.gnu.org/licenses/>.
30+
31+""" AutoPartition module, used by automatic installation """
32+
33+import os
34+import logging
35+import math
36+
37+from misc.extra import InstallError
38+from misc.run_cmd import call
39+import misc.events as events
40+import parted3.fs_module as fs
41+
42+from installation import luks
43+from installation import mount
44+from installation import wrapper
45+
46+# When testing, no _() is available
47+try:
48+ _("")
49+except NameError as err:
50+ def _(message):
51+ return message
52+
53+# NOTE: Exceptions in this file
54+# On a warning situation, Cnchi should try to continue, so we need to catch
55+# the exception here. If we don't catch the exception here, it will be caught
56+# in process.py and managed as a fatal error. On the other hand, if we want
57+# to clarify the exception message we can catch it here and then raise an
58+# InstallError exception.
59+
60+# Partition sizes are in MiB
61+MAX_ROOT_SIZE = 30000
62+
63+# KDE (with all features) needs 8 GB for its files (including pacman cache xz files).
64+# Vbox, by default, creates disks of 8GB. We should limit to this so vbox installations do not fail
65+# (if installing kde and not enough free space is available is their fault, not ours)
66+MIN_ROOT_SIZE = 8000
67+
68+
69+class AutoPartition():
70+ """ Class used by the automatic installation method """
71+
72+ LUKS_KEY_FILES = [".keyfile-root", ".keyfile-home"]
73+
74+ def __init__(self, dest_dir, auto_device, settings, callback_queue):
75+ """ Class initialization """
76+
77+ self.dest_dir = dest_dir
78+ self.auto_device = auto_device
79+ self.temp = settings.get('temp')
80+
81+ # Use LUKS encryption
82+ self.luks = settings.get("use_luks")
83+ self.luks_password = settings.get("luks_root_password")
84+
85+ # Use LVM
86+ self.lvm = settings.get("use_lvm")
87+
88+ # Make home a different partition or if using LVM, a different volume
89+ self.home = settings.get("use_home")
90+
91+ self.bootloader = settings.get("bootloader").lower()
92+
93+ # Will use these queue to show progress info to the user
94+ self.events = events.Events(callback_queue)
95+
96+ if os.path.exists("/sys/firmware/efi"):
97+ # If UEFI use GPT
98+ self.uefi = True
99+ self.gpt = True
100+ else:
101+ # If BIOS, use MBR
102+ self.uefi = False
103+ self.gpt = False
104+
105+ def mkfs(self, device, fs_type, mount_point, label_name, fs_options="", btrfs_devices=""):
106+ """ We have two main cases: "swap" and everything else. """
107+ logging.debug("Will format device %s as %s", device, fs_type)
108+ if fs_type == "swap":
109+ err_msg = "Can't activate swap in {0}".format(device)
110+ swap_devices = call(["swapon", "-s"], msg=err_msg)
111+ if device in swap_devices:
112+ call(["swapoff", device], msg=err_msg)
113+ cmd = ["mkswap", "-L", label_name, device]
114+ call(cmd, msg=err_msg)
115+ cmd = ["swapon", device]
116+ call(cmd, msg=err_msg)
117+ else:
118+ mkfs = {
119+ "xfs": "mkfs.xfs {0} -L {1} -f {2}".format(
120+ fs_options, label_name, device),
121+ "jfs": "yes | mkfs.jfs {0} -L {1} {2}".format(
122+ fs_options, label_name, device),
123+ "reiserfs": "yes | mkreiserfs {0} -l {1} {2}".format(
124+ fs_options, label_name, device),
125+ "ext2": "mkfs.ext2 -q {0} -F -L {1} {2}".format(
126+ fs_options, label_name, device),
127+ "ext3": "mkfs.ext3 -q {0} -F -L {1} {2}".format(
128+ fs_options, label_name, device),
129+ "ext4": "mkfs.ext4 -q {0} -F -L {1} {2}".format(
130+ fs_options, label_name, device),
131+ "btrfs": "mkfs.btrfs {0} -L {1} {2}".format(
132+ fs_options, label_name, btrfs_devices),
133+ "nilfs2": "mkfs.nilfs2 {0} -L {1} {2}".format(
134+ fs_options, label_name, device),
135+ "ntfs-3g": "mkfs.ntfs {0} -f -L {1} {2}".format(
136+ fs_options, label_name, device),
137+ "vfat": "mkfs.vfat {0} -F 32 -n {1} {2}".format(
138+ fs_options, label_name, device),
139+ "fat32": "mkfs.vfat {0} -F 32 -n {1} {2}".format(
140+ fs_options, label_name, device),
141+ "f2fs": "mkfs.f2fs {0} -l {1} {2}".format(
142+ fs_options, label_name, device)}
143+
144+ # Make sure the fs type is one we can handle
145+ if fs_type not in mkfs.keys():
146+ txt = _("Unknown filesystem type {0}").format(fs_type)
147+ raise InstallError(txt)
148+
149+ command = mkfs[fs_type]
150+
151+ err_msg = "Can't create filesystem {0}".format(fs_type)
152+ call(command.split(), msg=err_msg, fatal=True)
153+
154+ # Flush filesystem buffers
155+ call(["sync"])
156+
157+ # Create our mount directory
158+ path = self.dest_dir + mount_point
159+ os.makedirs(path, mode=0o755, exist_ok=True)
160+
161+ # Mount our new filesystem
162+
163+ mopts = "rw,relatime"
164+ if fs_type == "ext4":
165+ mopts = "rw,relatime,data=ordered"
166+ elif fs_type == "btrfs":
167+ mopts = 'rw,relatime,space_cache,autodefrag,inode_cache'
168+
169+ err_msg = "Error trying to mount {0} in {1}".format(device, path)
170+ cmd = ["mount", "-t", fs_type, "-o", mopts, device, path]
171+ call(cmd, msg=err_msg, fatal=True)
172+
173+ # Change permission of base directories to avoid btrfs issues
174+ if mount_point == "/tmp":
175+ mode = 0o1777
176+ elif mount_point == "/root":
177+ mode = 0o750
178+ else:
179+ mode = 0o755
180+ os.chmod(path, mode)
181+
182+ fs_uuid = fs.get_uuid(device)
183+ fs_label = fs.get_label(device)
184+ msg = "Device details: %s UUID=%s LABEL=%s"
185+ logging.debug(msg, device, fs_uuid, fs_label)
186+
187+ @staticmethod
188+ def get_partition_path(device, part_num):
189+ """ This is awful and prone to fail. We should do some
190+ type of test here """
191+
192+ # Remove /dev/
193+ path = device.replace('/dev/', '')
194+ partials = [
195+ 'rd/', 'ida/', 'cciss/', 'sx8/', 'mapper/', 'mmcblk', 'md', 'nvme']
196+ found = [p for p in partials if path.startswith(p)]
197+ if found:
198+ return "{0}p{1}".format(device, part_num)
199+ return "{0}{1}".format(device, part_num)
200+
201+ def get_devices(self):
202+ """ Set (and return) all partitions on the device """
203+ devices = {}
204+ device = self.auto_device
205+ logging.debug(device)
206+
207+ # device is of type /dev/sdX or /dev/hdX or /dev/mmcblkX
208+
209+ if self.gpt:
210+ if not self.uefi:
211+ # Skip BIOS Boot Partition
212+ # We'll never get here as we use UEFI+GPT or BIOS+MBR
213+ part_num = 2
214+ else:
215+ part_num = 1
216+
217+ if self.bootloader == "grub2":
218+ devices['efi'] = self.get_partition_path(device, part_num)
219+ part_num += 1
220+
221+ devices['boot'] = self.get_partition_path(device, part_num)
222+ part_num += 1
223+ devices['root'] = self.get_partition_path(device, part_num)
224+ part_num += 1
225+ if self.home:
226+ devices['home'] = self.get_partition_path(device, part_num)
227+ part_num += 1
228+ devices['swap'] = self.get_partition_path(device, part_num)
229+ else:
230+ devices['boot'] = self.get_partition_path(device, 1)
231+ devices['root'] = self.get_partition_path(device, 2)
232+ if self.home:
233+ devices['home'] = self.get_partition_path(device, 3)
234+ devices['swap'] = self.get_partition_path(device, 5)
235+
236+ if self.luks:
237+ if self.lvm:
238+ # LUKS and LVM
239+ devices['luks_root'] = devices['root']
240+ devices['lvm'] = "/dev/mapper/cryptRebornOS"
241+ else:
242+ # LUKS and no LVM
243+ devices['luks_root'] = devices['root']
244+ devices['root'] = "/dev/mapper/cryptRebornOS"
245+ if self.home:
246+ # In this case we'll have two LUKS devices, one for root
247+ # and the other one for /home
248+ devices['luks_home'] = devices['home']
249+ devices['home'] = "/dev/mapper/cryptRebornOSHome"
250+ elif self.lvm:
251+ # No LUKS but using LVM
252+ devices['lvm'] = devices['root']
253+
254+ if self.lvm:
255+ devices['root'] = "/dev/RebornOSVG/RebornOSRoot"
256+ devices['swap'] = "/dev/RebornOSVG/RebornOSSwap"
257+ if self.home:
258+ devices['home'] = "/dev/RebornOSVG/RebornOSHome"
259+
260+ return devices
261+
262+ def get_mount_devices(self):
263+ """ Specify for each mount point which device we must mount there """
264+
265+ devices = self.get_devices()
266+ mount_devices = {}
267+
268+ if self.gpt and self.bootloader == "grub2":
269+ mount_devices['/boot/efi'] = devices['efi']
270+
271+ mount_devices['/boot'] = devices['boot']
272+ mount_devices['/'] = devices['root']
273+
274+ if self.home:
275+ mount_devices['/home'] = devices['home']
276+
277+ if self.luks:
278+ mount_devices['/'] = devices['luks_root']
279+ if self.home and not self.lvm:
280+ mount_devices['/home'] = devices['luks_home']
281+
282+ mount_devices['swap'] = devices['swap']
283+
284+ for mount_device in mount_devices:
285+ logging.debug(
286+ "%s assigned to be mounted in %s",
287+ mount_devices[mount_device],
288+ mount_device)
289+
290+ return mount_devices
291+
292+ def get_fs_devices(self):
293+ """ Return which filesystem is in a selected device """
294+
295+ devices = self.get_devices()
296+
297+ fs_devices = {}
298+
299+ if self.gpt:
300+ if self.bootloader == "grub2":
301+ fs_devices[devices['efi']] = "vfat"
302+ fs_devices[devices['boot']] = "ext4"
303+ elif self.bootloader in ["systemd-boot", "refind"]:
304+ fs_devices[devices['boot']] = "vfat"
305+ else:
306+ if self.uefi:
307+ fs_devices[devices['boot']] = "vfat"
308+ else:
309+ fs_devices[devices['boot']] = "ext4"
310+
311+ fs_devices[devices['swap']] = "swap"
312+ fs_devices[devices['root']] = "ext4"
313+
314+ if self.home:
315+ fs_devices[devices['home']] = "ext4"
316+
317+ if self.luks:
318+ fs_devices[devices['luks_root']] = "ext4"
319+ if self.home:
320+ if self.lvm:
321+ # luks, lvm, home
322+ fs_devices[devices['home']] = "ext4"
323+ else:
324+ # luks, home
325+ fs_devices[devices['luks_home']] = "ext4"
326+
327+ for device in fs_devices:
328+ logging.debug("Device %s will have a %s filesystem",
329+ device, fs_devices[device])
330+
331+ return fs_devices
332+
333+ def get_part_sizes(self, disk_size, start_part_sizes=1):
334+ """ Returns a dict with all partition sizes """
335+ part_sizes = {'disk': disk_size, 'boot': 512, 'efi': 0}
336+
337+ if self.gpt and self.bootloader == "grub2":
338+ part_sizes['efi'] = 512
339+
340+ cmd = ["grep", "MemTotal", "/proc/meminfo"]
341+ mem_total = call(cmd)
342+ mem_total = int(mem_total.split()[1])
343+ mem = mem_total / 1024
344+
345+ # Suggested swap sizes from Anaconda installer
346+ if mem < 2048:
347+ part_sizes['swap'] = 2 * mem
348+ elif 2048 <= mem < 8192:
349+ part_sizes['swap'] = mem
350+ elif 8192 <= mem < 65536:
351+ part_sizes['swap'] = mem // 2
352+ else:
353+ part_sizes['swap'] = 4096
354+
355+ # Max swap size is 10% of all available disk size
356+ max_swap = disk_size * 0.1
357+ if part_sizes['swap'] > max_swap:
358+ part_sizes['swap'] = max_swap
359+
360+ part_sizes['swap'] = math.ceil(part_sizes['swap'])
361+
362+ other_than_root_size = start_part_sizes + \
363+ part_sizes['efi'] + part_sizes['boot'] + part_sizes['swap']
364+ part_sizes['root'] = disk_size - other_than_root_size
365+
366+ if self.home:
367+ # Decide how much we leave to root and how much we leave to /home
368+ # Question: why 5?
369+ new_root_part_size = part_sizes['root'] // 5
370+ if new_root_part_size > MAX_ROOT_SIZE:
371+ new_root_part_size = MAX_ROOT_SIZE
372+ elif new_root_part_size < MIN_ROOT_SIZE:
373+ new_root_part_size = MIN_ROOT_SIZE
374+
375+ if new_root_part_size >= part_sizes['root']:
376+ # new_root_part_size can't be bigger than part_sizes['root'] !
377+ # this could happen if new_root_part_size == MIN_ROOT_SIZE but
378+ # our harddisk is smaller (detected using vbox)
379+ # Should we fail here or install without a separated /home partition?
380+ logging.warning(
381+ "There's not enough free space to have a separate /home partition")
382+ self.home = False
383+ part_sizes['home'] = 0
384+ else:
385+ part_sizes['home'] = part_sizes['root'] - new_root_part_size
386+ part_sizes['root'] = new_root_part_size
387+ else:
388+ part_sizes['home'] = 0
389+
390+ part_sizes['lvm_pv'] = part_sizes['swap'] + \
391+ part_sizes['root'] + part_sizes['home']
392+
393+ for part in part_sizes:
394+ part_sizes[part] = int(part_sizes[part])
395+
396+ return part_sizes
397+
398+ def log_part_sizes(self, part_sizes):
399+ """ Log partition sizes for debugging purposes """
400+ logging.debug("Total disk size: %dMiB", part_sizes['disk'])
401+ if self.gpt and self.bootloader == "grub2":
402+ logging.debug(
403+ "EFI System Partition (ESP) size: %dMiB", part_sizes['efi'])
404+ logging.debug("Boot partition size: %dMiB", part_sizes['boot'])
405+
406+ if self.lvm:
407+ logging.debug("LVM physical volume size: %dMiB",
408+ part_sizes['lvm_pv'])
409+
410+ logging.debug("Swap partition size: %dMiB", part_sizes['swap'])
411+ logging.debug("Root partition size: %dMiB", part_sizes['root'])
412+
413+ if self.home:
414+ logging.debug("Home partition size: %dMiB", part_sizes['home'])
415+
416+ def get_disk_size(self):
417+ """ Gets disk size in MiB """
418+ # Partition sizes are expressed in MiB
419+ # Get just the disk size in MiB
420+ device = self.auto_device
421+ device_name = os.path.split(device)[1]
422+ size_path = os.path.join("/sys/block", device_name, 'size')
423+ base_path = os.path.split(size_path)[0]
424+ disk_size = 0
425+ if os.path.exists(size_path):
426+ logical_path = os.path.join(base_path, "queue/logical_block_size")
427+ with open(logical_path, 'r') as logical_file:
428+ logical_block_size = int(logical_file.read())
429+ with open(size_path, 'r') as size_file:
430+ size = int(size_file.read())
431+ disk_size = ((logical_block_size * (size - 68)) / 1024) / 1024
432+ else:
433+ logging.error("Cannot detect %s device size", device)
434+ txt = _("Setup cannot detect size of your device, please use advanced "
435+ "installation routine for partitioning and mounting devices.")
436+ raise InstallError(txt)
437+ return disk_size
438+
439+ def run_gpt(self, part_sizes):
440+ """ Auto partition using a GPT table """
441+ # Our computed sizes are all in mebibytes (MiB) i.e. powers of 1024, not metric megabytes.
442+ # These are 'M' in sgdisk and 'MiB' in parted.
443+ # If you use 'M' in parted you'll get MB instead of MiB, and you're gonna have a bad time.
444+ device = self.auto_device
445+
446+ # Clean partition table to avoid issues!
447+ wrapper.sgdisk("zap-all", device)
448+
449+ # Clear all magic strings/signatures - mdadm, lvm, partition tables etc.
450+ wrapper.run_dd("/dev/zero", device)
451+ wrapper.wipefs(device)
452+
453+ # Create fresh GPT
454+ wrapper.sgdisk("clear", device)
455+ wrapper.parted_mklabel(device, "gpt")
456+
457+ # Inform the kernel of the partition change.
458+ # Needed if the hard disk had a MBR partition table.
459+ err_msg = "Error informing the kernel of the partition change."
460+ call(["partprobe", device], msg=err_msg, fatal=True)
461+
462+ part_num = 1
463+
464+ if not self.uefi:
465+ # We don't allow BIOS+GPT right now, so this code will be never executed
466+ # We leave here just for future reference
467+ # Create BIOS Boot Partition
468+ # GPT GUID: 21686148-6449-6E6F-744E-656564454649
469+ # This partition is not required if the system is UEFI based,
470+ # as there is no such embedding of the second-stage code in that case
471+ wrapper.sgdisk_new(device, part_num, "BIOS_BOOT", 2, "EF02")
472+ part_num += 1
473+
474+ if self.bootloader == "grub2":
475+ # Create EFI System Partition (ESP)
476+ # GPT GUID: C12A7328-F81F-11D2-BA4B-00A0C93EC93B
477+ wrapper.sgdisk_new(
478+ device, part_num, "UEFI_SYSTEM", part_sizes['efi'], "EF00")
479+ part_num += 1
480+
481+ # Create Boot partition
482+ if self.bootloader in ["systemd-boot", "refind"]:
483+ wrapper.sgdisk_new(
484+ device, part_num, "REBORNOS_BOOT", part_sizes['boot'], "EF00")
485+ else:
486+ wrapper.sgdisk_new(
487+ device, part_num, "REBORNOS_BOOT", part_sizes['boot'], "8300")
488+ part_num += 1
489+
490+ if self.lvm:
491+ # Create partition for lvm
492+ # (will store root, swap and home (if desired) logical volumes)
493+ wrapper.sgdisk_new(
494+ device, part_num, "REBORNOS_LVM", part_sizes['lvm_pv'], "8E00")
495+ part_num += 1
496+ else:
497+ wrapper.sgdisk_new(
498+ device, part_num, "REBORNOS_ROOT", part_sizes['root'], "8300")
499+ part_num += 1
500+ if self.home:
501+ wrapper.sgdisk_new(
502+ device, part_num, "REBORNOS_HOME", part_sizes['home'], "8302")
503+ part_num += 1
504+ wrapper.sgdisk_new(
505+ device, part_num, "REBORNOS_SWAP", 0, "8200")
506+
507+ output = call(["sgdisk", "--print", device])
508+ logging.debug(output)
509+
510+ def run_mbr(self, part_sizes):
511+ """ DOS MBR partition table """
512+ # Our computed sizes are all in mebibytes (MiB) i.e. powers of 1024, not metric megabytes.
513+ # These are 'M' in sgdisk and 'MiB' in parted.
514+ # If you use 'M' in parted you'll get MB instead of MiB, and you're gonna have a bad time.
515+ device = self.auto_device
516+
517+ # Start at sector 1 for 4k drive compatibility and correct alignment
518+ # Clean partitiontable to avoid issues!
519+ wrapper.run_dd("/dev/zero", device)
520+ wrapper.wipefs(device)
521+
522+ # Create DOS MBR
523+ wrapper.parted_mklabel(device, "msdos")
524+
525+ # Create boot partition (all sizes are in MiB)
526+ # if start is -1 wrapper.parted_mkpart assumes that our partition
527+ # starts at 1 (first partition in disk)
528+ start = -1
529+ end = part_sizes['boot']
530+ wrapper.parted_mkpart(device, "primary", start, end)
531+
532+ # Set boot partition as bootable
533+ wrapper.parted_set(device, "1", "boot", "on")
534+
535+ if self.lvm:
536+ # Create partition for lvm (will store root, home (if desired),
537+ # and swap logical volumes)
538+ start = end
539+ # end = start + part_sizes['lvm_pv']
540+ end = "-1s"
541+ wrapper.parted_mkpart(device, "primary", start, end)
542+
543+ # Set lvm flag
544+ wrapper.parted_set(device, "2", "lvm", "on")
545+ else:
546+ # Create root partition
547+ start = end
548+ end = start + part_sizes['root']
549+ wrapper.parted_mkpart(device, "primary", start, end)
550+
551+ if self.home:
552+ # Create home partition
553+ start = end
554+ end = start + part_sizes['home']
555+ wrapper.parted_mkpart(device, "primary", start, end)
556+
557+ # Create an extended partition where we will put our swap partition
558+ start = end
559+ # end = start + part_sizes['swap']
560+ end = "-1s"
561+ wrapper.parted_mkpart(device, "extended", start, end)
562+
563+ # Now create a logical swap partition
564+ start += 1
565+ end = "-1s"
566+ wrapper.parted_mkpart(
567+ device, "logical", start, end, "linux-swap")
568+
569+ def run_lvm(self, devices, part_sizes, start_part_sizes, disk_size):
570+ """ Create lvm volumes """
571+ logging.debug("Cnchi will setup LVM on device %s", devices['lvm'])
572+
573+ err_msg = "Error creating LVM physical volume in device {0}"
574+ err_msg = err_msg.format(devices['lvm'])
575+ cmd = ["pvcreate", "-f", "-y", devices['lvm']]
576+ call(cmd, msg=err_msg, fatal=True)
577+
578+ err_msg = "Error creating LVM volume group in device {0}"
579+ err_msg = err_msg.format(devices['lvm'])
580+ cmd = ["vgcreate", "-f", "-y", "RebornOSVG", devices['lvm']]
581+ call(cmd, msg=err_msg, fatal=True)
582+
583+ # Fix issue 180
584+ # Check space we have now for creating logical volumes
585+ cmd = ["vgdisplay", "-c", "RebornOSVG"]
586+ vg_info = call(cmd, fatal=True)
587+ # Get column number 12: Size of volume group in kilobytes
588+ vg_size = int(vg_info.split(":")[11]) / 1024
589+ if part_sizes['lvm_pv'] > vg_size:
590+ logging.debug(
591+ "Real RebornOSVG volume group size: %d MiB", vg_size)
592+ logging.debug("Reajusting logical volume sizes")
593+ diff_size = part_sizes['lvm_pv'] - vg_size
594+ part_sizes = self.get_part_sizes(
595+ disk_size - diff_size, start_part_sizes)
596+ self.log_part_sizes(part_sizes)
597+
598+ # Create LVM volumes
599+ err_msg = "Error creating LVM logical volume"
600+
601+ size = str(int(part_sizes['root']))
602+ cmd = ["lvcreate", "--name", "RebornOSRoot", "--size", size, "RebornOSVG"]
603+ call(cmd, msg=err_msg, fatal=True)
604+
605+ if not self.home:
606+ # Use the remainig space for our swap volume
607+ cmd = ["lvcreate", "--name", "RebornOSSwap", "--extents", "100%FREE", "RebornOSVG"]
608+ call(cmd, msg=err_msg, fatal=True)
609+ else:
610+ size = str(int(part_sizes['swap']))
611+ cmd = ["lvcreate", "--name", "RebornOSSwap", "--size", size, "RebornOSVG"]
612+ call(cmd, msg=err_msg, fatal=True)
613+ # Use the remaining space for our home volume
614+ cmd = ["lvcreate", "--name", "RebornOSHome", "--extents", "100%FREE", "RebornOSVG"]
615+ call(cmd, msg=err_msg, fatal=True)
616+
617+ def create_filesystems(self, devices):
618+ """ Create filesystems in newly created partitions """
619+ mount_points = {
620+ 'efi': '/boot/efi', 'boot': '/boot', 'root': '/', 'home': '/home', 'swap': ''}
621+
622+ labels = {
623+ 'efi': 'UEFI_SYSTEM', 'boot': 'RebornOSBoot', 'root': 'RebornOSRoot',
624+ 'home': 'RebornOSHome', 'swap': 'RebornOSSwap'}
625+
626+ fs_devices = self.get_fs_devices()
627+
628+ # Note: Make sure the "root" partition is defined first!
629+ self.mkfs(devices['root'], fs_devices[devices['root']],
630+ mount_points['root'], labels['root'])
631+ self.mkfs(devices['swap'], fs_devices[devices['swap']],
632+ mount_points['swap'], labels['swap'])
633+
634+ # NOTE: This will be formated in ext4 (bios or gpt+grub2) or
635+ # fat32 (gpt+systemd-boot or refind bootloaders)
636+ self.mkfs(devices['boot'], fs_devices[devices['boot']],
637+ mount_points['boot'], labels['boot'])
638+
639+ # NOTE: Make sure the "boot" partition is defined before the "efi" one!
640+ if self.gpt and self.bootloader == "grub2":
641+ # Format EFI System Partition (ESP) with vfat (fat32)
642+ self.mkfs(devices['efi'], fs_devices[devices['efi']],
643+ mount_points['efi'], labels['efi'])
644+
645+ if self.home:
646+ self.mkfs(devices['home'], fs_devices[devices['home']],
647+ mount_points['home'], labels['home'])
648+
649+ def copy_luks_keyfiles(self):
650+ """ Copy root keyfile to boot partition and home keyfile to root partition
651+ user will choose what to do with it
652+ THIS IS NONSENSE (BIG SECURITY HOLE), BUT WE TRUST THE USER TO FIX THIS
653+ User shouldn't store the keyfiles unencrypted unless the medium itself
654+ is reasonably safe (boot partition is not) """
655+
656+ key_files = AutoPartition.LUKS_KEY_FILES
657+ key_file = os.path.join(self.temp, key_files[0])
658+ os.chmod(key_file, 0o400)
659+ boot_path = os.path.join(self.dest_dir, "boot")
660+ cmd = ['mv', key_file, boot_path]
661+ call(cmd, msg="Can't copy root LUKS keyfile to the installation device.")
662+ if self.home and not self.lvm:
663+ key_file = os.path.join(self.temp, key_files[1])
664+ os.chmod(key_files, 0o400)
665+ luks_dir = os.path.join(self.dest_dir, 'etc/luks-keys')
666+ os.makedirs(luks_dir, mode=0o755, exist_ok=True)
667+ cmd = ['mv', key_file, luks_dir]
668+ call(cmd, msg="Can't copy home LUKS keyfile to the installation device.")
669+
670+ @staticmethod
671+ def remove_lvm(device):
672+ """ Remove all previous LVM volumes
673+ (it may have been left created due to a previous failed installation) """
674+
675+ err_msg = "Can't delete existent LVM volumes in device {0}".format(device)
676+
677+ cmd = ["/usr/bin/lvs", "-o", "lv_name,vg_name,devices", "--noheadings"]
678+ lvolumes = call(cmd, msg=err_msg)
679+ if lvolumes:
680+ lvolumes = lvolumes.split("\n")
681+ for lvolume in lvolumes:
682+ if lvolume:
683+ (lvolume, vgroup, ldevice) = lvolume.split()
684+ if device in ldevice:
685+ lvdev = "/dev/" + vgroup + "/" + lvolume
686+ call(["/usr/bin/wipefs", "-a", lvdev], msg=err_msg)
687+ call(["/usr/bin/lvremove", "-f", lvdev], msg=err_msg)
688+
689+ cmd = ["/usr/bin/vgs", "-o", "vg_name,devices", "--noheadings"]
690+ vgnames = call(cmd, msg=err_msg)
691+ if vgnames:
692+ vgnames = vgnames.split("\n")
693+ for vgname in vgnames:
694+ (vgname, vgdevice) = vgname.split()
695+ if vgname and device in vgdevice:
696+ call(["/usr/bin/vgremove", "-f", vgname], msg=err_msg)
697+
698+ cmd = ["/usr/bin/pvs", "-o", "pv_name", "--noheadings"]
699+ pvolumes = call(cmd, msg=err_msg)
700+ if pvolumes:
701+ pvolumes = pvolumes.split("\n")
702+ for pvolume in pvolumes:
703+ pvolume = pvolume.strip()
704+ if device in pvolume:
705+ cmd = ["/usr/bin/pvremove", "-ff", "-y", pvolume]
706+ call(cmd, msg=err_msg)
707+ @staticmethod
708+ def printk(enable):
709+ """ Enables / disables printing kernel messages to console """
710+ with open("/proc/sys/kernel/printk", "w") as fpk:
711+ if enable:
712+ fpk.write("4")
713+ else:
714+ fpk.write("0")
715+
716+ def log_devices(self, devices):
717+ """ Log all devices for debugging purposes """
718+ if self.gpt and self.bootloader == "grub2":
719+ logging.debug("EFI: %s", devices['efi'])
720+ logging.debug("Boot: %s", devices['boot'])
721+ logging.debug("Root: %s", devices['root'])
722+ if self.home:
723+ logging.debug("Home: %s", devices['home'])
724+ logging.debug("Swap: %s", devices['swap'])
725+
726+ def run(self):
727+ """ Main method. Runs auto partition sequence """
728+ disk_size = self.get_disk_size()
729+ device = self.auto_device
730+ start_part_sizes = 1
731+
732+ part_sizes = self.get_part_sizes(disk_size, start_part_sizes)
733+ self.log_part_sizes(part_sizes)
734+
735+ # Disable swap and unmount all partitions inside dest_dir
736+ mount.unmount_all_in_directory(self.dest_dir)
737+ # Disable swap and unmount all partitions of device
738+ mount.unmount_all_in_device(device)
739+ # Remove lvm in destination device
740+ self.remove_lvm(device)
741+ # Close luks devices in destination device
742+ luks.close_antergos_devices()
743+
744+ self.printk(False)
745+ if self.gpt:
746+ self.run_gpt(part_sizes)
747+ else:
748+ self.run_mbr(part_sizes)
749+ self.printk(True)
750+
751+ # Wait until /dev initialized correct devices
752+ call(["udevadm", "settle"])
753+
754+ devices = self.get_devices()
755+
756+ self.log_devices(devices)
757+
758+ if self.luks:
759+ luks_options = {'password': self.luks_password,
760+ 'key': AutoPartition.LUKS_KEY_FILES[0]}
761+ luks.setup(devices['luks_root'], 'cryptRebornOS', luks_options)
762+ if self.home and not self.lvm:
763+ luks_options = {'password': self.luks_password,
764+ 'key': AutoPartition.LUKS_KEY_FILES[1]}
765+ luks.setup(devices['luks_home'], 'cryptRebornOSHome', luks_options)
766+
767+ if self.lvm:
768+ self.run_lvm(devices, part_sizes, start_part_sizes, disk_size)
769+
770+ # We have all partitions and volumes created. Let's create its filesystems with mkfs.
771+ self.create_filesystems(devices)
772+
773+ # NOTE: encrypted and/or lvm2 hooks will be added to mkinitcpio.conf
774+ # in mkinitcpio.py, if necessary.
775+ # NOTE: /etc/default/grub, /etc/stab and /etc/crypttab will be modified
776+ # in post_install.py, if necessary.
777+
778+ if self.luks and self.luks_password == "":
779+ self.copy_luks_keyfiles()
780+
781+
782+def test_module():
783+ """ Test autopartition module """
784+ import gettext
785+
786+ _ = gettext.gettext
787+
788+ os.makedirs("/var/log/cnchi")
789+ logging.basicConfig(
790+ filename="/var/log/cnchi/cnchi-autopartition.log",
791+ level=logging.DEBUG)
792+
793+ settings = {
794+ 'use_luks': True,
795+ 'luks_password': "luks",
796+ 'use_lvm': True,
797+ 'use_home': True,
798+ 'bootloader': "grub2"}
799+
800+ AutoPartition(
801+ dest_dir="/install",
802+ auto_device="/dev/sdb",
803+ settings=settings,
804+ callback_queue=None).run()
805+
806+if __name__ == '__main__':
807+ test_module()
--- a/Cnchi/desktop.py
+++ b/Cnchi/desktop.py
@@ -62,7 +62,7 @@ class DesktopAsk(GtkBaseBox):
6262 self.listbox.set_selection_mode(Gtk.SelectionMode.BROWSE)
6363 self.listbox.set_sort_func(self.listbox_sort_by_name, None)
6464
65- self.desktop_choice = 'deepin'
65+ self.desktop_choice = 'base'
6666
6767 self.enabled_desktops = self.settings.get("desktops")
6868
@@ -169,8 +169,8 @@ class DesktopAsk(GtkBaseBox):
169169
170170 self.listbox.add(box)
171171
172- # Set Gnome as default
173- self.select_default_row(desktop_info.NAMES["gnome"])
172+ # Set base as default
173+ self.select_default_row(desktop_info.NAMES["base"])
174174
175175 @staticmethod
176176 def listbox_sort_by_name(row1, row2, _user_data):
--- a/Cnchi/desktop_info.py
+++ b/Cnchi/desktop_info.py
@@ -131,11 +131,10 @@ DESCRIPTIONS = {
131131 "innovative features and a traditional desktop user experience. "
132132 "Cinnamon aims to make users feel at home by providing them with "
133133 "an easy-to-use and comfortable desktop experience."),
134- 'deepin': _("Deepin desktop is a lightweight, elegant desktop environment that "
135- "has been commented as a mix between Windows and Macs by many of its' "
136- "users. It was originally created for the Linux Deepin distribution. "
137- "Now, DDE will support most Linux operating systems such as Arch "
138- "Linux, Ubuntu, Fedora, openSUSE etc."),
134+ 'deepin': _("IMPORTANT: Keep in mind that the Deepin desktop can often be unstable. "
135+ "This does not depend on us, but on the developers of Deepin who "
136+ "usually upload BETA versions of the desktop or some components in the "
137+ "stable repositories of Arch Linux."),
139138 'pantheon': _("Pantheon is the desktop environment that Elementary OS runs on. "
140139 "While true Pantheon is too unstable for RebornOS to offer, we "
141140 "have tried to offer the next best thing. By selecting Pantheon, "
--- a/Cnchi/info.py
+++ b/Cnchi/info.py
@@ -29,7 +29,7 @@
2929
3030 """ Set some Cnchi global constants """
3131
32-CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.14"
32+CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.25"
3333 CNCHI_WEBSITE = "https://rebornos.org"
3434 CNCHI_RELEASE_STAGE = "production"
3535
--- a/Cnchi/main_window.py
+++ b/Cnchi/main_window.py
@@ -3,7 +3,7 @@
33 #
44 # main_window.py
55 #
6-# Copyright © 2013-2018 Antergos
6+# Copyright © 2013-2018 RebornOS
77 #
88 # This file is part of Cnchi.
99 #
@@ -167,7 +167,7 @@ class MainWindow(Gtk.ApplicationWindow):
167167
168168 self.logo = self.header_ui.get_object("logo")
169169 path = os.path.join(
170- data_dir, "images", "antergos", "antergos-logo-mini2.png")
170+ data_dir, "images", "antergos", "rebornos-logo-mini2.png")
171171 self.logo.set_from_file(path)
172172
173173 # To honor our css
@@ -236,7 +236,7 @@ class MainWindow(Gtk.ApplicationWindow):
236236 self.pages = dict()
237237 self.pages["welcome"] = pages.welcome.Welcome(self.params)
238238
239- if os.path.exists('/home/reborn/.config/openbox'):
239+ if os.path.exists('/home/antergos/.config/openbox'):
240240 # In minimal iso, load language screen now
241241 self.pages["language"] = pages.language.Language(self.params)
242242
@@ -267,13 +267,13 @@ class MainWindow(Gtk.ApplicationWindow):
267267 data_dir,
268268 "images",
269269 "antergos",
270- "antergos-icon.png")
270+ "rebornos-icon.png")
271271 self.set_icon_from_file(icon_path)
272272
273273 # Set the first page to show
274274
275275 # If minimal iso is detected, skip the welcome page.
276- if os.path.exists('/home/reborn/.config/openbox'):
276+ if os.path.exists('/home/antergos/.config/openbox'):
277277 self.current_page = self.pages["language"]
278278 self.settings.set('timezone_start', True)
279279 else:
@@ -309,7 +309,7 @@ class MainWindow(Gtk.ApplicationWindow):
309309
310310 # Do not hide progress bar for minimal iso as it would break
311311 # the widget alignment on language page.
312- if not os.path.exists('/home/reborn/.config/openbox'):
312+ if not os.path.exists('/home/antergos/.config/openbox'):
313313 # Hide progress bar
314314 self.progressbar.hide()
315315
@@ -326,7 +326,7 @@ class MainWindow(Gtk.ApplicationWindow):
326326
327327 def load_pages(self):
328328 """ Preload all installer pages """
329- if not os.path.exists('/home/reborn/.config/openbox'):
329+ if not os.path.exists('/home/antergos/.config/openbox'):
330330 self.pages["language"] = pages.language.Language(self.params)
331331
332332 self.pages["check"] = pages.check.Check(self.params)
@@ -369,7 +369,7 @@ class MainWindow(Gtk.ApplicationWindow):
369369 self.pages["slides"] = pages.slides.Slides(self.params)
370370
371371 diff = 2
372- if os.path.exists('/home/reborn/.config/openbox'):
372+ if os.path.exists('/home/antergos/.config/openbox'):
373373 # In minimal (openbox) we don't have a welcome screen
374374 diff = 3
375375
--- a/Cnchi/packages.xml
+++ b/Cnchi/packages.xml
@@ -3,8 +3,8 @@
33 <editions>
44 <edition name="common" description="Packages common to all DE and base">
55 <packages>
6- <pkgname>common-cosmic-reborn</pkgname>
7- <pkgname>full-base-cosmic-reborn</pkgname>
6+ <pkgname>rebornos-cosmic-common</pkgname>
7+ <pkgname>rebornos-cosmic-full-base</pkgname>
88 <pkgname>base</pkgname>
99 <pkgname>base-devel</pkgname>
1010 </packages>
@@ -25,19 +25,19 @@
2525 <pkgname lang="zh_SG">noto-fonts-cjk</pkgname>
2626 <pkgname lang="zh_TW">noto-fonts-cjk</pkgname>
2727 <pkgname lang="ko_KR">noto-fonts-cjk</pkgname>
28- <pkgname>graphic-cosmic-reborn</pkgname>
28+ <pkgname>rebornos-cosmic-graphic</pkgname>
2929 </packages>
3030 </edition>
3131
3232 <edition name="base" description="Without X">
3333 <packages>
34- <pkgname>full-base-cosmic-reborn</pkgname>
34+ <pkgname>rebornos-cosmic-full-base</pkgname>
3535 </packages>
3636 </edition>
3737
3838 <edition name="Gnome" description="Gnome Desktop">
3939 <packages>
40- <pkgname>gnome-cosmic-reborn</pkgname>
40+ <pkgname>rebornos-cosmic-gnome</pkgname>
4141 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
4242 <pkgname>gnome</pkgname>
4343 </packages>
@@ -45,7 +45,7 @@
4545
4646 <edition name="Apricity" description="Apricity Desktop">
4747 <packages>
48- <pkgname>gnome-cosmic-reborn</pkgname>
48+ <pkgname>rebornos-cosmic-gnome</pkgname>
4949 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
5050 <pkgname>gnome</pkgname>
5151 <pkgname>apricity-theme</pkgname>
@@ -55,7 +55,7 @@
5555 <edition name="Cinnamon" description="Cinnamon desktop">
5656 <packages>
5757 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
58- <pkgname>cinnamon-cosmic-reborn</pkgname>
58+ <pkgname>rebornos-cosmic-cinnamon</pkgname>
5959 <pkgname>cinnamon</pkgname>
6060 <!-- <pkgname>lightdm</pkgname> -->
6161 <!-- <pkgname>lightdm-webkit2-greeter</pkgname> -->
@@ -65,7 +65,7 @@
6565 <edition name="Pantheon" description="Pantheon desktop">
6666 <packages>
6767 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
68- <pkgname>elementary-cosmic-reborn</pkgname>
68+ <pkgname>rebornos-cosmic-pantheon</pkgname>
6969 <pkgname>pantheon</pkgname>
7070 </packages>
7171 </edition>
@@ -73,7 +73,7 @@
7373 <edition name="Windows" description="Windows Interface">
7474 <packages>
7575 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
76- <pkgname>cinnamon-cosmic-reborn</pkgname>
76+ <pkgname>rebornos-cosmic-cinnamon</pkgname>
7777 <pkgname>cinnamon</pkgname>
7878 <!-- <pkgname>lightdm</pkgname> -->
7979 <!-- <pkgname>lightdm-webkit2-greeter</pkgname> -->
@@ -83,7 +83,7 @@
8383
8484 <edition name="XFCE" description="XFCE Desktop">
8585 <packages>
86- <pkgname>xfce-cosmic-reborn</pkgname>
86+ <pkgname>rebornos-cosmic-xfce</pkgname>
8787 <pkgname>xfce4-goodies</pkgname>
8888 <pkgname>xfce4</pkgname>
8989 <pkgname>sddm-theme-gracilis-git</pkgname>
@@ -93,7 +93,7 @@
9393
9494 <edition name="Mate" description="MATE Desktop">
9595 <packages>
96- <pkgname>mate-cosmic-reborn</pkgname>
96+ <pkgname>rebornos-cosmic-mate</pkgname>
9797 <pkgname>mate</pkgname>
9898 <pkgname>mate-extra</pkgname>
9999 </packages>
@@ -102,14 +102,14 @@
102102 <edition name="openbox" description="Openbox Window Manager">
103103 <packages>
104104 <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname>
105- <pkgname>openbox-cosmic-reborn</pkgname>
105+ <pkgname>rebornos-cosmic-openbox</pkgname>
106106 <pkgname>lxde-gtk3</pkgname>
107107 </packages>
108108 </edition>
109109
110110 <edition name="KDE" description="KDE Desktop">
111111 <packages>
112- <pkgname>kde-cosmic-reborn</pkgname>
112+ <pkgname>rebornos-cosmic-kde</pkgname>
113113 <pkgname>plasma</pkgname>
114114 <pkgname>kdebase</pkgname>
115115 <pkgname>kdeutils</pkgname>
@@ -120,14 +120,14 @@
120120
121121 <edition name="lxqt" description="LXQT Desktop">
122122 <packages>
123- <pkgname>lxqt-cosmic-reborn</pkgname>
123+ <pkgname>rebornos-cosmic-lxqt</pkgname>
124124 <pkgname>lxqt</pkgname>
125125 </packages>
126126 </edition>
127127
128128 <edition name="Enlightenment" description="Enlightenment Desktop">
129129 <packages>
130- <pkgname>enlightenment-cosmic-reborn</pkgname>
130+ <pkgname>rebornos-cosmic-enlightenment</pkgname>
131131 <pkgname>enlightenment</pkgname>
132132 <!-- <pkgname nm='true' name='connman'>connman</pkgname> -->
133133 </packages>
@@ -135,21 +135,21 @@
135135
136136 <edition name="Budgie" description="Solus desktop">
137137 <packages>
138- <pkgname>budgie-cosmic-reborn</pkgname>
138+ <pkgname>rebornos-cosmic-budgie</pkgname>
139139 </packages>
140140 </edition>
141141
142142 <edition name="i3" description="Tiling window manager">
143143 <packages>
144- <pkgname>i3-cosmic-reborn</pkgname>
144+ <pkgname>rebornos-cosmic-i3</pkgname>
145145 </packages>
146146 </edition>
147147
148148 <edition name="Deepin" description="Deepin Desktop">
149149 <packages>
150- <pkgname>deepin-cosmic-reborn</pkgname>
150+ <pkgname>rebornos-cosmic-deepin</pkgname>
151151 <!-- <pkgname nm='true' name='NetworkManager'>network-manager-applet</pkgname> -->
152- <pkgname>reborn-deepin-schemas</pkgname>
152+ <!-- <pkgname>reborn-deepin-schemas</pkgname> -->
153153 <!-- <pkgname>deepin-file-manager-root</pkgname> -->
154154 <!-- <pkgname>flatplat-blue-theme</pkgname> -->
155155 <pkgname dm='true' name='lightdm'>lightdm</pkgname>
@@ -202,7 +202,7 @@
202202 <pkgname>broadcom-wl</pkgname>
203203 </feature>
204204 <feature name="cups">
205- <pkgname>cups-cosmic-reborn</pkgname>
205+ <pkgname>rebornos-cosmic-cups</pkgname>
206206 <pkgname lib='qt'>print-manager</pkgname>
207207 <pkgname lib='gtk'>system-config-printer</pkgname>
208208 <!-- <pkgname lib='gtk'>python2-gnomekeyring</pkgname> -->
--- a/Cnchi/postinstall.sh
+++ b/Cnchi/postinstall.sh
@@ -325,12 +325,12 @@ postinstall() {
325325
326326 for file in "${env_files[@]}"
327327 do
328- echo "# ---> Added by Cnchi RebornOS Installer Gnome based <---" >> "${file}"
328+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based <--- #" >> "${file}"
329329 if [ "${CN_BROWSER}" != "" ]; then
330330 echo "BROWSER=/usr/bin/${CN_BROWSER}" >> "${file}"
331331 fi
332332 echo "EDITOR=/usr/bin/nano" >> "${file}"
333- echo "# ---> End added by Cnchi RebornOS Installer Gnome based <---" >> "${file}"
333+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based <--- #" >> "${file}"
334334 done
335335
336336 # Uncomplicated Firewall Workaround (Rafael from RebornOS)
@@ -370,9 +370,9 @@ postinstall() {
370370 cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
371371 cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
372372 cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
373- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <---" >> ${CN_DESTDIR}/etc/environment
373+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
374374 echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
375- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <---" >> ${CN_DESTDIR}/etc/environment
375+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
376376 chroot ${CN_DESTDIR} systemctl enable earlyoom
377377 chroot ${CN_DESTDIR} systemctl enable ufw
378378 cp /usr/share/cnchi/101_gnome.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/
@@ -387,9 +387,9 @@ postinstall() {
387387 # cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
388388 # cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
389389 # cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
390-# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
390+# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
391391 # echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
392-# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
392+# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
393393 # chroot ${CN_DESTDIR} systemctl enable earlyoom
394394 # chroot ${CN_DESTDIR} systemctl enable ufw
395395 # fi
@@ -417,9 +417,9 @@ postinstall() {
417417 cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
418418 cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
419419 cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
420- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <---" >> ${CN_DESTDIR}/etc/environment
420+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
421421 echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
422- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <---" >> ${CN_DESTDIR}/etc/environment
422+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Budgie Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
423423 chroot ${CN_DESTDIR} systemctl enable earlyoom
424424 chroot ${CN_DESTDIR} systemctl enable ufw
425425 fi
@@ -433,9 +433,9 @@ postinstall() {
433433 cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
434434 cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
435435 cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
436- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for i3 Desktop <---" >> ${CN_DESTDIR}/etc/environment
436+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based for i3 Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
437437 echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
438- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for i3 Desktop <---" >> ${CN_DESTDIR}/etc/environment
438+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based for i3 Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
439439 chroot ${CN_DESTDIR} systemctl enable earlyoom
440440 chroot ${CN_DESTDIR} systemctl enable ufw
441441 fi
@@ -449,9 +449,9 @@ postinstall() {
449449 # cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
450450 # cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
451451 # cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
452- # echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
452+ # echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
453453 # echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
454- # echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
454+ # echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
455455 # chroot ${CN_DESTDIR} systemctl enable earlyoom
456456 # chroot ${CN_DESTDIR} systemctl enable ufw
457457 # fi
@@ -501,9 +501,9 @@ postinstall() {
501501 chroot ${CN_DESTDIR} mate-panel --reset --layout default
502502 # chroot ${CN_DESTDIR} mate-panel --reset --layout cinnamon
503503 # chroot ${CN_DESTDIR} sudo mate-panel --reset --layout cinnamon
504- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for MATE Desktop <---" >> ${CN_DESTDIR}/etc/environment
504+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based for MATE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
505505 echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
506- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for MATE Desktop <---" >> ${CN_DESTDIR}/etc/environment
506+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based for MATE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
507507 chroot ${CN_DESTDIR} systemctl enable earlyoom
508508 chroot ${CN_DESTDIR} systemctl enable ufw
509509 fi
@@ -517,9 +517,9 @@ if [[ xfce = "${CN_DESKTOP}" ]]; then
517517 cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
518518 cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
519519 cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
520- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <---" >> ${CN_DESTDIR}/etc/environment
520+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
521521 echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
522- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <---" >> ${CN_DESTDIR}/etc/environment
522+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based for XFCE Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
523523 chroot ${CN_DESTDIR} systemctl enable earlyoom
524524 chroot ${CN_DESTDIR} systemctl enable ufw
525525 fi
@@ -533,9 +533,9 @@ if [[ cinnamon = "${CN_DESKTOP}" ]]; then
533533 cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
534534 cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
535535 cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
536- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <---" >> ${CN_DESTDIR}/etc/environment
536+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
537537 echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
538- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <---" >> ${CN_DESTDIR}/etc/environment
538+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
539539 chroot ${CN_DESTDIR} systemctl enable earlyoom
540540 chroot ${CN_DESTDIR} systemctl enable ufw
541541 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
551551 cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
552552 cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
553553 cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
554- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <---" >> ${CN_DESTDIR}/etc/environment
554+ echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
555555 echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
556- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <---" >> ${CN_DESTDIR}/etc/environment
556+ echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Pantheon Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
557557 chroot ${CN_DESTDIR} systemctl enable earlyoom
558558 chroot ${CN_DESTDIR} systemctl enable ufw
559559 fi
@@ -567,9 +567,9 @@ fi
567567 # cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
568568 # cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
569569 # cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
570-# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
570+# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
571571 # echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
572-# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
572+# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <--- #" >> ${CN_DESTDIR}/etc/environment
573573 # chroot ${CN_DESTDIR} systemctl enable earlyoom
574574 # chroot ${CN_DESTDIR} systemctl enable ufw
575575 #fi
similarity index 100%
rename from Cnchi/reborn-icon-new.png
rename to Cnchi/rebornos-icon-new.png
Binary files /dev/null and b/Cnchi/rebornos-icon.png differ
--- a/Cnchi/antergos-install.desktop
+++ b/Cnchi/rebornos-install.desktop
@@ -4,12 +4,11 @@ Comment[pl]=Zainstaluj system RebornOS
44 Comment[sk]=Nainštaluje operačný systém na disk
55 Exec=sudo /usr/bin/cnchi-start.sh
66 GenericName=RebornOS Installer
7-Icon=/usr/share/pixmaps/reborn-icon-new.png
8-Name=Reborn Installer
7+Icon=/usr/share/pixmaps/rebornos-icon-new.png
8+Name=RebornOS Installer
99 Name[en_US]=RebornOS Installer
1010 Name[pl]=Zainstaluj RebornOS
1111 Name[sk]=Inštalovať RebornOS
1212 Terminal=True
1313 Type=Application
1414 Categories=System;
15-
Binary files /dev/null and b/Cnchi/rebornos-logo-mini2.png differ
Binary files /dev/null and b/Cnchi/rebornos-logo-mini2.xcf differ
--- a/Cnchi/refresh-keys.sh
+++ b/Cnchi/refresh-keys.sh
@@ -1,4 +1,4 @@
1-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']"
1+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']"
22 sudo systemctl start NetworkManager.service
33 sudo rm -rf /etc/pacman.d/gnupg
44 sudo pacman-key --init
--- a/build.sh
+++ b/build.sh
@@ -297,8 +297,6 @@ cp ${script_path}/Cnchi/check.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/sr
297297 #cp ${script_path}/Cnchi/timezone.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
298298 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/welcome.py
299299 cp ${script_path}/Cnchi/welcome.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
300-#rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
301-#cp ${script_path}/Cnchi/desktop.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
302300 #rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/download/metalink.py
303301 #cp ${script_path}/Cnchi/metalink.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/download/
304302 #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
357355 cp ${script_path}/images/desktop-environment-i3.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/icons/scalable/
358356 cp ${script_path}/Cnchi/reborn-mirrorlist ${work_dir}/${arch}/airootfs/etc/pacman.d/
359357 #
360-# Replacement made by Rafael from RebornOS
358+# ===>>> Replacement made by Rafael from RebornOS <<<=== #
361359 #
362360 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/pacman.conf
363361 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
395393 cp ${script_path}/Cnchi/slides.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
396394 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pacman/pac.py
397395 cp ${script_path}/Cnchi/pac.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pacman/
398-# Use neofetch to show in terminal RebornOS logo and info
396+# ===>>> Use neofetch to show in terminal RebornOS logo and info <<<=== #
399397 rm ${work_dir}/${arch}/airootfs/home/rebornos/.bashrc
400398 cp ${script_path}/Cnchi/bashrc ${work_dir}/${arch}/airootfs/home/rebornos/.bashrc
401-# Correct GeoIP timeout
399+# ===>>> Correct GeoIP timeout <<<=== #
402400 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/geoip.py
403401 cp ${script_path}/Cnchi/geoip.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
404-# cnchi-start.sh is modified in its original location
402+# ===>>> cnchi-start.sh is modified in its original location <<<=== #
405403 # rm ${work_dir}/${arch}/airootfs/usr/bin/cnchi-start.sh
406404 # cp ${script_path}/Cnchi/cnchi-start.sh ${work_dir}/${arch}/airootfs/usr/bin/
407-# Replace access to the RebornOS installer with another one with "sudo"
405+# ===>>> Replace access to the RebornOS installer with another one with "sudo" <<<=== #
408406 rm ${work_dir}/${arch}/airootfs/usr/share/applications/antergos-install.desktop
409-cp ${script_path}/Cnchi/antergos-install.desktop ${work_dir}/${arch}/airootfs/usr/share/applications/
410-# Add new cnchi icon for RebornOS Installer
407+cp ${script_path}/Cnchi/rebornos-install.desktop ${work_dir}/${arch}/airootfs/usr/share/applications/
408+# ===>>> Add new cnchi icon for RebornOS Installer (change her name from reborn to rebornos) <<<=== #
411409 rm ${work_dir}/${arch}/airootfs/usr/share/pixmaps/cnchi.png
412410 cp ${script_path}/Cnchi/cnchi.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
413-cp ${script_path}/Cnchi/reborn-icon-new.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
411+cp ${script_path}/Cnchi/rebornos-icon-new.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
414412 cp ${script_path}/Cnchi/cnchi.png ${work_dir}/${arch}/airootfs/usr/share/applications/
415-# Add new wallpaper for RebornOS Live
413+# ===>>> Add new wallpaper for RebornOS Live <<<=== #
416414 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-day.jpg
417415 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/
418416 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-morning.jpg
419417 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-morning.jpg
420418 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-night.jpg
421419 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-night.jpg
422-# Delete refresh.desktop in ~/.config/autostart and add new refresh-keys.desktop
423-# to refresh keys and run cnchi-start.sh when Live start
420+# ===>>> Delete refresh.desktop in ~/.config/autostart and add new refresh-keys.desktop
421+# to refresh keys and run cnchi-start.sh when Live start <<<=== #
424422 rm ${work_dir}/${arch}/airootfs/home/rebornos/.config/autostart/refresh.desktop
425423 cp ${script_path}/Cnchi/refresh-keys.desktop ${work_dir}/${arch}/airootfs/home/rebornos/.config/autostart/
426-# Add refresh-keys.sh to /usr/bin (called by install.desktop)
427-# In the end, call cnchi-start.sh
424+# ===>>> Add refresh-keys.sh to /usr/bin (called by install.desktop)
425+# In the end, call cnchi-start.sh <<<=== #
428426 cp ${script_path}/Cnchi/refresh-keys.sh ${work_dir}/${arch}/airootfs/usr/bin/
429427 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/scripts/10_antergos
430428 cp ${script_path}/Cnchi/10_antergos ${work_dir}/${arch}/airootfs/usr/share/cnchi/scripts/
431-# Uncomplicated Firewall Workaround
429+# ===>>> Uncomplicated Firewall Workaround <<<=== #
432430 cp ${script_path}/Cnchi/gufw.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/
433431 cp ${script_path}/Cnchi/gufw.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/
434432 cp ${script_path}/Cnchi/gufw.desktop ${work_dir}/${arch}/airootfs/usr/share/cnchi/
435-# Cinnamon gschema
433+# ===>>> Cinnamon gschema <<<=== #
436434 cp ${script_path}/Cnchi/95_cinnamon.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
437-# Gnome gschema
435+# ===>>> Gnome gschema <<<=== #
438436 cp ${script_path}/Cnchi/101_gnome.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
437+# ===>>> auto_partition.py modifications (change AntergosRoot by RebornOSRoot and others things...) <<<=== #
438+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/auto_partition.py
439+cp ${script_path}/Cnchi/auto_partition.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/
440+# ===>>> Replace desktop.py to start with the default "base" desktop <<<=== #
441+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
442+cp ${script_path}/Cnchi/desktop.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
443+# ===>>> Change main_window.py with new rebornos-logo-mini2.png and rebornos-icon.png <<<=== #
444+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
445+cp ${script_path}/Cnchi/main_window.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
446+# ===>>> Add new png files used by modify main_window.py <<<=== #
447+cp ${script_path}/Cnchi/rebornos-logo-mini2.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/
448+cp ${script_path}/Cnchi/rebornos-icon.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/
439449 echo "DONE"
440450 echo
441451 echo "Replacing Antergos mentions with RebornOS"
@@ -456,9 +466,9 @@ sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
456466 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/wireless.py
457467 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/zfs.py
458468 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
459-sed -i "s/gnome/deepin/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
460-#sed -i "s/Antergos/Reborn/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/encfs.py
461-sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
469+# sed -i "s/gnome/deepin/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py ==>> Commented to run "base" desktop preselected
470+# sed -i "s/Antergos/Reborn/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/encfs.py
471+# sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
462472 echo "DONE"
463473 echo
464474 echo "Removing Mycroft-RebornOS's startup file from the ISO..."
--- a/packages.both
+++ b/packages.both
@@ -1,13 +1,10 @@
11 # Random Stuff. Bit bloated, contains both core packages and random other ones. Basically, this section is a wreck
22 rebornos-keyring
3-btrfs-progs
43 clonezilla
54 darkhttpd
65 ddrescue
76 dhclient
87 dialog
9-dmraid
10-dnsutils
118 elinks
129 ethtool
1310 exfat-utils
@@ -16,9 +13,7 @@ fping
1613 fsarchiver
1714 gnu-netcat
1815 gpm
19-gptfdisk
2016 grml-zsh-config
21-grub
2217 gtk3
2318 hdparm
2419 irssi
@@ -29,15 +24,12 @@ lftp
2924 linux-atm
3025 lsscsi
3126 mc
32-mtools
3327 ndisc6
3428 nfs-utils
3529 nilfs-utils
3630 nmap
37-ntp
3831 openconnect
3932 partclone
40-parted
4133 partimage
4234 ppp
4335 pptpclient
@@ -58,15 +50,19 @@ yay
5850 base
5951 base-devel
6052
61-# Comsic packages
62-common-cosmic-reborn
63-full-base-cosmic-reborn
64-graphic-cosmic-reborn
53+# ===>>> Comsic packages <<<=== #
54+# common-cosmic-reborn
55+# full-base-cosmic-reborn
56+# graphic-cosmic-reborn
57+rebornos-cosmic-common
58+rebornos-cosmic-full-base
59+rebornos-cosmic-graphic
6560
6661
67-# GNOME install start here
62+# ===>>> GNOME install start here <<<=== #
6863 gnome
69-gnome-cosmic-reborn
64+# gnome-cosmic-reborn
65+rebornos-cosmic-gnome
7066 gdm
7167 network-manager-applet
7268 gnome-shell-extension-appindicator
@@ -82,7 +78,7 @@ yaru-icon-theme
8278 yaru-sound-theme
8379
8480
85-# VirtualBox
81+# ===>>> VirtualBox <<<=== #
8682 #Virtualbox and xf86 packages? Whose bright idea was it to combine these? Oh wait... probably mine at one point
8783 # virtualbox-guest-modules-arch --> It is no longer in the repository. Now present in the kernel.
8884 # virtualbox-guest-utils
@@ -96,11 +92,11 @@ xorg-apps
9692 xorg-fonts
9793
9894
99-# VMWare
95+# ===>>> VMWare <<<=== #
10096 xf86-video-vmware
10197
10298
103-# Scripts to aid in installing Arch Linux
99+# ===>>> Scripts to aid in installing Arch Linux <<<=== #
104100 arch-install-scripts
105101
106102
@@ -120,7 +116,7 @@ rebornos-fire
120116 bubblewrap
121117
122118
123-# Firefox web browser
119+# ===>>> Firefox web browser <<<=== #
124120 firefox
125121 firefox-adblock-plus
126122 firefox-extension-privacybadger
@@ -146,7 +142,7 @@ ufw
146142 gufw
147143
148144
149-# Fonts
145+# ===>>> Fonts <<<=== #
150146 opendesktop-fonts
151147 ttf-arphic-uming
152148 ttf-baekmuk
@@ -157,14 +153,14 @@ ttf-ubuntu-font-family
157153 noto-fonts-cjk
158154
159155
160-#Linux-y things
156+# ===>>> Linux-y things <<<=== #
161157 btrfs-progs
162158 linux-api-headers
163159 mtools
164160 squashfs-tools
165161
166162
167-#Things related to booting
163+# ===>>> Things related to booting <<<=== #
168164 dmraid
169165 efitools
170166 fakeroot
@@ -175,14 +171,13 @@ hwdetect
175171 hwinfo
176172 ntp
177173 os-prober
178-parted
179174
180175 #Random group I sort of didn't ever pay attention to until writing this comment
181176 expect
182177 git
183178
184179
185-#Network packages
180+# ===>>> Network packages <<<=== #
186181 b43-firmware
187182 broadcom-wl-dkms
188183 dnsutils
@@ -197,7 +192,7 @@ xf86-video-nouveau
197192 nvidia
198193 nvidia-settings
199194
200-#Necessary for Cnchi. Enter Cnchi bloat!
195+# ===>>> Necessary for Cnchi. Enter Cnchi bloat! <<<=== #
201196 encfs
202197 pam_encfs
203198 libinput
@@ -227,7 +222,6 @@ python-pyparted
227222 webkit2gtk
228223 python-mako
229224 iso-codes
230-gptfdisk
231225 python-whither
232226 python-bugsnag
233227 # reborn-welcome --> Removed to allow cnchi-start.sh to be the only thing to start automatically
--- a/packages2.both
+++ b/packages2.both
@@ -64,9 +64,12 @@ base
6464 base-devel
6565 deepin
6666 deepin-extra
67-common-cosmic-reborn
68-full-base-cosmic-reborn
69-graphic-cosmic-reborn
67+# common-cosmic-reborn
68+# full-base-cosmic-reborn
69+# graphic-cosmic-reborn
70+rebornos-cosmic-common
71+rebornos-cosmic-full-base
72+rebornos-cosmic-graphic
7073 deepin-cosmic-reborn
7174 bubblewrap
7275 chromium-widevine
Show on old repository browser