Commit Graph

624 Commits

Author SHA1 Message Date
Teo Mrnjavac
0d64c849fd Unbreak build. Sorry. 2014-11-20 17:21:10 +01:00
Teo Mrnjavac
0d89ba761a Uic in GreetingPage. 2014-11-20 10:04:10 +01:00
Teo Mrnjavac
01c3244396 Merge pull request #155 from calamares/fix-issue-128
grubcfg: Create /etc/default/grub if missing.
2014-11-19 17:20:06 +01:00
Kevin Kofler
ab4d31f1a6 bootloader: Allow overriding the bootloaderEntryName setting.
Allow setting bootloaderEntryName in bootloader.conf. If not specified
there, the setting will be taken from branding.desc.
2014-11-19 17:01:02 +01:00
Kevin Kofler
462819060b branding: Add a dedicated bootloaderEntryName setting.
Use it in the bootloader and grubcfg modules instead of
shortProductName.
2014-11-19 16:50:15 +01:00
Teo Mrnjavac
fb37a0bf2f Fix focus in UsersPage. 2014-11-18 15:57:07 +01:00
Kevin Kofler
00604a8bca PythonHelper: Add support for bool.
Convert Python bool type from/to C++/QVariant bool (QVariant::Bool) in
PythonHelper::variantToPyObject and PythonHelper::variantFromPyObject.

This fixes the "override" option and any booleans in the "defaults" list
in grubcfg.conf.
2014-11-18 05:34:01 +01:00
Kevin Kofler
1499963920 grubcfg: Create /etc/default/grub if missing.
Also adds a grubcfg.conf with the following settings:

* overwrite: If set to true, always creates /etc/default/grub from
  scratch even if the file already existed. If set to false, edits the
  existing file instead. The default is "false".

* defaults: Default entries to write to /etc/default/grub if it does not
  exist yet or if we are overwriting it. Note that in addition,
  GRUB_CMDLINE_LINUX_DEFAULT and GRUB_DISTRIBUTOR will always be
  written, with automatically detected values. The default in the code
  is empty. The shipped grubcfg.conf currently reproduces the default
  settings from the Fedora installer Anaconda.

Fixes #128.
2014-11-18 04:33:39 +01:00
Kevin Kofler
d5b95d79e5 grubcfg: Handle the case where expected lines are missing.
Check whether we actually had a GRUB_CMDLINE_LINUX_DEFAULT and a
GRUB_DISTRIBUTOR line, add any of them if it was missing.
2014-11-18 03:40:47 +01:00
Kevin Kofler
f58cca1bb2 grubcfg: Don't error if /etc/default is missing.
It is created later in the function.
2014-11-18 03:38:20 +01:00
Kevin Kofler
5cae4e0632 partition: Don't assume that an unknown OS is Windows 7.
Don't talk about "Windows 7 programs, documents, photos, music, and
other files" when we actually have no idea what the other operating
system is or when there are multiple ones.
2014-11-18 02:48:58 +01:00
Kevin Kofler
75921ec125 bootloader/test.yaml: Define the shortProductName. 2014-11-16 15:05:00 +01:00
Kevin Kofler
48eca95a26 grubcfg: Use shortProductName.
This is particularly useful if the full product name contains
"GNU/Linux" or "Linux", because e.g. "Generic GNU/Linux GNU/Linux" does
not make sense.
2014-11-16 05:18:11 +01:00
Kevin Kofler
e420341ba6 bootloader: Use shortProductName.
This is particularly useful if the full product name contains
"GNU/Linux" or "Linux", because e.g. "Generic GNU/Linux GNU/Linux" does
not make sense.
2014-11-16 05:17:06 +01:00
Kevin Kofler
538b457ea8 branding: Add a shortProductName entry.
This is what the bootloader modules really want, and it was also missing
for consistency with the other branding entries.
2014-11-16 05:14:57 +01:00
Kevin Kofler
cde7356f0d grubcfg: Quote the GRUB_DISTRIBUTOR value. 2014-11-16 04:58:00 +01:00
Kevin Kofler
76450b44a3 bootloader: Ensure that the file names are valid.
Change any '/' slashes to '-' dashes. Also change spaces to underscores
while we are at it.
2014-11-16 04:56:11 +01:00
Kevin Kofler
8f5b0585cb grubcfg: Get the distribution name from the branding.
Remove the redundant "distributor" setting from grubcfg.conf (and the
entire grubcfg.conf file that has no settings left for now).
2014-11-16 04:33:27 +01:00
Kevin Kofler
3cf5baadc1 bootloader: Get the distribution name from the branding.
Remove the redundant "distribution" setting from bootloader.conf.
2014-11-16 04:26:51 +01:00
Kevin Kofler
98f99fa5bf Introduce and use a Calamares::Branding::setGlobals method.
The method creates a map called "branding" in the global storage, and
inserts an entry for each of the branding strings. This makes the
branding information accessible to the Python modules.

The method is called by CalamaresApplication::initJobQueue.

This is necessary because the Branding class is in libcalamaresui, so
Python modules cannot access it directly.
2014-11-16 04:19:53 +01:00
Kevin Kofler
7478c1266b Point the lib/calamares/libcalamares.so symlink to the versioned so.
Point the lib/calamares/libcalamares.so symlink for the Python modules
directly to the versioned lib/libcalamares.so.VERSION library rather
than to the lib/libcalamares.so symlink. This allows distributions to
install the lib/libcalamares.so symlink to a development package and
only ship lib/libcalamares.so.VERSION and lib/calamares/libcalamares.so
in the runtime package. It is also marginally faster (because only one
level of symlinks has to be resolved instead of two).

