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