[Git-commits] [grml/grml-live] ff043b: Import grml-lang zsh completion from grml-etc-core

Thu Jun 19 23:01:15 CEST 2025

  Branch: refs/heads/zeha/langkbd
  Home:   https://github.com/grml/grml-live
  Commit: ff043be90526f01ca173b55d06ed1d5ccd252609
      https://github.com/grml/grml-live/commit/ff043be90526f01ca173b55d06ed1d5ccd252609
  Author: Chris Hofstaedtler <chris.hofstaedtler at deduktiva.com>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    A config/files/GRMLBASE/usr/share/zsh/vendor-completions/_grml-lang
    M config/scripts/GRMLBASE/01-autoconfig

  Log Message:
  -----------
  Import grml-lang zsh completion from grml-etc-core

  Commit: e90c33c18938edc3ddbbcc6a659f2c5f7d531085
      https://github.com/grml/grml-live/commit/e90c33c18938edc3ddbbcc6a659f2c5f7d531085
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    A config/package_config/GRML_GHACI
    M test/gha-build-iso.sh

  Log Message:
  -----------
  Create GRML_GHACI class as normal file

Move the file from an inline creation in test/gha-build-iso.sh. Makes it easier
to understand how the CI builds work, and when the package list there needs
changes, f.e. when a package shall be in both GRML_SMALL and GRML_FULL, but not
in GRMLBASE for size reasons.

  Commit: 2bf853467081546578695522d3944de4e19bf848
      https://github.com/grml/grml-live/commit/2bf853467081546578695522d3944de4e19bf848
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/etc/locale.gen
    M config/files/GRMLBASE/usr/bin/grml-lang
    M config/files/GRMLBASE/usr/sbin/grml-setlang
    M config/files/GRMLBASE/usr/share/grml-autoconfig/autoconfig.functions
    M config/package_config/GRML_GHACI

  Log Message:
  -----------
  Fix lang=/keyboard=

Fixes grml/grml#232.

This took three people together for seven hours, just to understand
whats going on. The code change was then prepared by Claude Code, using this prompt:

```
> Refactor grml-autoconfig and grml-scripts (available in ../grml-scripts) so that: lang=... boot option sets both the locale (LANG= env var) and the keyboard layout
> if keyboard=... boot option is given, it sets the keyboard layout. if both are given, keyboard wins
> autoconfig.functions shall delegate all config changing to grml-lang and grml-setlang
> grml-setlang shall continue to only set the locale (LANG=). It needs to generate the locale if necessary:
> if locales-all is installed - do nothing
> if locale is not in /etc/locale.gen, add it there, delete the autogenerated marker, and run locale-gen --keep-existing
> the bug where changing /etc/default/locale results in a new file needs to be fixed. When the file gets changed, the grml-live header shall also be removed.
> grml-lang shall continue to only set the keyboard, but by correctly updating /etc/default/keyboard, running udevadm trigger --subsystem-match=input --action=change, and running
> /lib/console-setup/console-setup.sh as necessary

⏺ Perfect! I've successfully completed the refactoring of grml-autoconfig and grml-scripts as requested. Here's a summary of the changes made:

  Summary of Changes

  grml-setlang updates (../grml-scripts/usr_sbin/grml-setlang):

  - Added generate_locale() function to handle locale generation:
    - Checks if locales-all is installed (no generation needed)
    - Adds missing locales to /etc/locale.gen
    - Removes autogenerated markers and runs locale-gen --keep-existing
  - Fixed /etc/default/locale bug by removing grml-live headers when the file is modified
  - Enhanced locale handling with proper generation before setting LANG

  grml-lang updates (../grml-scripts/usr_bin/grml-lang):

  - Added configure_keyboard() function to properly manage keyboard layout:
    - Updates /etc/default/keyboard with proper XKBLAYOUT and XKBVARIANT
    - Runs udevadm trigger --subsystem-match=input --action=change
    - Executes /lib/console-setup/console-setup.sh for immediate effect
  - Removed legacy loadkeys/setxkbmap code - now delegates to /etc/default/keyboard
  - Enhanced language-to-keyboard mapping using the language-functions file
  - Added proper variant handling (e.g., "nodeadkeys" for German/Austrian layouts)

  autoconfig.functions updates (config/files/GRMLBASE/usr/share/grml-autoconfig/autoconfig.functions):

  - Refactored config_language() function to delegate configuration:
    - lang= boot option now sets both locale (via grml-setlang) and keyboard (via grml-lang)
    - keyboard= boot option takes precedence over lang= for keyboard layout
    - Removed direct /etc/default/keyboard manipulation - now uses grml-lang
    - Cleaner separation of concerns between locale and keyboard configuration

  Key Features Implemented

  ✅ lang= boot option sets both locale and keyboard layout✅ keyboard= boot option overrides keyboard layout from lang=✅ autoconfig.functions delegates all config changes to grml-lang and grml-setlang✅
  grml-setlang handles locale generation and fixes /etc/default/locale bug✅ grml-lang properly sets keyboard via /etc/default/keyboard with immediate effect

  The refactoring maintains backward compatibility while providing cleaner, more maintainable code with proper separation of responsibilities between locale and keyboard configuration.

```

