napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,501 Commits 8 Branches 95 Tags 88 MiB
40b7274c85
Commit Graph

68 Commits

Author SHA1 Message Date
Peter Jung
5c87452b67
fix initcpiocfg filesystems loop 
Signed-off-by: Peter Jung <admin@ptr1337.dev>
 2022-09-24 13:46:44 +02:00
Peter Jung
341fecd3ff fix initcpio issue from 3.3 merge 
Signed-off-by: Peter Jung <admin@ptr1337.dev>
 2022-06-09 04:00:18 +02:00
Adriaan de Groot
d1e4740e70 Merge branch 'calamares' into work-3.3 2022-02-02 14:41:58 +01:00
dalto
1f9ae6cae6 [initcpiocfg] Only add zfshook if zfs is enabled 2022-01-07 14:49:26 -06:00
Adriaan de Groot
ce23efae99 Merge branch 'calamares' into work-3.3 2021-11-30 11:39:30 +01:00
dalto
76892136cf [initcpiocfg] Add support for zfs 2021-11-15 18:41:34 -06:00
Adriaan de Groot
c1e1e6c3a4 Merge branch 'calamares' into work-3.3 2021-09-28 23:37:38 +02:00
demmm
65c1ef7cb5 [initcpiocfg] fix install failure due to extra s 2021-09-24 16:27:35 +02:00
librewish
e5e9e14a9f [initcpiocfg] add consolefont to hooks 2021-09-24 12:30:42 +05:30
Adriaan de Groot
cf6c930df5 Merge remote-tracking branch 'origin/calamares' into work-3.3 2021-09-22 11:51:14 +02:00
Adriaan de Groot
a4c714238f [initcpio] Refactor file-writing 
- iterate over the lines of the source file, rather
  than over indexes, and make clear that the hooks, modules and files
  lines are replaced, rather than merged.
- this calls write() more often, but it's only a few lines
 2021-09-21 13:39:29 +02:00
Adriaan de Groot
12cd9dd5b2 [initcpiocfg] Refactor 
- Read the host /etc/mkinitcpio.cfg in one function rather
  than hiding it inside the writer
 2021-09-21 13:18:01 +02:00
Adriaan de Groot
60e495bd8c [initcpiocfg] Refactor, improve testability 
- don't chain directly from modify_mkinitcpio_conf() to the
  function that writes the file write_mkinitcpio_lines();
  split into "figure out what needs to be written" and calling
  that writing-function, so that we can test / check / log
  if needed between the two.
 2021-09-21 13:13:21 +02:00
Adriaan de Groot
118e18ac60 [initcpiocfg] Code-shuffle 
- put the system-information and -detection functions at top
  and the "do the actual work" things below
- don't mix the boolean do-we-use-this flags with the
  lists of files and modules which are the important
  parts of modify_mkinitcpio_conf
 2021-09-21 13:03:13 +02:00
Adriaan de Groot
7c3c7c4ff7 [initcpiocfg] Use booleans for boolean values 
(as previous) Use False/True rather than ""/"yes" for
keeping track of does-the-system-use-lvm2.
 2021-09-21 12:54:18 +02:00
Adriaan de Groot
7f7dc04e8d [initcpiocfg] Use bools for boolean values 
Having "" and "yes" as values is a bit shell-script-ish.
Use a regular boolean value instead; simplify code
while we're at it.
 2021-09-21 12:52:16 +02:00
Adriaan de Groot
45daebd989 [initcpiocfg] Refactor CPU-characteristics determination 
The code is still over-wrought, but the API for cpuinfo
now exposes the interesting thing (is it Intel?) in
a useful -- more readable -- way.
 2021-09-21 12:42:58 +02:00
Vitor Lopes
f9dc932f62 [initcpiocfg] fix english in human-visible string 2021-09-16 14:11:29 +02:00
Vitor Lopes
4b08aebe7f [initcpiocfg] Use F strings, python3.6 only 2021-09-16 14:11:29 +02:00
Vitor Lopes
1fe27effe5 [initcpiocfg] rework swap_uuid statement and filesystem hook 2021-09-16 14:11:21 +02:00
Vitor Lopes
453e760709 [initcpiocfg] use format instead of % 2021-09-16 14:11:11 +02:00
Vitor Lopes
0ad9242ab7 [initcpiocfg] mkinitcpio.conf might not understand single quotes 2021-09-16 14:11:01 +02:00
Vitor Lopes
5da736466c [initcpiocfg] rework is_intel_cpu 2021-09-16 14:10:56 +02:00
Vitor Lopes
df256b608a [initcpiocfg] code tidy up 2021-09-16 14:10:45 +02:00
Adriaan de Groot
cf0119ed4a [initcpiocfg][plymouthcfg] Consistent find-plymouth code 
- drop the debugging line because that has already been
  logged by the call to `runCommand()` that backs
  `target_env_call()`.
- use the same (top-level) function rather than having a
  function and elsewhere a very-similar method.
 2021-04-16 10:23:29 +02:00
