Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/dracut/patches/dracut-059-magellan.patch

    Contents of /trunk/dracut/patches/dracut-059-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3742 - (show annotations) (download)
    Thu Jul 27 11:18:42 2023 UTC (10 months, 1 week ago) by niro
    File size: 29667 byte(s) 
    -fixed patch
    1 diff -Naur dracut-059/dracut.conf.d/magellan.conf.example dracut-059.magellan/dracut.conf.d/magellan.conf.example
    2 --- dracut-059/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100
    3 +++ dracut-059.magellan/dracut.conf.d/magellan.conf.example 2023-07-27 11:20:46.870712937 +0200
    4 @@ -0,0 +1,18 @@
    5 +# dracut config file customized for RedHat/Fedora.
    6 +
    7 +# i18n
    8 +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefonts:CONSOLEFONT"
    9 +i18n_default_font="LatArCyrHeb-16"
    10 +i18n_install_all="yes"
    11 +stdloglvl=3
    12 +sysloglvl=5
    13 +install_optional_items+=" nano /etc/nanorc lsmod ps grep cat rm "
    14 +prefix="/"
    15 +systemdutildir=/usr/lib/systemd
    16 +systemdsystemunitdir=/usr/lib/systemd/system
    17 +systemdsystemconfdir=/etc/systemd/system
    18 +udevdir=/usr/lib/udev
    19 +hostonly="yes"
    20 +hostonly_cmdline="no"
    21 +early_microcode="yes"
    22 +reproducible="yes"
    23 diff -Naur dracut-059/dracut-functions.sh dracut-059.magellan/dracut-functions.sh
    24 --- dracut-059/dracut-functions.sh 2022-12-24 17:49:27.000000000 +0100
    25 +++ dracut-059.magellan/dracut-functions.sh 2023-07-27 11:41:01.418174393 +0200
    26 @@ -870,9 +870,9 @@
    27
    28 # follow ifcfg settings for boot protocol
    29 for dir in network-scripts network; do
    30 - [ -f "/etc/sysconfig/$dir/ifcfg-$ifname" ] && {
    31 + [ -f "/etc/conf.d/$dir/ifcfg-$ifname" ] && {
    32 sed -n "s/BOOTPROTO=[\"']\?\([[:alnum:]]\{1,\}\)[\"']\?.*\$/\1/p" \
    33 - "/etc/sysconfig/$dir/ifcfg-$ifname"
    34 + "/etc/conf.d/$dir/ifcfg-$ifname"
    35 return
    36 }
    37 done
    38 diff -Naur dracut-059/Makefile dracut-059.magellan/Makefile
    39 --- dracut-059/Makefile 2022-12-24 17:49:27.000000000 +0100
    40 +++ dracut-059.magellan/Makefile 2023-07-27 11:18:56.868818350 +0200
    41 @@ -162,6 +162,9 @@
    42 install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
    43 mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
    44 mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
    45 + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf
    46 + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
    47 + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut
    48 install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh
    49 install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
    50 install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
    51 diff -Naur dracut-059/modules.d/10i18n/console_init.sh dracut-059.magellan/modules.d/10i18n/console_init.sh
    52 --- dracut-059/modules.d/10i18n/console_init.sh 2022-12-24 17:49:27.000000000 +0100
    53 +++ dracut-059.magellan/modules.d/10i18n/console_init.sh 2023-07-27 11:20:23.513644284 +0200
    54 @@ -8,8 +8,8 @@
    55
    56 [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
    57
    58 -DEFAULT_FONT=eurlatgr
    59 -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap
    60 +DEFAULT_FONT=LatArCyrHeb-16
    61 +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap
    62
    63 set_keyboard() {
    64 local param
    65 diff -Naur dracut-059/modules.d/35network-legacy/ifup.sh dracut-059.magellan/modules.d/35network-legacy/ifup.sh
    66 --- dracut-059/modules.d/35network-legacy/ifup.sh 2022-12-24 17:49:27.000000000 +0100
    67 +++ dracut-059.magellan/modules.d/35network-legacy/ifup.sh 2023-07-27 11:21:55.848565895 +0200
    68 @@ -386,15 +386,15 @@
    69 unset TEAM_PORT_CONFIG
    70 read -r _hwaddr < "/sys/class/net/$slave/address"
    71 _subchannels=$(iface_get_subchannels "$slave")
    72 - if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then
    73 + if [ -n "$_hwaddr" ] && [ -e "/etc/conf.dysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then
    74 # shellcheck disable=SC1090
    75 - . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf"
    76 - elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then
    77 + . "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf"
    78 + elif [ -n "$_subchannels" ] && [ -e "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" ]; then
    79 # shellcheck disable=SC1090
    80 - . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf"
    81 - elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then
    82 + . "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf"
    83 + elif [ -e "/etc/conf.d/network-scripts/ifcfg-${slave}" ]; then
    84 # shellcheck disable=SC1090
    85 - . "/etc/sysconfig/network-scripts/ifcfg-${slave}"
    86 + . "/etc/conf.d/network-scripts/ifcfg-${slave}"
    87 fi
    88
    89 if [ -n "${TEAM_PORT_CONFIG}" ]; then
    90 diff -Naur dracut-059/modules.d/35network-legacy/module-setup.sh dracut-059.magellan/modules.d/35network-legacy/module-setup.sh
    91 --- dracut-059/modules.d/35network-legacy/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
    92 +++ dracut-059.magellan/modules.d/35network-legacy/module-setup.sh 2023-07-27 11:22:31.682515058 +0200
    93 @@ -57,7 +57,7 @@
    94 unset TEAM_PORT_CONFIG
    95 unset HWADDR
    96 unset SUBCHANNELS
    97 - for i in /etc/sysconfig/network-scripts/ifcfg-*; do
    98 + for i in /etc/conf.d/network-scripts/ifcfg-*; do
    99 [ -e "$i" ] || continue
    100 case "$i" in
    101 *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave)
    102 @@ -77,12 +77,12 @@
    103
    104 HWADDR="$(echo "$HWADDR" | sed 'y/ABCDEF/abcdef/')"
    105 if [ -n "$HWADDR" ]; then
    106 - ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf"
    107 + ln_r "$i" "/etc/conf.d/network-scripts/mac-${HWADDR}.conf"
    108 fi
    109
    110 SUBCHANNELS="$(echo "$SUBCHANNELS" | sed 'y/ABCDEF/abcdef/')"
    111 if [ -n "$SUBCHANNELS" ]; then
    112 - ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf"
    113 + ln_r "$i" "/etc/conf.d/network-scripts/ccw-${SUBCHANNELS}.conf"
    114 fi
    115 fi
    116 fi
    117 diff -Naur dracut-059/modules.d/35network-manager/nm-initrd.service dracut-059.magellan/modules.d/35network-manager/nm-initrd.service
    118 --- dracut-059/modules.d/35network-manager/nm-initrd.service 2022-12-24 17:49:27.000000000 +0100
    119 +++ dracut-059.magellan/modules.d/35network-manager/nm-initrd.service 2023-07-27 11:38:40.072426399 +0200
    120 @@ -9,7 +9,7 @@
    121 ConditionPathExistsGlob=|/usr/lib/NetworkManager/system-connections/*
    122 ConditionPathExistsGlob=|/run/NetworkManager/system-connections/*
    123 ConditionPathExistsGlob=|/etc/NetworkManager/system-connections/*
    124 -ConditionPathExistsGlob=|/etc/sysconfig/network-scripts/ifcfg-*
    125 +ConditionPathExistsGlob=|/etc/conf.d/network-scripts/ifcfg-*
    126
    127 [Service]
    128 Type=dbus
    129 diff -Naur dracut-059/modules.d/35network-manager/nm-lib.sh dracut-059.magellan/modules.d/35network-manager/nm-lib.sh
    130 --- dracut-059/modules.d/35network-manager/nm-lib.sh 2022-12-24 17:49:27.000000000 +0100
    131 +++ dracut-059.magellan/modules.d/35network-manager/nm-lib.sh 2023-07-27 11:40:41.661170246 +0200
    132 @@ -18,7 +18,7 @@
    133 for i in /usr/lib/NetworkManager/system-connections/* \
    134 /run/NetworkManager/system-connections/* \
    135 /etc/NetworkManager/system-connections/* \
    136 - /etc/sysconfig/network-scripts/ifcfg-*; do
    137 + /etc/conf.d/network-scripts/ifcfg-*; do
    138 [ -f "$i" ] || continue
    139 mkdir -p "$hookdir"/initqueue/finished
    140 echo '[ -f /tmp/nm.done ]' > "$hookdir"/initqueue/finished/nm.sh
    141 diff -Naur dracut-059/modules.d/35network-manager/nm-run.sh dracut-059.magellan/modules.d/35network-manager/nm-run.sh
    142 --- dracut-059/modules.d/35network-manager/nm-run.sh 2022-12-24 17:49:27.000000000 +0100
    143 +++ dracut-059.magellan/modules.d/35network-manager/nm-run.sh 2023-07-27 11:38:25.258839957 +0200
    144 @@ -12,7 +12,7 @@
    145 for i in /usr/lib/NetworkManager/system-connections/* \
    146 /run/NetworkManager/system-connections/* \
    147 /etc/NetworkManager/system-connections/* \
    148 - /etc/sysconfig/network-scripts/ifcfg-*; do
    149 + /etc/conf.d/network-scripts/ifcfg-*; do
    150 [ -f "$i" ] || continue
    151 /usr/sbin/NetworkManager --configure-and-quit=initrd --no-daemon
    152 break
    153 diff -Naur dracut-059/modules.d/45ifcfg/module-setup.sh dracut-059.magellan/modules.d/45ifcfg/module-setup.sh
    154 --- dracut-059/modules.d/45ifcfg/module-setup.sh 2022-12-24 17:49:27.000000000 +0100
    155 +++ dracut-059.magellan/modules.d/45ifcfg/module-setup.sh 2023-07-27 11:23:42.717068344 +0200
    156 @@ -2,7 +2,7 @@
    157
    158 # called by dracut
    159 check() {
    160 - [[ -d $dracutsysrootdir/etc/sysconfig/network-scripts ]] && return 0
    161 + [[ -d $dracutsysrootdir/etc/conf.d/network-scripts ]] && return 0
    162 return 255
    163 }
    164
    165 diff -Naur dracut-059/modules.d/45ifcfg/write-ifcfg.sh dracut-059.magellan/modules.d/45ifcfg/write-ifcfg.sh
    166 --- dracut-059/modules.d/45ifcfg/write-ifcfg.sh 2022-12-24 17:49:27.000000000 +0100
    167 +++ dracut-059.magellan/modules.d/45ifcfg/write-ifcfg.sh 2023-07-27 11:24:14.427612620 +0200
    168 @@ -296,9 +296,9 @@
    169 done
    170
    171 # Pass network opts
    172 -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
    173 +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts
    174 mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient
    175 -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    176 +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    177 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    178 {
    179 cp /tmp/net.* /run/initramfs/
    180 @@ -306,6 +306,6 @@
    181 [ -f "$i" ] && cat "$i"
    182 done | awk '!($0 in a) { a[$0]; print }' > /run/initramfs/state/etc/resolv.conf
    183 [ -s /run/initramfs/state/etc/resolv.conf ] || rm -f /run/initramfs/state/etc/resolv.conf
    184 - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts
    185 + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts
    186 cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient
    187 } > /dev/null 2>&1
    188 diff -Naur dracut-059/modules.d/80cms/cms-write-ifcfg.sh dracut-059.magellan/modules.d/80cms/cms-write-ifcfg.sh
    189 --- dracut-059/modules.d/80cms/cms-write-ifcfg.sh 2022-12-24 17:49:27.000000000 +0100
    190 +++ dracut-059.magellan/modules.d/80cms/cms-write-ifcfg.sh 2023-07-27 11:25:16.302007437 +0200
    191 @@ -4,7 +4,7 @@
    192
    193 OLD_UMASK=$(umask)
    194 umask 0022
    195 -mkdir -p /run/initramfs/state/etc/sysconfig/network-scripts
    196 +mkdir -p /run/initramfs/state/etc/conf.d/network-scripts
    197 umask "$OLD_UMASK"
    198
    199 function cms_write_config() {
    200 @@ -25,19 +25,19 @@
    201
    202 read -r uuid < /proc/sys/kernel/random/uuid
    203
    204 - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE
    205 + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE
    206
    207 strglobin "$IPADDR" '*:*:*' && ipv6=1
    208
    209 # to please NetworkManager on startup in loader before loader reconfigures net
    210 - cat > /etc/sysconfig/network << EOF
    211 + cat > /etc/conf.d/network << EOF
    212 HOSTNAME=$HOSTNAME
    213 EOF
    214 echo "$HOSTNAME" > /etc/hostname
    215 if [ "$ipv6" ]; then
    216 - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network
    217 + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network
    218 else
    219 - echo "NETWORKING=yes" >> /etc/sysconfig/network
    220 + echo "NETWORKING=yes" >> /etc/conf.d/network
    221 fi
    222
    223 cat > "$IFCFGFILE" << EOF
    224 @@ -98,7 +98,7 @@
    225 unset optstr
    226 unset DNS1
    227 unset DNS2
    228 - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    229 + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    230 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    231 }
    232
    233 diff -Naur dracut-059/modules.d/95rootfs-block/mount-root.sh dracut-059.magellan/modules.d/95rootfs-block/mount-root.sh
    234 --- dracut-059/modules.d/95rootfs-block/mount-root.sh 2022-12-24 17:49:27.000000000 +0100
    235 +++ dracut-059.magellan/modules.d/95rootfs-block/mount-root.sh 2023-07-27 11:26:22.799814234 +0200
    236 @@ -32,9 +32,9 @@
    237
    238 READONLY=
    239 fsckoptions=
    240 - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then
    241 + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then
    242 # shellcheck disable=SC1090
    243 - . "$NEWROOT"/etc/sysconfig/readonly-root
    244 + . "$NEWROOT"/etc/conf.d/readonly-root
    245 fi
    246
    247 if getargbool 0 "readonlyroot=" -y readonlyroot; then
    248 @@ -58,8 +58,8 @@
    249 fsckoptions="-f $fsckoptions"
    250 elif [ -f "$NEWROOT"/.autofsck ]; then
    251 # shellcheck disable=SC1090
    252 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] \
    253 - && . "$NEWROOT"/etc/sysconfig/autofsck
    254 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] \
    255 + && . "$NEWROOT"/etc/conf.d/autofsck
    256 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    257 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    258 fi
    259 diff -Naur dracut-059/modules.d/97masterkey/masterkey.sh dracut-059.magellan/modules.d/97masterkey/masterkey.sh
    260 --- dracut-059/modules.d/97masterkey/masterkey.sh 2022-12-24 17:49:27.000000000 +0100
    261 +++ dracut-059.magellan/modules.d/97masterkey/masterkey.sh 2023-07-27 11:26:45.596871613 +0200
    262 @@ -6,7 +6,7 @@
    263 # TORSEC group -- http://security.polito.it
    264 # Roberto Sassu <roberto.sassu@polito.it>
    265
    266 -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey"
    267 +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey"
    268 MULTIKERNELMODE="NO"
    269 PCRLOCKNUM=11
    270
    271 diff -Naur dracut-059/modules.d/97masterkey/README dracut-059.magellan/modules.d/97masterkey/README
    272 --- dracut-059/modules.d/97masterkey/README 2022-12-24 17:49:27.000000000 +0100
    273 +++ dracut-059.magellan/modules.d/97masterkey/README 2023-07-27 11:27:02.653830576 +0200
    274 @@ -39,7 +39,7 @@
    275 MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob"
    276 --------------------------------------------------------------------------
    277
    278 -2) create the configuration file '/etc/sysconfig/masterkey' to override the
    279 +2) create the configuration file '/etc/conf.d/masterkey' to override the
    280 value of one or all variables;
    281
    282 3) specify these parameters in the kernel command line:
    283 diff -Naur dracut-059/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-059.magellan/modules.d/98ecryptfs/ecryptfs-mount.sh
    284 --- dracut-059/modules.d/98ecryptfs/ecryptfs-mount.sh 2022-12-24 17:49:27.000000000 +0100
    285 +++ dracut-059.magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2023-07-27 11:27:24.104198100 +0200
    286 @@ -6,7 +6,7 @@
    287 # TORSEC group -- http://security.polito.it
    288 # Roberto Sassu <roberto.sassu@polito.it>
    289
    290 -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs"
    291 +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs"
    292 ECRYPTFSKEYTYPE="encrypted"
    293 ECRYPTFSKEYDESC="1000100010001000"
    294 ECRYPTFSKEYID=""
    295 diff -Naur dracut-059/modules.d/98ecryptfs/README dracut-059.magellan/modules.d/98ecryptfs/README
    296 --- dracut-059/modules.d/98ecryptfs/README 2022-12-24 17:49:27.000000000 +0100
    297 +++ dracut-059.magellan/modules.d/98ecryptfs/README 2023-07-27 11:31:35.291831476 +0200
    298 @@ -23,13 +23,13 @@
    299 ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob"
    300 --------------------------------------------------------------------------
    301
    302 -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY
    303 +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY
    304 variable;
    305
    306 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command
    307 line.
    308
    309 -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify
    310 +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify
    311 # more options for mounting the eCryptfs filesystem:
    312
    313 ECRYPTFSSRCDIR: existent directory in the lower root filesystem;
    314 @@ -39,7 +39,7 @@
    315 option is automatically added by the dracut script).
    316
    317 # Example of the configuration file:
    318 ------------ '/etc/sysconfig/ecryptfs' (with default values) -----------
    319 +----------- '/etc/conf.d/ecryptfs' (with default values) -----------
    320 ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob"
    321 ECRYPTFSSRCDIR="/secret"
    322 ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}"
    323 diff -Naur dracut-059/modules.d/98integrity/evm-enable.sh dracut-059.magellan/modules.d/98integrity/evm-enable.sh
    324 --- dracut-059/modules.d/98integrity/evm-enable.sh 2022-12-24 17:49:27.000000000 +0100
    325 +++ dracut-059.magellan/modules.d/98integrity/evm-enable.sh 2023-07-27 11:32:11.222446098 +0200
    326 @@ -7,13 +7,13 @@
    327 # Roberto Sassu <roberto.sassu@polito.it>
    328
    329 EVMSECFILE="${SECURITYFSDIR}/evm"
    330 -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm"
    331 +EVMCONFIG="${NEWROOT}/etc/conf.d/evm"
    332 EVMKEYDESC="evm-key"
    333 EVMKEYTYPE="encrypted"
    334 EVMKEYID=""
    335 EVM_ACTIVATION_BITS=0
    336
    337 -# The following variables can be set in /etc/sysconfig/evm:
    338 +# The following variables can be set in /etc/conf.d/evm:
    339 # EVMKEY: path to the symmetric key; defaults to /etc/keys/evm-trusted.blob
    340 # EVMKEYDESC: Description of the symmetric key; default is 'evm-key'
    341 # EVMKEYTYPE: Type of the symmetric key; default is 'encrypted'
    342 diff -Naur dracut-059/modules.d/98integrity/ima-keys-load.sh dracut-059.magellan/modules.d/98integrity/ima-keys-load.sh
    343 --- dracut-059/modules.d/98integrity/ima-keys-load.sh 2022-12-24 17:49:27.000000000 +0100
    344 +++ dracut-059.magellan/modules.d/98integrity/ima-keys-load.sh 2023-07-27 11:32:29.959433238 +0200
    345 @@ -2,7 +2,7 @@
    346
    347 SECURITYFSDIR="/sys/kernel/security"
    348 IMASECDIR="${SECURITYFSDIR}/ima"
    349 -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
    350 +IMACONFIG="${NEWROOT}/etc/conf.d/ima"
    351
    352 load_x509_keys() {
    353 KEYRING_ID=$1
    354 diff -Naur dracut-059/modules.d/98integrity/ima-policy-load.sh dracut-059.magellan/modules.d/98integrity/ima-policy-load.sh
    355 --- dracut-059/modules.d/98integrity/ima-policy-load.sh 2022-12-24 17:49:27.000000000 +0100
    356 +++ dracut-059.magellan/modules.d/98integrity/ima-policy-load.sh 2023-07-27 11:32:54.326516656 +0200
    357 @@ -7,8 +7,8 @@
    358 # Roberto Sassu <roberto.sassu@polito.it>
    359
    360 IMASECDIR="${SECURITYFSDIR}/ima"
    361 -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
    362 -IMAPOLICY="/etc/sysconfig/ima-policy"
    363 +IMACONFIG="${NEWROOT}/etc/conf.d/ima"
    364 +IMAPOLICY="/etc/conf.d/ima-policy"
    365
    366 load_ima_policy() {
    367 # check kernel support for IMA
    368 diff -Naur dracut-059/modules.d/98integrity/README dracut-059.magellan/modules.d/98integrity/README
    369 --- dracut-059/modules.d/98integrity/README 2022-12-24 17:49:27.000000000 +0100
    370 +++ dracut-059.magellan/modules.d/98integrity/README 2023-07-27 11:33:30.390466717 +0200
    371 @@ -20,7 +20,7 @@
    372 EVMKEY="/etc/keys/evm-trusted.blob"
    373 --------------------------------------------------------------------------
    374
    375 -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable;
    376 +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable;
    377
    378 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command
    379 line.
    380 @@ -33,10 +33,10 @@
    381
    382 # Save the policy in a file.
    383
    384 -# Create the configuration file '/etc/sysconfig/ima' to override the path name of
    385 +# Create the configuration file '/etc/conf.d/ima' to override the path name of
    386 # the IMA custom policy.
    387 -------------- '/etc/sysconfig/ima' (with the default value) -------------
    388 -IMAPOLICY="/etc/sysconfig/ima-policy"
    389 +------------- '/etc/conf.d/ima' (with the default value) -------------
    390 +IMAPOLICY="/etc/conf.d/ima-policy"
    391 -------------------------------------------------------------------------
    392
    393
    394 @@ -64,5 +64,5 @@
    395
    396 # 98integrity/ima-keys-load.sh script loads the signed certificates stored
    397 # in the $IMAKEYSDIR onto the trusted IMA keyring. The default $IMAKEYSDIR
    398 -# directory is /etc/keys/ima, but can be specified in the /etc/sysconfig/ima
    399 +# directory is /etc/keys/ima, but can be specified in the /etc/conf.d/ima
    400 # policy.
    401 diff -Naur dracut-059/modules.d/98usrmount/mount-usr.sh dracut-059.magellan/modules.d/98usrmount/mount-usr.sh
    402 --- dracut-059/modules.d/98usrmount/mount-usr.sh 2022-12-24 17:49:27.000000000 +0100
    403 +++ dracut-059.magellan/modules.d/98usrmount/mount-usr.sh 2023-07-27 11:35:50.839534439 +0200
    404 @@ -33,7 +33,7 @@
    405 _fsckoptions="-f $_fsckoptions"
    406 elif [ -f "$NEWROOT"/.autofsck ]; then
    407 # shellcheck disable=SC1090
    408 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck
    409 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck
    410 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    411 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    412 fi
    413 diff -Naur dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh
    414 --- dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh 2022-12-24 17:49:27.000000000 +0100
    415 +++ dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/client-init.sh 2023-07-27 11:38:58.126068175 +0200
    416 @@ -11,7 +11,7 @@
    417 (
    418 echo OK
    419 ip -o -4 address show scope global | while read -r _ if rest; do echo "$if"; done | sort
    420 - for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do
    421 + for i in /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-*; do
    422 echo "$i"
    423 grep -v 'UUID=' "$i"
    424 done
    425 diff -Naur dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh
    426 --- dracut-059/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh 2022-12-24 17:49:27.000000000 +0100
    427 +++ dracut-059.magellan/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh 2023-07-27 11:40:23.290856440 +0200
    428 @@ -135,9 +135,9 @@
    429
    430 test_client() {
    431 if [[ $NM ]]; then
    432 - EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF '
    433 + EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-* EOF '
    434 else
    435 - EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" DEVICE="net1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net3.0004 # Generated by dracut initrd NAME="net3.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="net3.0004" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net3.3 # Generated by dracut initrd NAME="net3.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="net3.3" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="net3" EOF '
    436 + EXPECT='net1 net3.0004 net3.3 vlan0001 vlan2 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" DEVICE="net1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net3.0004 # Generated by dracut initrd NAME="net3.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="net3.0004" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net3.3 # Generated by dracut initrd NAME="net3.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="net3.3" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-vlan0001 # Generated by dracut initrd NAME="vlan0001" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.54.101" PREFIX="24" GATEWAY="192.168.54.1" TYPE=Vlan DEVICE="vlan0001" VLAN=yes PHYSDEV="net3" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-vlan2 # Generated by dracut initrd NAME="vlan2" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.55.102" PREFIX="24" GATEWAY="192.168.55.1" TYPE=Vlan DEVICE="vlan2" VLAN=yes PHYSDEV="net3" EOF '
    437 fi
    438
    439 client_test "Multiple VLAN" \
    440 @@ -159,9 +159,9 @@
    441 || return 1
    442
    443 if [[ $NM ]]; then
    444 - EXPECT='bond0 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF '
    445 + EXPECT='bond0 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-* EOF '
    446 else
    447 - EXPECT='bond0 bond1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net2" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" HWADDR="52:54:00:12:34:04" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net5" EOF '
    448 + EXPECT='bond0 bond1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-bond0 # Generated by dracut initrd NAME="bond0" DEVICE="bond0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond0" TYPE=Bond /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-bond1 # Generated by dracut initrd NAME="bond1" DEVICE="bond1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp BONDING_OPTS="" NAME="bond1" TYPE=Bond /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net1" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="net2" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" HWADDR="52:54:00:12:34:04" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="net5" EOF '
    449 fi
    450
    451 client_test "Multiple Bonds" \
    452 @@ -178,9 +178,9 @@
    453 || return 1
    454
    455 if [[ $NM ]]; then
    456 - EXPECT='br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-* EOF '
    457 + EXPECT='br0 br1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-* EOF '
    458 else
    459 - EXPECT='br0 br1 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net1" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net2" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net5" EOF '
    460 + EXPECT='br0 br1 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-br0 # Generated by dracut initrd NAME="br0" DEVICE="br0" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br0" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-br1 # Generated by dracut initrd NAME="br1" DEVICE="br1" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Bridge NAME="br1" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net1 # Generated by dracut initrd NAME="net1" HWADDR="52:54:00:12:34:01" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net1" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net2 # Generated by dracut initrd NAME="net2" HWADDR="52:54:00:12:34:02" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="net2" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net4 # Generated by dracut initrd NAME="net4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-net5 # Generated by dracut initrd NAME="net5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="net5" EOF '
    461 fi
    462
    463 client_test "Multiple Bridges" \