Move /etc/grml/fai/config into /usr/share/grml-live/config

This stops having all these files as dpkg conffiles.
Users will need to update GRML_FAI_CONFIG/-D if they set this.

Warns if /etc/grml/fai/config still exists and GRML_FAI_CONFIG
is unset; also warns if GRML_FAI_CONFIG/config exists, as
GRML_FAI_CONFIG now should point directly to the config directory,
and not its parent.

.github/workflows/pr-review.yml

@@ -21,8 +21,8 @@ jobs:
             grml-live
             scripts/*.sh
             remaster/grml-live-remaster
-            etc/grml/fai/config/hooks/*
-            etc/grml/fai/config/scripts/*
+            config/hooks/*
+            config/scripts/*
           check_all_files_with_shebangs: "false"
 
   shellcheck-tests:

.gitignore

@@ -1,3 +1 @@
-etc/grml/fai/config/basefiles
-etc/grml/fai/make-fai-nfsroot.conf
-etc/grml/fai/nfsroot.conf
+config/basefiles

README.md

@@ -21,7 +21,7 @@ set `GRML_FAI_CONFIG`, the `SCRIPTS_DIRECTORY`, the `LIVE_CONF`
 and the templates option so that it does not use the config files
 of an installed `grml-live` package:
 
-    # export GRML_FAI_CONFIG=$(pwd)/etc/grml/fai
+    # export GRML_FAI_CONFIG=$(pwd)/config
     # export SCRIPTS_DIRECTORY=$(pwd)/scripts
     # export LIVE_CONF=$(pwd)/etc/grml/grml-live.conf
     # export TEMPLATE_DIRECTORY=$(pwd)/templates

TODO

@@ -6,7 +6,7 @@ Patches, ideas and feedback welcome.
 * if a stage fails inside grml-live the stage is skipped on next execution → try
   to find a better way how to clean up the stage and re-execute it again
 
-* support something like a directory /etc/grml/fai/chroot_packages to install
+* support something like a directory $GRML_FAI_CONFIG/chroot_packages to install
   additional Debian packages without the need for a Debian repository
 
 * support multiple kernel versions installed in one single live-system

build-driver/build.py

@@ -101,7 +101,7 @@ def run_grml_live(
     old_iso_path: Path | None,
 ):
     env = dict(os.environ)
-    grml_fai_config = grml_live_path / "etc" / "grml" / "fai"
+    grml_fai_config = grml_live_path / "config"
     env.update(
         {
             "GRML_FAI_CONFIG": str(grml_fai_config),
@@ -113,7 +113,7 @@ def run_grml_live(
 
     if not old_iso_path:
         with ci_section("Creating basefile using mmdebstrap"):
-            basefiles_path = grml_fai_config / "config" / "basefiles"
+            basefiles_path = grml_fai_config / "basefiles"
             basefiles_path.mkdir(exist_ok=True)
             basefile = basefiles_path / f"{arch.upper()}.tar.gz"
             run_x(["mmdebstrap", "--format=tar", debian_suite, basefile])

etc/grml/fai/config/files/etc/apt/apt.conf.d/15grml-live/GRMLBASE → config/files/etc/apt/apt.conf.d/15grml-live/GRMLBASE

@@ -1,4 +1,4 @@
-// Installed via ${GRML_FAI_CONFIG}/config/files/etc/apt/apt.conf.d/15grml-live/GRMLBASE
+// Installed via ${GRML_FAI_CONFIG}/files/etc/apt/apt.conf.d/15grml-live/GRMLBASE
 
 // work around http://trac.lighttpd.net/trac/ticket/657
 Acquire::http::Pipeline-Depth 0; // added by grml-live

etc/grml/fai/config/files/etc/apt/sources.list/GRMLBASE → config/files/etc/apt/sources.list/GRMLBASE

@@ -1,6 +1,6 @@
 ###################################################################
 # Installed via grml-live's
-# ${GRML_FAI_CONFIG}/config/files/etc/apt/sources.list/GRMLBASE
+# ${GRML_FAI_CONFIG}/files/etc/apt/sources.list/GRMLBASE
 ###################################################################
 
 ##### IMPORTANT NOTE ##############################################

etc/grml/fai/config/files/etc/cloud/cloud.cfg.d/42_grml.cfg/GRMLBASE → config/files/etc/cloud/cloud.cfg.d/42_grml.cfg/GRMLBASE

@@ -1,8 +1,8 @@
 # cloud-init configuration for Grml live system.
 #
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/51-cloud-init script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/cloud/cloud.cfg.d/42_grml.cfg/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/51-cloud-init script, using
+# ${GRML_FAI_CONFIG}/files/etc/cloud/cloud.cfg.d/42_grml.cfg/GRMLBASE
 
 system_info:
    # This will affect which distro class gets used

etc/grml/fai/config/files/etc/default/console-setup/GRMLBASE → config/files/etc/default/console-setup/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/26-console-setup script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/default/console-setup/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/26-console-setup script, using
+# ${GRML_FAI_CONFIG}/files/etc/default/console-setup/GRMLBASE
 
 # CONFIGURATION FILE FOR SETUPCON
 # Consult the console-setup(5) manual page.

etc/grml/fai/config/files/etc/fstab/GRMLBASE → config/files/etc/fstab/GRMLBASE

@@ -1,8 +1,8 @@
 # /etc/fstab - static file system information
 #
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/30-fstab script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/fstab/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/30-fstab script, using
+# ${GRML_FAI_CONFIG}/files/etc/fstab/GRMLBASE
 #
 # <filesystem> <mountpoint>   <type> <options>                             <dump> <pass>
 proc           /proc            proc   rw,nosuid,nodev,noexec                0      0

etc/grml/fai/config/files/etc/hosts/GRMLBASE → config/files/etc/hosts/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/34-hosts script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/hosts/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/34-hosts script, using
+# ${GRML_FAI_CONFIG}/files/etc/hosts/GRMLBASE
 
 127.0.0.1       $HOSTNAME    localhost
 

etc/grml/fai/config/files/etc/initramfs-tools/modules/GRMLBASE → config/files/etc/initramfs-tools/modules/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/80-initramfs script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/initramfs-tools/modules/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/80-initramfs script, using
+# ${GRML_FAI_CONFIG}/files/etc/initramfs-tools/modules/GRMLBASE
 ################################################################################
 # List of modules that you want to include in your initramfs.
 # They will be loaded at boot time in the order below.

etc/grml/fai/config/files/etc/locale.conf/GRMLBASE → config/files/etc/locale.conf/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/25-locales script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/locale.conf/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/25-locales script, using
+# ${GRML_FAI_CONFIG}/files/etc/locale.conf/GRMLBASE
 ################################################################################
 # This file lists the locales configuration as used by e.g. systemd-firstboot
 LANG=C.UTF-8

etc/grml/fai/config/files/etc/locale.gen/GRMLBASE → config/files/etc/locale.gen/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/25-locales script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/locale.gen/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/25-locales script, using
+# ${GRML_FAI_CONFIG}/files/etc/locale.gen/GRMLBASE
 ################################################################################
 # This file lists locales that you wish to have built. You can find a list
 # of valid supported locales at /usr/share/i18n/SUPPORTED. Other

etc/grml/fai/config/files/etc/locale.gen/LOCALES → config/files/etc/locale.gen/LOCALES

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/25-locales script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/locale.gen/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/25-locales script, using
+# ${GRML_FAI_CONFIG}/files/etc/locale.gen/GRMLBASE
 ################################################################################
 # This file lists locales that you wish to have built. You can find a list
 # of valid supported locales at /usr/share/i18n/SUPPORTED. Other

etc/grml/fai/config/files/etc/modprobe.d/loop-part.conf/GRMLBASE → config/files/etc/modprobe.d/loop-part.conf/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/39-modprobe script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/modprobe.d/loop-part.conf/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/39-modprobe script, using
+# ${GRML_FAI_CONFIG}/files/etc/modprobe.d/loop-part.conf/GRMLBASE
 #
 # Filename:      /etc/modprobe.d/loop-part.conf
 # Purpose:       Enable partitions for loop devices per default in Grml

etc/grml/fai/config/files/etc/modprobe.d/modesetting.conf/GRMLBASE → config/files/etc/modprobe.d/modesetting.conf/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/39-modprobe script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/modprobe.d/modesetting.conf/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/39-modprobe script, using
+# ${GRML_FAI_CONFIG}/files/etc/modprobe.d/modesetting.conf/GRMLBASE
 #
 # Filename:      /etc/modprobe.d/modesetting.conf
 # Purpose:       Disable cirrus modesetting due to https://bugs.debian.org/768157

etc/grml/fai/config/files/etc/modprobe.d/vmwgfx.conf/GRMLBASE → config/files/etc/modprobe.d/vmwgfx.conf/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/39-modprobe script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/modprobe.d/vmwgfx.conf/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/39-modprobe script, using
+# ${GRML_FAI_CONFIG}/files/etc/modprobe.d/vmwgfx.conf/GRMLBASE
 #
 # Filename:      /etc/modprobe.d/vmwgfx.conf
 # Purpose:       Enable vmwgfx fbdev for the drm driver for the VMware SVGA device

etc/grml/fai/config/files/etc/modules/GRMLBASE → config/files/etc/modules/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/41-modules script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/modules/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/41-modules script, using
+# ${GRML_FAI_CONFIG}/files/etc/modules/GRMLBASE
 ################################################################################
 # This file should contain the names of kernel modules that are
 # to be loaded at boot time, one per line.  Comments begin with

etc/grml/fai/config/files/etc/network/interfaces/GRMLBASE → config/files/etc/network/interfaces/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/35-network script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/network/interfaces/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/35-network script, using
+# ${GRML_FAI_CONFIG}/files/etc/network/interfaces/GRMLBASE
 
 # interfaces(5) file used by ifup(8) and ifdown(8)
 
@@ -10,4 +10,3 @@ source /etc/network/interfaces.d/*
 # The loopback interface
 auto lo
 iface lo inet loopback
-

etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE → config/files/etc/runlevel.conf/GRMLBASE

@@ -3,8 +3,8 @@
 # Read runlevel.conf(5) man page for more information about this file.
 ############################################################################
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/15-initsetup script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/runlevel.conf/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/15-initsetup script, using
+# ${GRML_FAI_CONFIG}/files/etc/runlevel.conf/GRMLBASE
 ############################################################################
 # *IMPORTANT* This is the file used by the Grml live system.
 # Please notice that customization of this file will not work with the

etc/grml/fai/config/files/etc/sudoers/GRMLBASE → config/files/etc/sudoers/GRMLBASE

@@ -3,8 +3,8 @@
 # See the man page for details on how to write a sudoers file.
 
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/20-sudo script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/sudoers/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/20-sudo script, using
+# ${GRML_FAI_CONFIG}/files/etc/sudoers/GRMLBASE
 
 # Host alias specification
 

etc/grml/fai/config/files/etc/tmpfiles.d/man-db.conf/GRMLBASE → config/files/etc/tmpfiles.d/man-db.conf/GRMLBASE

@@ -1,6 +1,6 @@
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/85-systemd script, using
-# ${GRML_FAI_CONFIG}/config/files/etc/tmpfiles.d/man-db.conf/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/85-systemd script, using
+# ${GRML_FAI_CONFIG}/files/etc/tmpfiles.d/man-db.conf/GRMLBASE
 
 # Override default (age set to 1w) to avoid disappearing mandb caches
 d /var/cache/man 0755 man man -

etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE → config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE

@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # This file was deployed via grml-live's
-# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/42-branding script, using
-# ${GRML_FAI_CONFIG}/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE
+# ${GRML_FAI_CONFIG}/scripts/GRMLBASE/42-branding script, using
+# ${GRML_FAI_CONFIG}/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE
 #
 # Filename:      /usr/share/initramfs-tools/scripts/init-top/grml
 # Purpose:       Early boot progress handler

etc/grml/fai/config/scripts/DEBORPHAN/10-whitelist → config/scripts/DEBORPHAN/10-whitelist

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/DEBORPHAN/10-whitelist
+# Filename:      ${GRML_FAI_CONFIG}/scripts/DEBORPHAN/10-whitelist
 # Purpose:       whitelist packages to keep with deborphan
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/DEBORPHAN/98-clean-chroot → config/scripts/DEBORPHAN/98-clean-chroot

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/DEBORPHAN/98-clean-chroot
+# Filename:      ${GRML_FAI_CONFIG}/scripts/DEBORPHAN/98-clean-chroot
 # Purpose:       drop as many packages from grml as possible
 # Authors:       (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/01-packages → config/scripts/GRMLBASE/01-packages

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/01-packages
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/01-packages
 # Purpose:       check for packages that have been requested but could not be installed
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/02-run → config/scripts/GRMLBASE/02-run

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/02-run
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/02-run
 # Purpose:       cleanup after initscripts postinst for /run
 # Authors:       grml-team (grml.org)
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/03-get-sources → config/scripts/GRMLBASE/03-get-sources

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/03-get-sources
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/03-get-sources
 # Purpose:       download sources of Debian packages
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/05-hostname → config/scripts/GRMLBASE/05-hostname

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/05-hostname
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/05-hostname
 # Purpose:       set hostname of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/15-initsetup → config/scripts/GRMLBASE/15-initsetup

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/15-initsetup
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/15-initsetup
 # Purpose:       configure init system for the live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/16-depmod → config/scripts/GRMLBASE/16-depmod

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/16-depmod
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/16-depmod
 # Purpose:       set up kernel's modules.dep
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/18-timesetup → config/scripts/GRMLBASE/18-timesetup

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/18-timesetup
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/18-timesetup
 # Purpose:       apply default time and timezone settings
 # Authors:       (c) Thomas Lehmann <[email protected]>
 # Bug-Reports:   send to author and see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/20-sudo → config/scripts/GRMLBASE/20-sudo

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/20-sudo
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/20-sudo
 # Purpose:       configure sudo setup of the live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/21-usersetup → config/scripts/GRMLBASE/21-usersetup

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/21-usersetup
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/21-usersetup
 # Purpose:       adjust user setup of the live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/25-locales → config/scripts/GRMLBASE/25-locales

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/25-locales
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/25-locales
 # Purpose:       locales (language) configuration of the live system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/26-console-setup → config/scripts/GRMLBASE/26-console-setup

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/26-console-setup
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/26-console-setup
 # Purpose:       console-setup configuration of the live system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/30-fstab → config/scripts/GRMLBASE/30-fstab

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/30-fstab
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/30-fstab
 # Purpose:       create initial /etc/fstab for use on live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/31-motd → config/scripts/GRMLBASE/31-motd

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/31-motd
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/31-motd
 # Purpose:       replace motd
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/32-xorg → config/scripts/GRMLBASE/32-xorg

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/32-xorg
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/32-xorg
 # Purpose:       make sure there does not exist /etc/X11/xorg.conf by default
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup → config/scripts/GRMLBASE/33-aptsetup

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/33-aptsetup
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/33-aptsetup
 # Purpose:       configure Debian package management of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/34-hosts → config/scripts/GRMLBASE/34-hosts

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/34-hosts
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/34-hosts
 # Purpose:       configure /etc/hosts of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/35-network → config/scripts/GRMLBASE/35-network

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/35-network
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/35-network
 # Purpose:       set up /etc/network/interfaces of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/38-udev → config/scripts/GRMLBASE/38-udev

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/38-udev
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/38-udev
 # Purpose:       configure udev of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/39-modprobe → config/scripts/GRMLBASE/39-modprobe

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/39-modprobe
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/39-modprobe
 # Purpose:       adjust modprobe configuration
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/41-modules → config/scripts/GRMLBASE/41-modules

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/41-modules
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/41-modules
 # Purpose:       set up /etc/modules
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/

etc/grml/fai/config/scripts/GRMLBASE/42-branding → config/scripts/GRMLBASE/42-branding

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/42-branding
+# Filename:      ${GRML_FAI_CONFIG}/scripts/GRMLBASE/42-branding
 # Purpose:       install branding files
 # Authors:       grml-team (grml.org), (c) Michael Prokop <[email protected]>
 # Bug-Reports:   see http://grml.org/bugs/