|
|
@ -3,27 +3,26 @@
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# === This file is part of Calamares - <http://github.com/calamares> ===
|
|
|
|
# === This file is part of Calamares - <http://github.com/calamares> ===
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
|
|
|
|
# Copyright 2014 - 2015, Philip Müller <philm@manjaro.org>
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Calamares is free software: you can redistribute it and/or modify
|
|
|
|
# Calamares is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# Calamares is distributed in the hope that it will be useful,
|
|
|
|
# Calamares is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
|
|
import libcalamares
|
|
|
|
import libcalamares
|
|
|
|
import os
|
|
|
|
import os
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def modify_grub_default(partitions, root_mount_point, distributor):
|
|
|
|
def modify_grub_default(partitions, root_mount_point, distributor):
|
|
|
|
|
|
|
|
|
|
|
|
default_dir = os.path.join(root_mount_point, "etc/default")
|
|
|
|
default_dir = os.path.join(root_mount_point, "etc/default")
|
|
|
|
default_grub = os.path.join(default_dir, "grub")
|
|
|
|
default_grub = os.path.join(default_dir, "grub")
|
|
|
|
distributor_replace = distributor.replace("'", "'\\''")
|
|
|
|
distributor_replace = distributor.replace("'", "'\\''")
|
|
|
@ -39,7 +38,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
|
|
|
|
swap_uuid = partition["uuid"]
|
|
|
|
swap_uuid = partition["uuid"]
|
|
|
|
|
|
|
|
|
|
|
|
if swap_uuid != "":
|
|
|
|
if swap_uuid != "":
|
|
|
|
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID={!s} quiet {!s}\"".format(swap_uuid,use_splash)
|
|
|
|
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID={!s} quiet {!s}\"".format(swap_uuid, use_splash)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"quiet {!s}\"".format(use_splash)
|
|
|
|
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"quiet {!s}\"".format(use_splash)
|
|
|
|
|
|
|
|
|
|
|
@ -81,7 +80,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
|
|
|
|
escaped_value = "false"
|
|
|
|
escaped_value = "false"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
escaped_value = str(value).replace("'", "'\\''")
|
|
|
|
escaped_value = str(value).replace("'", "'\\''")
|
|
|
|
lines.append("{!s}=\"{!s}\"".format(key,escaped_value))
|
|
|
|
lines.append("{!s}=\"{!s}\"".format(key, escaped_value))
|
|
|
|
|
|
|
|
|
|
|
|
if not have_kernel_cmd:
|
|
|
|
if not have_kernel_cmd:
|
|
|
|
lines.append(kernel_cmd)
|
|
|
|
lines.append(kernel_cmd)
|
|
|
@ -94,6 +93,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
|
|
|
|
|
|
|
|
|
|
|
|
return None
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def run():
|
|
|
|
def run():
|
|
|
|
partitions = libcalamares.globalstorage.value("partitions")
|
|
|
|
partitions = libcalamares.globalstorage.value("partitions")
|
|
|
|
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
|
|
|
|
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
|
|
|
|