Chrysostomus
59cfdcccdf Use variable instead of a function 2020-12-05 22:57:51 +02:00
Chrysostomus
0ed0d37693 Don't use plymouth-encrypt if there is keyfile in use, because it is buggy and asks for password even when it is not needed 2020-12-05 22:55:35 +02:00
Chrysostomus
b7cc4860e0 Put the condition on a single line for prettiness sake 2020-11-06 21:45:01 +02:00
Chrysostomus
84558333bf Regular plymouth hook is also still needed 2020-11-03 13:57:19 +02:00
Chrysostomus
3bf57c7785 Use graphical decryption prompt with plymouth as adviced here: https://wiki.archlinux.org/index.php/plymouth#The_plymouth_hook 2020-11-03 13:55:24 +02:00
Adriaan de Groot
1cd9b93a22 REUSE: Giant boilerplate cleanup 
- point to main Calamares site in the 'part of' headers instead
  of to github (this is the "this file is part of Calamares"
  opening line for most files).
- remove boilerplate from all source files, CMake modules and completions,
  this is the 3-paragraph summary of the GPL-3.0-or-later, which has
  a meaning entirely covered by the SPDX tag.
 2020-08-26 02:28:38 +02:00
Adriaan de Groot
863a4cc2a4 REUSE: (GPL-3.0-or-later) Python modules 2020-08-26 02:22:49 +02:00
Philip Müller
0c8257df3d [initcpio] Don't claim other swap 
From downstream ee99e34e25
 2020-02-24 18:23:32 +01:00
Adriaan de Groot
dd5adc153f
Merge pull request #1291 from calamares/initcpiocfg-usr 
[initcpiocfg] add usr hook if partition is separate
 2020-01-06 14:41:24 +01:00
Adriaan de Groot
fe64903d2f [initcpiocfg] Polish PR #1290 
- List discrete years in copyright
 - Add docstrings
 - Massage detect_plymouth() to return bool (easier in if() context)
 2020-01-06 14:34:47 +01:00
Philip Müller
85d3f9e9b9 [initcpiocfg] add usr hook if partition is separate 2019-12-16 09:40:54 +01:00
Philip Müller
a3da47cd9c [initcpiocfg] update plymouth check 2019-12-16 09:34:21 +01:00
Adriaan de Groot
ec0fe2ccd3 Modules: Improve error reporting 
- [initcpio] remove superfluous inner function
 - [initcpio] catch errors from mkinitcpio itself and report them in a nice
   readable format.

 - Save translators the effort of doing a dozen messages
   with just the name of the module changed. All of these modules
   bail out on bad configurations with a meaningful message.
   - [initcpiocfg]
   - [fstab]
   - [initramfscfg]
   - [localecfg]
   - [luksbootkeyfile]
   - [luksopenswaphookcfg]

 - [machineid] Warn on bad config. It's conceivable that this is run
   with an empty rootMountPoint (i.e. "") to modify the running system,
   so only bail on None.
 2019-04-28 14:34:39 -04:00
Adriaan de Groot
e326b658ef Enable translation in Python modules 
- covers all the remaining Python modules
 - most only get a translatable pretty name, some also return
   error messages
 2019-04-20 11:22:32 +02:00
Adriaan de Groot
1a42b8af41 Merge branch 'kpmcore-3.2' 
- Bumps requireed KPMCore to 3.3 (in spite of the branch name)
 - Cleans up some dependencies

Thanks to Andrius Stikonas.
 2018-01-02 13:25:11 +01:00
Philip
be650d7986 [initcpiocfg] search just for 'lvm2' in partition[fs] 2017-12-30 05:01:25 -05:00
Philip
5a83024698 [initcpiocfg] add 'lvm2' hook as needed 2017-12-30 05:00:59 -05:00
Adriaan de Groot
762ad54344 Documentation: change http links to GitHub to https 2017-12-20 08:39:09 -05:00
Adriaan de Groot
798640be0d PEP8 whining 2017-08-31 04:51:34 -04:00
Adriaan de Groot
186f6cd1e2 initcpiocfg: accept (but warn) for missing config file in the host 2017-08-23 17:33:03 -04:00
Adriaan de Groot
3804e4df68 Python-style: follow-up to PR 735, remove non-idiomatic use of 'is' 2017-06-04 11:37:12 +02:00
Alf Gaida
b7488b611b Fixed pep8 whining in module initcpiocfg 
Added myself to copyright
 2017-06-02 22:26:58 +02:00
Teo Mrnjavac
79b0889db7 Don't include keyfile in initramfs on unencrypted /boot. 2016-11-17 18:15:37 +01:00
Teo Mrnjavac
b6b930dce8 Add openswap hook handling to initcpiocfg. 2016-05-13 16:09:35 +02:00
Teo Mrnjavac
ef5a190d5d Unbreak non-luks install. 2016-05-11 16:35:53 +02:00