From 6ec94d4cb84917817bda3862e1dd23febe779aa2 Mon Sep 17 00:00:00 2001 From: sulincix Date: Thu, 11 Jun 2020 12:21:03 +0000 Subject: [PATCH] fixes 3 --- live-installer/frontend/gtk_interface.py | 2 +- live-installer/partitioning.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/live-installer/frontend/gtk_interface.py b/live-installer/frontend/gtk_interface.py index 5d698db..3448037 100644 --- a/live-installer/frontend/gtk_interface.py +++ b/live-installer/frontend/gtk_interface.py @@ -1044,7 +1044,7 @@ class InstallerWindow: return if not found_root_partition: - ErrorDialog(("Installer"), "%s" % ("Please select a root (/) partition."), _( + ErrorDialog(("Installer"), "%s" % ("Please select a root (/) partition."), ( "A root partition is needed to install Linux Mint on.\n\n" " - Mount point: /\n - Recommended size: 30GB\n" " - Recommended filesystem format: ext4\n\n" diff --git a/live-installer/partitioning.py b/live-installer/partitioning.py index e08402a..d4b63d5 100644 --- a/live-installer/partitioning.py +++ b/live-installer/partitioning.py @@ -193,9 +193,9 @@ def partitions_popup_menu(widget, event): menuItem.connect("activate", lambda w: assign_mount_point( partition, '/', 'ext4')) menu.append(menuItem) - menuItem = Gtk.MenuItem(("Assign to /home")) + menuItem = Gtk.MenuItem(("Assign to /data")) menuItem.connect("activate", lambda w: assign_mount_point( - partition, '/home', '')) + partition, '/data', '')) menu.append(menuItem) if installer.setup.gptonefi: menuItem = Gtk.SeparatorMenuItem() @@ -624,7 +624,7 @@ class PartitionDialog(object): self.builder.get_object("button_ok").set_label(("OK")) # Build supported filesystems list filesystems = ['', 'swap'] - for path in ["/bin", "/sbin"]: + for path in ["/bin", "/sbin", "/usr/bin", "/usr/sbin"]: for fs in getoutput('echo %s/mkfs.*' % path).split(): filesystems.append(str(fs).split("mkfs.")[1].replace("'", "")) filesystems = sorted(filesystems) @@ -639,7 +639,7 @@ class PartitionDialog(object): # Build list of pre-provided mountpoints combobox = self.builder.get_object("comboboxentry_mount_point") model = Gtk.ListStore(str, str) - for i in ["/", "/@", "/home", "/@home", "/boot", "/boot/efi", "/srv", "/tmp", "swap"]: + for i in ["/", "/data", "/boot", "/boot/efi", "/data/srv", "/tmp", "swap"]: model.append(["", i]) combobox.set_model(model) combobox.set_entry_text_column(1) -- 2.18.1