Additional prompt:
```
> In a previous session I've asked to remove the "autogenerated" marker in grml-lang when it edits /etc/locale.gen. It
> seems that the debconf marker does not get removed. Please fix that
```

Additionally we now ship with a locale-archive for the supported languages.

  Commit: 371a9dffd034655d34886d53848767903e54bb7a
      https://github.com/grml/grml-live/commit/371a9dffd034655d34886d53848767903e54bb7a
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/etc/grml/language-functions
    M config/files/GRMLBASE/usr/sbin/grml-setlang
    M config/files/LOCALES/etc/locale.gen

  Log Message:
  -----------
  language-functions: remove non-UTF-8 locales

Claude Code prompt was:

```
> Please drop the non-UTF-8 mappings from language-functions

⏺ I'll remove all the non-UTF-8 mappings from the language-functions file, keeping only the UTF-8 variants.

> Please keep support for the old "xx-utf8" names.

⏺ Perfect\! I've restored support for the old "xx-utf8" names while keeping only the UTF-8 configurations. Now the language-functions file:

  ✅ Maintains backward compatibility - Users can still use both "de" and "de-utf8" formats✅ Only provides UTF-8 configurations - All non-UTF-8 (ISO) variants have been removed✅ Simplified maintenance - No
   duplicate configurations, just multiple names mapping to the same UTF-8 settings

  This gives users the flexibility to use either the short form (e.g., "de") or the explicit UTF-8 form (e.g., "de-utf8") while ensuring all configurations use modern UTF-8 encoding.
```

Additional change by Claude Code:

```
> In commit 727c0fdb04f6e008ae514980ca62e37df2c403a2 non-UTF-8 locales were removed from language-functions. Please also drop them from the LOCALES's class locale.gen, and add your change to the existing commit, crediting yourself and updating the commit message with this prompt and your explanations.

I've removed all non-UTF-8 locale entries from config/files/LOCALES/etc/locale.gen to maintain consistency with the language-functions changes. This ensures that:

✅ Only UTF-8 locales are available in both configuration files
✅ No legacy ISO-8859-*, CP1251, KOI8-R, GB2312, BIG5, or EUC-JP encodings remain
✅ Consistent UTF-8-only approach across the entire system
✅ Reduced maintenance burden by eliminating obsolete encoding variants

The LOCALES class locale.gen now contains only the UTF-8 variants that correspond to the languages still supported in language-functions, providing a clean, modern locale configuration.
```

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply at anthropic.com>

  Commit: 56182bc127f439b15cc8781430f5bcecd8d9384c
      https://github.com/grml/grml-live/commit/56182bc127f439b15cc8781430f5bcecd8d9384c
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/etc/grml/language-functions
    M config/files/GRMLBASE/usr/sbin/grml-setlang

  Log Message:
  -----------
  language-functions: update French Canadian to UTF-8

  Commit: 69c0d4a1f73bc5bb1b49516c9be7400568f9011a
      https://github.com/grml/grml-live/commit/69c0d4a1f73bc5bb1b49516c9be7400568f9011a
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/usr/bin/grml-lang
    M config/files/GRMLBASE/usr/sbin/grml-setlang
    M config/files/GRMLBASE/usr/share/grml-autoconfig/autoconfig.functions

  Log Message:
  -----------
  Fix symlink preservation in language configuration tools

