napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct swap in fallback too

Browse Source
This commit is contained in:
demmm 2015-02-14 18:03:50 -05:00
parent 8c98aeb04a
commit 294b030b99
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/bootloader/main.py
View File

@ -57,6 +57,7 @@ def create_conf(uuid, conf_path):
for partition in partitions: for partition in partitions:
if partition["fs"] == "linuxswap": if partition["fs"] == "linuxswap":
swap = partition["uuid"] swap = partition["uuid"]
lines = [ lines = [
'## This is just an exmaple config file.\n', '## This is just an exmaple config file.\n',
'## Please edit the paths and kernel parameters according to your system.\n', '## Please edit the paths and kernel parameters according to your system.\n',
@ -78,11 +79,11 @@ def create_fallback(uuid, fallback_path):
kernel = libcalamares.job.configuration["kernel"] kernel = libcalamares.job.configuration["kernel"]
fb_img = libcalamares.job.configuration["fallback"] fb_img = libcalamares.job.configuration["fallback"]
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
swap = ""
for partition in partitions: for partition in partitions:
if partition["fs"] == "linuxswap": if partition["fs"] == "linuxswap":
swap = partition["uuid"] swap = partition["uuid"]
else:
swap = ""
lines = [ lines = [
'## This is just an exmaple config file.\n', '## This is just an exmaple config file.\n',
'## Please edit the paths and kernel parameters according to your system.\n', '## Please edit the paths and kernel parameters according to your system.\n',