(I know this works because I have been manually fixing up this symlink
in the Fedora specfile so far.)
2014-11-14 12:30:56 +01:00
Teo Mrnjavac
78de47eb8c Retranslate Users module. 2014-11-13 17:42:02 +01:00
Teo Mrnjavac
ecc2d27a18 Merge pull request #151 from calamares/localecfg
adding localecfg
2014-11-13 17:34:07 +01:00
Rohan Garg
60eb9cfae6 Use the correct file to write things into 2014-11-13 17:08:46 +01:00
Teo Mrnjavac
0f9496babe Finish up retranslation in PreparePage. 2014-11-13 16:52:32 +01:00
Teo Mrnjavac
280baf7326 Move PrepareCheckWidget text out of ctor. 2014-11-13 16:52:32 +01:00
Teo Mrnjavac
9b2dfdf1ec Use Retranslator in Prepare module (partial). 2014-11-13 16:52:32 +01:00
demmm
ff1383d7f5 adding localecfg
locale hardcoded to en_US until local globalstorage is available
run pep8 on bootloader main.py, plain switch from subprocess to chroot_call fails for gummiboot call
2014-11-12 23:10:20 -05:00
Kevin Kofler
7e1ec78d35 grub, bootloader: Make the grub-* and /boot/grub names configurable.
Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.

Fixes #123.
2014-11-13 00:19:24 +01:00
Rohan Garg
d9187c25c7 check_chroot_call does not actually return a error code, use chroot_call
instead.

Thanks to Kevin Kofler for pointing this out.
2014-11-12 18:54:26 +01:00
Rohan Garg
1f6feb9417 Make sure we return a message when dracut or initramfs fail 2014-11-12 17:05:06 +01:00
Teo Mrnjavac
388363c1f2 Merge pull request #148 from calamares/gummibot
make gummiboot kernel/distro agnostic
2014-11-12 12:17:32 +01:00
Teo Mrnjavac
faa77d7f5e Use Retranslator in Partitioning module. 2014-11-11 17:09:33 +01:00
Teo Mrnjavac
8575240b95 Capture by-val in Retranslator macro. 2014-11-11 17:05:56 +01:00
Teo Mrnjavac
688cc8f798 Use Retranslator in KeyboardPage. 2014-11-11 15:46:49 +01:00
Rohan Garg
fb92697a93 Make sure our return value is correct 2014-11-11 15:33:03 +01:00
Teo Mrnjavac
99114e04d8 Merge pull request #147 from kkofler/fix-issue-31
keyboard: Write the keyboard model and layout settings to the root mount point.
2014-11-11 15:23:07 +01:00
Teo Mrnjavac
1d9535053a Use Retranslator in GreetingPage. 2014-11-11 15:17:46 +01:00
Teo Mrnjavac
e5c3888be2 Allow multiple CALAMARES_RETRANSLATE blocks in the same widget. 2014-11-11 15:12:44 +01:00
Teo Mrnjavac
945b59748a Add RETRANSLATE macro to CalamaresUtils::Retranslator. 2014-11-11 15:12:44 +01:00
Kevin Kofler
3e9de2a05a keyboard: Allow absolute paths for the xOrgConfFileName setting.
This should ensure it works on all distributions.
2014-11-11 14:59:30 +01:00
Rohan Garg
2c8aa950a3 Update README.md 2014-11-11 14:56:34 +01:00
Kevin Kofler
86d51b4a9c keyboard: Pass settings directly, not through GlobalStorage.
Pass the settings from keyboard.conf directly to the
SetKeyboardLayoutJob rather than through GlobalStorage.
2014-11-11 14:37:05 +01:00
Kevin Kofler
2fec6e3202 keyboard: kbd-model-map: Add link to the original.
In particular, to the upstream git log for the file.
2014-11-11 14:04:21 +01:00
Kevin Kofler
bfdcf0dbc0 keyboard: Coding style fixes. 2014-11-11 13:57:08 +01:00
Teo Mrnjavac
6f3898a73d Use Retranslator in LocalePage. 2014-11-11 12:44:32 +01:00
Teo Mrnjavac
08b90e975b Add retranslator class to CalamaresUtils. 2014-11-11 12:44:32 +01:00
demmm
53da965bb1 make gummiboot kernel/distro agnostic
add hibernate option to .conf
create a fallback entry in gummiboot menu
re-add firmware to globalstorage, simplifies this module, will be needed to add more OS to gummi
2014-11-11 00:13:15 -05:00
Kevin Kofler
4f9f7d7858 keyboard: Write the keyboard model and layout settings to the root mount point.
This is implemented as a new SetKeyboardLayout job that does the work.

Portions of the code are adapted from systemd-localed's source code,
which is under a compatible license (LGPLv2.1+, can be converted to our
GPLv3+ license). I ported it from C to to C++/Qt and made some minor
tweaks to the mapping logic (from X11 to vconsole layouts) though.

Fixes #31.

Tested on a Fedora Remix (Kannolo 21) with the default module settings
(finds the converted X11 keymaps for the virtual console) and with
convertedKeymapPath: "" (does the legacy keymap conversion as expected).
2014-11-11 04:48:03 +01:00
Rohan Garg
2b26be4162 Fix copyright holder 2014-11-10 15:45:40 +01:00