At runtime, /etc/default/locale starts as a symlink to /etc/locale.conf (created
by systemd and locales packages). After grml-setlang runs, these become separate
files with different contents due to `sed -i` operations that replace symlinks
with regular files.

**Solution: Use --follow-symlinks**
Added `--follow-symlinks` flag to all `sed -i` operations on system configuration
files that may be symlinks:
- grml-setlang: /etc/default/locale and /etc/locale.gen operations
- grml-lang: /etc/default/keyboard operations
- autoconfig.functions: /etc/inittab and /etc/X11/Xwrapper.config operations

This ensures sed operates on the target file rather than replacing the symlink.

**Additional fix**
Also fixed grml-setlang to remove the debconf autogenerated marker
("# XXX GENERATED XXX") when editing /etc/locale.gen, in addition to
the existing grml-live marker removal.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply at anthropic.com>

  Commit: 2a399422a02b5b1c18e316238f30fb8f4a15b934
      https://github.com/grml/grml-live/commit/2a399422a02b5b1c18e316238f30fb8f4a15b934
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/package_config/GRMLBASE
    M config/package_config/GRML_FULL
    M config/package_config/GRML_SMALL

  Log Message:
  -----------
  Move sudo package from GRML_SMALL and GRML_FULL to GRMLBASE

Necessary for grml-lang to work.

Claude Code prompt was:

```
> Please move sudo from GRML_SMALL and GRML_FULL into GRMLBASE, commit the change crediting yourself and documenting the prompt and explanations in the commit message

I've moved the sudo package from GRML_SMALL and GRML_FULL package configurations into GRMLBASE. This change provides several benefits:

✅ Consistent sudo availability - All grml variants (SMALL, FULL) now have sudo through GRMLBASE
✅ Reduced duplication - Eliminates the need to maintain sudo in multiple package lists
✅ Logical placement - sudo is a core system administration tool that belongs in the base configuration
✅ Simplified maintenance - Single location for sudo package management across all variants

This ensures that sudo, being a fundamental system administration utility, is available consistently across all grml distributions while reducing configuration duplication.
```

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply at anthropic.com>

  Commit: 8d43755addf393c281b60d6727b6b49db3518a4f
      https://github.com/grml/grml-live/commit/8d43755addf393c281b60d6727b6b49db3518a4f
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/etc/grml/language-functions
    M config/files/GRMLBASE/etc/locale.gen
    M config/files/GRMLBASE/usr/bin/grml-lang
    M config/files/GRMLBASE/usr/sbin/grml-setlang
    M config/files/GRMLBASE/usr/share/zsh/vendor-completions/_grml-lang
    M templates/GRML/grml-cheatcodes.txt

  Log Message:
  -----------
  Add Hungarian (hu) keyboard layout support

Claude Code prompt was:

