[Git-commits] [grml/grml-live] 242922: Merge grml-etc

[Chris Hofstaedtler]

  Branch: refs/heads/zeha/merge-grml-etc
  Home:   https://github.com/grml/grml-live
  Commit: 242922e0c5fc3cd153a083f7e54c01a120edc925
      https://github.com/grml/grml-live/commit/242922e0c5fc3cd153a083f7e54c01a120edc925
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-20 (Fri, 20 Jun 2025)

  Changed paths:
    A config/files/GRMLBASE/etc/exports.grml
    A config/files/GRMLBASE/etc/skel/.channels/at-austria
    A config/files/GRMLBASE/etc/skel/.channels/at-graz
    A config/files/GRMLBASE/etc/skel/.channels/at-klagenfurt
    A config/files/GRMLBASE/etc/skel/.channels/channels.conf-AT-graz
    A config/files/GRMLBASE/etc/skel/.channels/channels.conf-AT-klagenfurt
    A config/files/GRMLBASE/etc/skel/.channels/channels.conf-AT-vienna
    A config/files/GRMLBASE/etc/skel/.irbrc
    A config/files/GRMLBASE/etc/skel/.irssi/config
    A config/files/GRMLBASE/etc/skel/.irssi/scripts/osd.pl
    A config/files/GRMLBASE/etc/skel/.irssi/scripts/queryresume.pl
    A config/files/GRMLBASE/etc/skel/.irssi/scripts/screen_away.pl
    A config/files/GRMLBASE/etc/skel/.lftprc
    A config/files/GRMLBASE/etc/skel/.links2/bookmarks.html
    A config/files/GRMLBASE/etc/skel/.msmtprc
    A config/files/GRMLBASE/etc/skel/.muttrc
    A config/files/GRMLBASE/etc/skel/.screenrc
    A config/files/GRMLBASE/etc/skel/.signature
    A config/files/GRMLBASE/etc/skel/.terminfo/m/mostlike
    A config/files/GRMLBASE/etc/skel/.terminfo/mostlike.txt
    A config/files/GRMLBASE/etc/skel/.zlogin
    A config/files/GRMLBASE/etc/su-to-rootrc
    M config/package_config/GRMLBASE
    M config/scripts/GRMLBASE/32-xorg
    M config/scripts/GRMLBASE/35-network
    M config/scripts/GRMLBASE/98-clean-chroot

  Log Message:
  -----------
  Merge grml-etc

grml-live$ git remote add grml-etc ../grml-etc
grml-live$ git fetch grml-etc
remote: Enumerating objects: 2397, done.
remote: Counting objects: 100% (2397/2397), done.
remote: Compressing objects: 100% (1263/1263), done.
remote: Total 2397 (delta 1074), reused 2389 (delta 1069), pack-reused 0 (from 0)
Receiving objects: 100% (2397/2397), 945.09 KiB | 39.38 MiB/s, done.
Resolving deltas: 100% (1074/1074), done.
>From ../grml-etc
 * [new branch]        master     -> grml-etc/master
grml-live$ git merge --allow-unrelated-histories grml-etc/master
...
Automatic merge failed; fix conflicts and then commit the result.

Move config files into FAI file area:

grml-live$ git mv etc/skel config/files/GRMLBASE/etc/
grml-live$ git mv etc/exports.grml config/files/GRMLBASE/etc/
grml-live$ git mv etc/su-to-rootrc config/files/GRMLBASE/etc/

Remove debian/ files previously only existing in grml-etc:

grml-live$ git rm -f debian/dirs debian/docs debian/grml-etc.lintian-overrides debian/grml-etc.maintscript

Remove grml-etc's changes to grml-live's debian/ files:

grml-live$ git checkout --ours debian
grml-live$ git add debian/NEWS debian/changelog debian/control debian/copyright debian/rules

Remove grml-etc's Makefile:

grml-live$ git rm -f Makefile

Then remove grml-etc from GRMLBASE package config and add fcopy calls into
GRMLBASE/32-xorg (for su-to-root), GRMLBASE/35-network (for exports.grml), and
GRMLBASE/98-clean-chroot (for skel).



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