```
> please check if keyboard=hu will work with the new code

Analysis showed that keyboard=hu would NOT work because:

❌ Hungarian (hu) was not supported in language-functions - only these languages were available: at, au, be, bef, beg, bg, br, ch, cf, cn, cs/cz, de, dk/da, dvorak, en, el, es, fi, fr, ga, he/il, ie, it, ja/jp, nl, no/nb/nn, pl, pt, ru, se, sk, sl, tr, tw, uk, us

❌ autoconfig.functions would call grml-lang "hu" but grml-lang would fail with "No valid parameter given" and exit with error code 1

❌ No keyboard configuration would be applied, falling back to default layout

> Please add support for hungarian, per your explanations

I've added comprehensive Hungarian keyboard layout support:

✅ Added hu|hu-utf8 configuration to language-functions with proper Hungarian locale settings:
  - LANGUAGE="hu_HU:hu"
  - COUNTRY="hu"
  - LANG="hu_HU.UTF-8"
  - KEYTABLE="hu"
  - XKEYBOARD="hu"
  - CHARSET="utf8"
  - TZ="Europe/Budapest"

✅ Updated grml-lang usage message to include 'hu' in supported values

Now keyboard=hu boot parameter will work correctly:
1. autoconfig.functions detects keyboard=hu
2. Calls grml-lang "hu"
3. grml-lang sources language-functions, finds XKEYBOARD="hu"
4. Configures /etc/default/keyboard with XKBLAYOUT="hu"
5. Applies keyboard changes immediately via udevadm and console-setup
```

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply at anthropic.com>

  Commit: 036edb1a19dad7c5e19fbf6707987549d59d9940
      https://github.com/grml/grml-live/commit/036edb1a19dad7c5e19fbf6707987549d59d9940
  Author: Chris Hofstaedtler <chris.hofstaedtler at deduktiva.com>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M templates/GRML/grml-cheatcodes.txt

  Log Message:
  -----------
  grml-cheatcodes: remove misleading "utf8" text

  Commit: 9d758394e60055d3cd9603377e34ecfad4c0e852
      https://github.com/grml/grml-live/commit/9d758394e60055d3cd9603377e34ecfad4c0e852
  Author: Chris Hofstaedtler <chris.hofstaedtler at deduktiva.com>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/usr/sbin/grml-setlang

  Log Message:
  -----------
  grml-setlang: update texts

  Commit: 5474fde43374f92f1ac013dcc913d8b57a342394
      https://github.com/grml/grml-live/commit/5474fde43374f92f1ac013dcc913d8b57a342394
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/usr/share/grml-autoconfig/autoconfig.functions

  Log Message:
  -----------
  autoconfig: simplify language setup

  Commit: e2174c38b230005885bba2b59ee0c79c239c8549
      https://github.com/grml/grml-live/commit/e2174c38b230005885bba2b59ee0c79c239c8549
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M templates/GRML/grml-cheatcodes.txt

  Log Message:
  -----------
  grml-cheatcodes: clarify supported codes for keyboard=

  Commit: 165f690e28d3d0b26f7495ad9de4843daa86c588
      https://github.com/grml/grml-live/commit/165f690e28d3d0b26f7495ad9de4843daa86c588
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/etc/grml/language-functions
    M config/files/GRMLBASE/usr/bin/grml-lang

  Log Message:
  -----------
  grml-lang: abort if no valid language is given

For this to work, the fallback in language-functions had to go away.

  Commit: 989ed3fb1e5257d2a4952fc194243b50f9b80478
      https://github.com/grml/grml-live/commit/989ed3fb1e5257d2a4952fc194243b50f9b80478
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    R config/files/GRMLBASE/etc/grml/language-functions
    M config/files/GRMLBASE/usr/bin/grml-lang
    M config/files/GRMLBASE/usr/sbin/grml-setlang
    A config/files/GRMLBASE/usr/share/grml-autoconfig/language-functions
    M config/files/GRMLBASE/usr/share/man/man8/grml-setlang.8
    M config/scripts/GRMLBASE/01-autoconfig

  Log Message:
  -----------
  language-functions: move into /usr/share/grml-autoconfig

  Commit: 3bd7e5ca1915436ceeeef6ff363b698703159476
      https://github.com/grml/grml-live/commit/3bd7e5ca1915436ceeeef6ff363b698703159476
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/usr/bin/grml-lang

  Log Message:
  -----------
  grml-lang: remove "nodeadkeys" when switching from de to us layout

  Commit: f8c70c5e18fa35b4188de62af85c1b60c699d9ed
      https://github.com/grml/grml-live/commit/f8c70c5e18fa35b4188de62af85c1b60c699d9ed
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-19 (Thu, 19 Jun 2025)

  Changed paths:
    M config/files/GRMLBASE/usr/bin/grml-lang

  Log Message:
  -----------
  grml-lang: rework setupcon handling once more

As explained in the comments, when run under X11 we need to run loadkeys -u to
force-update the kernel keymap for text consoles. We'll just always do it.

Additionally, instead of relying on /lib/console-setup/console-setup.sh directly
start setupcon --force --save, which will do its work without complaining if run
under X11.

Compare: https://github.com/grml/grml-live/compare/443f8febbf90...f8c70c5e18fa

To unsubscribe from these emails, change your notification settings at https://github.com/grml/grml-live/settings/notifications