Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3367 - (show annotations) (download)
    Mon Jul 8 14:01:12 2019 UTC (4 years, 9 months ago) by niro
    File size: 27547 byte(s) 
    -reworked patches for dracut-049
    1 diff -Naur dracut-049/dracut.conf.d/magellan.conf.example dracut-049-magellan/dracut.conf.d/magellan.conf.example
    2 --- dracut-049/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100
    3 +++ dracut-049-magellan/dracut.conf.d/magellan.conf.example 2019-07-08 14:59:29.773372227 +0200
    4 @@ -0,0 +1,18 @@
    5 +# dracut config file customized for Magellan-Linux
    6 +
    7 +# i18n
    8 +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefonts:CONSOLEFONT"
    9 +i18n_default_font="latarcyrheb-sun16"
    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-049/Makefile dracut-049-magellan/Makefile
    24 --- dracut-049/Makefile 2018-10-08 15:38:33.000000000 +0200
    25 +++ dracut-049-magellan/Makefile 2019-07-08 15:00:38.576424992 +0200
    26 @@ -126,6 +126,9 @@
    27 install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
    28 mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
    29 mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
    30 + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf
    31 + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
    32 + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut
    33 install -m 0755 dracut-init.sh $(DESTDIR)$(pkglibdir)/dracut-init.sh
    34 install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
    35 install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
    36 diff -Naur dracut-049/modules.d/10i18n/console_init.sh dracut-049-magellan/modules.d/10i18n/console_init.sh
    37 --- dracut-049/modules.d/10i18n/console_init.sh 2018-10-08 15:38:33.000000000 +0200
    38 +++ dracut-049-magellan/modules.d/10i18n/console_init.sh 2019-07-08 15:01:13.162948270 +0200
    39 @@ -9,7 +9,7 @@
    40 [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
    41
    42 DEFAULT_FONT=LatArCyrHeb-16
    43 -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap
    44 +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap
    45
    46 set_keyboard() {
    47 local param
    48 diff -Naur dracut-049/modules.d/35network-legacy/ifup.sh dracut-049-magellan/modules.d/35network-legacy/ifup.sh
    49 --- dracut-049/modules.d/35network-legacy/ifup.sh 2018-10-08 15:38:33.000000000 +0200
    50 +++ dracut-049-magellan/modules.d/35network-legacy/ifup.sh 2019-07-08 15:02:22.722988441 +0200
    51 @@ -327,12 +327,12 @@
    52 unset TEAM_PORT_CONFIG
    53 _hwaddr=$(cat /sys/class/net/$slave/address)
    54 _subchannels=$(iface_get_subchannels "$slave")
    55 - if [ -n "$_hwaddr" ] && [ -e "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf" ]; then
    56 - . "/etc/sysconfig/network-scripts/mac-${_hwaddr}.conf"
    57 - elif [ -n "$_subchannels" ] && [ -e "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf" ]; then
    58 - . "/etc/sysconfig/network-scripts/ccw-${_subchannels}.conf"
    59 - elif [ -e "/etc/sysconfig/network-scripts/ifcfg-${slave}" ]; then
    60 - . "/etc/sysconfig/network-scripts/ifcfg-${slave}"
    61 + if [ -n "$_hwaddr" ] && [ -e "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf" ]; then
    62 + . "/etc/conf.d/network-scripts/mac-${_hwaddr}.conf"
    63 + elif [ -n "$_subchannels" ] && [ -e "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf" ]; then
    64 + . "/etc/conf.d/network-scripts/ccw-${_subchannels}.conf"
    65 + elif [ -e "/etc/conf.d/network-scripts/ifcfg-${slave}" ]; then
    66 + . "/etc/conf.d/network-scripts/ifcfg-${slave}"
    67 fi
    68
    69 if [ -n "${TEAM_PORT_CONFIG}" ]; then
    70 diff -Naur dracut-049/modules.d/35network-legacy/module-setup.sh dracut-049-magellan/modules.d/35network-legacy/module-setup.sh
    71 --- dracut-049/modules.d/35network-legacy/module-setup.sh 2018-10-08 15:38:33.000000000 +0200
    72 +++ dracut-049-magellan/modules.d/35network-legacy/module-setup.sh 2019-07-08 15:02:54.997542679 +0200
    73 @@ -52,7 +52,7 @@
    74 unset TEAM_PORT_CONFIG
    75 unset HWADDR
    76 unset SUBCHANNELS
    77 - for i in /etc/sysconfig/network-scripts/ifcfg-*; do
    78 + for i in /etc/conf.d/network-scripts/ifcfg-*; do
    79 [ -e "$i" ] || continue
    80 case "$i" in
    81 *~ | *.bak | *.orig | *.rpmnew | *.rpmorig | *.rpmsave)
    82 @@ -71,12 +71,12 @@
    83
    84 HWADDR="$(echo $HWADDR | sed 'y/ABCDEF/abcdef/')"
    85 if [ -n "$HWADDR" ]; then
    86 - ln_r "$i" "/etc/sysconfig/network-scripts/mac-${HWADDR}.conf"
    87 + ln_r "$i" "/etc/conf.d/network-scripts/mac-${HWADDR}.conf"
    88 fi
    89
    90 SUBCHANNELS="$(echo $SUBCHANNELS | sed 'y/ABCDEF/abcdef/')"
    91 if [ -n "$SUBCHANNELS" ]; then
    92 - ln_r "$i" "/etc/sysconfig/network-scripts/ccw-${SUBCHANNELS}.conf"
    93 + ln_r "$i" "/etc/conf.d/network-scripts/ccw-${SUBCHANNELS}.conf"
    94 fi
    95 fi
    96 fi
    97 diff -Naur dracut-049/modules.d/35network-manager/module-setup.sh dracut-049-magellan/modules.d/35network-manager/module-setup.sh
    98 --- dracut-049/modules.d/35network-manager/module-setup.sh 2018-10-08 15:38:33.000000000 +0200
    99 +++ dracut-049-magellan/modules.d/35network-manager/module-setup.sh 2019-07-08 15:04:35.775149232 +0200
    100 @@ -46,7 +46,7 @@
    101
    102 # We don't install the ifcfg files from the host automatically.
    103 # But if the user chooses to include them, we pull in the machinery to read them.
    104 - if ! [[ -d "$initdir/etc/sysconfig/network-scripts" ]]; then
    105 + if ! [[ -d "$initdir/etc/conf.d/network-scripts" ]]; then
    106 inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so"
    107 fi
    108 }
    109 diff -Naur dracut-049/modules.d/45ifcfg/module-setup.sh dracut-049-magellan/modules.d/45ifcfg/module-setup.sh
    110 --- dracut-049/modules.d/45ifcfg/module-setup.sh 2018-10-08 15:38:33.000000000 +0200
    111 +++ dracut-049-magellan/modules.d/45ifcfg/module-setup.sh 2019-07-08 15:03:28.159084394 +0200
    112 @@ -2,7 +2,7 @@
    113
    114 # called by dracut
    115 check() {
    116 - [[ -d /etc/sysconfig/network-scripts ]] && return 0
    117 + [[ -d /etc/conf.d/network-scripts ]] && return 0
    118 return 255
    119 }
    120
    121 diff -Naur dracut-049/modules.d/45ifcfg/write-ifcfg.sh dracut-049-magellan/modules.d/45ifcfg/write-ifcfg.sh
    122 --- dracut-049/modules.d/45ifcfg/write-ifcfg.sh 2018-10-08 15:38:33.000000000 +0200
    123 +++ dracut-049-magellan/modules.d/45ifcfg/write-ifcfg.sh 2019-07-08 15:03:58.345667018 +0200
    124 @@ -280,9 +280,9 @@
    125 done
    126
    127 # Pass network opts
    128 -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
    129 +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts
    130 mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient
    131 -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    132 +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    133 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    134 {
    135 cp /tmp/net.* /run/initramfs/
    136 @@ -290,6 +290,6 @@
    137 [ -f "$i" ] && cat "$i"
    138 done | sort -u > /run/initramfs/state/etc/resolv.conf
    139 [ -s /run/initramfs/state/etc/resolv.conf ] || rm -f /run/initramfs/state/etc/resolv.conf
    140 - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts
    141 + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts
    142 cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient
    143 } > /dev/null 2>&1
    144 diff -Naur dracut-049/modules.d/80cms/cms-write-ifcfg.sh dracut-049-magellan/modules.d/80cms/cms-write-ifcfg.sh
    145 --- dracut-049/modules.d/80cms/cms-write-ifcfg.sh 2018-10-08 15:38:33.000000000 +0200
    146 +++ dracut-049-magellan/modules.d/80cms/cms-write-ifcfg.sh 2019-07-08 15:05:18.088563552 +0200
    147 @@ -2,7 +2,7 @@
    148
    149 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
    150
    151 -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
    152 +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts
    153
    154 function cms_write_config()
    155 {
    156 @@ -23,19 +23,19 @@
    157
    158 uuid=$(cat /proc/sys/kernel/random/uuid)
    159
    160 - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE
    161 + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE
    162
    163 strglobin "$IPADDR" '*:*:*' && ipv6=1
    164
    165 # to please NetworkManager on startup in loader before loader reconfigures net
    166 - cat > /etc/sysconfig/network << EOF
    167 + cat > /etc/conf.d/network << EOF
    168 HOSTNAME=$HOSTNAME
    169 EOF
    170 echo "$HOSTNAME" > /etc/hostname
    171 if [ "$ipv6" ]; then
    172 - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network
    173 + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network
    174 else
    175 - echo "NETWORKING=yes" >> /etc/sysconfig/network
    176 + echo "NETWORKING=yes" >> /etc/conf.d/network
    177 fi
    178
    179 cat > $IFCFGFILE << EOF
    180 @@ -97,7 +97,7 @@
    181 unset optstr
    182 unset DNS1
    183 unset DNS2
    184 - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    185 + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    186 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    187 }
    188
    189 diff -Naur dracut-049/modules.d/95iscsi/module-setup.sh dracut-049-magellan/modules.d/95iscsi/module-setup.sh
    190 --- dracut-049/modules.d/95iscsi/module-setup.sh 2018-10-08 15:38:33.000000000 +0200
    191 +++ dracut-049-magellan/modules.d/95iscsi/module-setup.sh 2019-07-08 15:05:54.345061449 +0200
    192 @@ -119,7 +119,7 @@
    193 ifname=$(ip -o route get to $iscsi_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
    194
    195 #follow ifcfg settings for boot protocol
    196 - bootproto=$(sed -n "/BOOTPROTO/s/BOOTPROTO='\([[:alpha:]]*6\?\)4\?'/\1/p" /etc/sysconfig/network/ifcfg-$ifname)
    197 + bootproto=$(sed -n "/BOOTPROTO/s/BOOTPROTO='\([[:alpha:]]*6\?\)4\?'/\1/p" /etc/conf.d/network/ifcfg-$ifname)
    198 if [ $bootproto ]; then
    199 printf 'ip=%s:%s ' ${ifname} ${bootproto}
    200 else
    201 diff -Naur dracut-049/modules.d/95rootfs-block/mount-root.sh dracut-049-magellan/modules.d/95rootfs-block/mount-root.sh
    202 --- dracut-049/modules.d/95rootfs-block/mount-root.sh 2018-10-08 15:38:33.000000000 +0200
    203 +++ dracut-049-magellan/modules.d/95rootfs-block/mount-root.sh 2019-07-08 15:06:19.067718939 +0200
    204 @@ -33,8 +33,8 @@
    205
    206 READONLY=
    207 fsckoptions=
    208 - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then
    209 - . "$NEWROOT"/etc/sysconfig/readonly-root
    210 + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then
    211 + . "$NEWROOT"/etc/conf.d/readonly-root
    212 fi
    213
    214 if getargbool 0 "readonlyroot=" -y readonlyroot; then
    215 @@ -57,8 +57,8 @@
    216 if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
    217 fsckoptions="-f $fsckoptions"
    218 elif [ -f "$NEWROOT"/.autofsck ]; then
    219 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \
    220 - . "$NEWROOT"/etc/sysconfig/autofsck
    221 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \
    222 + . "$NEWROOT"/etc/conf.d/autofsck
    223 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    224 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    225 fi
    226 diff -Naur dracut-049/modules.d/97masterkey/masterkey.sh dracut-049-magellan/modules.d/97masterkey/masterkey.sh
    227 --- dracut-049/modules.d/97masterkey/masterkey.sh 2018-10-08 15:38:33.000000000 +0200
    228 +++ dracut-049-magellan/modules.d/97masterkey/masterkey.sh 2019-07-08 15:07:06.881056289 +0200
    229 @@ -6,7 +6,7 @@
    230 # TORSEC group -- http://security.polito.it
    231 # Roberto Sassu <roberto.sassu@polito.it>
    232
    233 -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey"
    234 +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey"
    235 MULTIKERNELMODE="NO"
    236 PCRLOCKNUM=11
    237
    238 diff -Naur dracut-049/modules.d/97masterkey/README dracut-049-magellan/modules.d/97masterkey/README
    239 --- dracut-049/modules.d/97masterkey/README 2018-10-08 15:38:33.000000000 +0200
    240 +++ dracut-049-magellan/modules.d/97masterkey/README 2019-07-08 15:06:47.965318481 +0200
    241 @@ -39,7 +39,7 @@
    242 MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob"
    243 --------------------------------------------------------------------------
    244
    245 -2) create the configuration file '/etc/sysconfig/masterkey' to override the
    246 +2) create the configuration file '/etc/conf.d/masterkey' to override the
    247 value of one or all variables;
    248
    249 3) specify these parameters in the kernel command line:
    250 diff -Naur dracut-049/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-049-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh
    251 --- dracut-049/modules.d/98ecryptfs/ecryptfs-mount.sh 2018-10-08 15:38:33.000000000 +0200
    252 +++ dracut-049-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2019-07-08 15:07:48.017485875 +0200
    253 @@ -6,7 +6,7 @@
    254 # TORSEC group -- http://security.polito.it
    255 # Roberto Sassu <roberto.sassu@polito.it>
    256
    257 -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs"
    258 +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs"
    259 ECRYPTFSKEYTYPE="encrypted"
    260 ECRYPTFSKEYDESC="1000100010001000"
    261 ECRYPTFSKEYID=""
    262 diff -Naur dracut-049/modules.d/98ecryptfs/README dracut-049-magellan/modules.d/98ecryptfs/README
    263 --- dracut-049/modules.d/98ecryptfs/README 2018-10-08 15:38:33.000000000 +0200
    264 +++ dracut-049-magellan/modules.d/98ecryptfs/README 2019-07-08 15:07:33.903681615 +0200
    265 @@ -23,13 +23,13 @@
    266 ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob"
    267 --------------------------------------------------------------------------
    268
    269 -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY
    270 +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY
    271 variable;
    272
    273 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command
    274 line.
    275
    276 -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify
    277 +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify
    278 # more options for mounting the eCryptfs filesystem:
    279
    280 ECRYPTFSSRCDIR: existent directory in the lower root filesystem;
    281 @@ -39,7 +39,7 @@
    282 option is automatically added by the dracut script).
    283
    284 # Example of the configuration file:
    285 ------------ '/etc/sysconfig/ecryptfs' (with default values) -----------
    286 +----------- '/etc/conf.d/ecryptfs' (with default values) -----------
    287 ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob"
    288 ECRYPTFSSRCDIR="/secret"
    289 ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}"
    290 diff -Naur dracut-049/modules.d/98integrity/evm-enable.sh dracut-049-magellan/modules.d/98integrity/evm-enable.sh
    291 --- dracut-049/modules.d/98integrity/evm-enable.sh 2018-10-08 15:38:33.000000000 +0200
    292 +++ dracut-049-magellan/modules.d/98integrity/evm-enable.sh 2019-07-08 15:09:21.411065286 +0200
    293 @@ -7,7 +7,7 @@
    294 # Roberto Sassu <roberto.sassu@polito.it>
    295
    296 EVMSECFILE="${SECURITYFSDIR}/evm"
    297 -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm"
    298 +EVMCONFIG="${NEWROOT}/etc/conf.d/evm"
    299 EVMKEYDESC="evm-key"
    300 EVMKEYTYPE="encrypted"
    301 EVMKEYID=""
    302 diff -Naur dracut-049/modules.d/98integrity/ima-keys-load.sh dracut-049-magellan/modules.d/98integrity/ima-keys-load.sh
    303 --- dracut-049/modules.d/98integrity/ima-keys-load.sh 2018-10-08 15:38:33.000000000 +0200
    304 +++ dracut-049-magellan/modules.d/98integrity/ima-keys-load.sh 2019-07-08 15:09:34.153864137 +0200
    305 @@ -2,7 +2,7 @@
    306
    307 SECURITYFSDIR="/sys/kernel/security"
    308 IMASECDIR="${SECURITYFSDIR}/ima"
    309 -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
    310 +IMACONFIG="${NEWROOT}/etc/conf.d/ima"
    311
    312 load_x509_keys()
    313 {
    314 diff -Naur dracut-049/modules.d/98integrity/ima-policy-load.sh dracut-049-magellan/modules.d/98integrity/ima-policy-load.sh
    315 --- dracut-049/modules.d/98integrity/ima-policy-load.sh 2018-10-08 15:38:33.000000000 +0200
    316 +++ dracut-049-magellan/modules.d/98integrity/ima-policy-load.sh 2019-07-08 15:09:08.830264385 +0200
    317 @@ -7,8 +7,8 @@
    318 # Roberto Sassu <roberto.sassu@polito.it>
    319
    320 IMASECDIR="${SECURITYFSDIR}/ima"
    321 -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
    322 -IMAPOLICY="/etc/sysconfig/ima-policy"
    323 +IMACONFIG="${NEWROOT}/etc/conf.d/ima"
    324 +IMAPOLICY="/etc/conf.d/ima-policy"
    325
    326 load_ima_policy()
    327 {
    328 diff -Naur dracut-049/modules.d/98integrity/README dracut-049-magellan/modules.d/98integrity/README
    329 --- dracut-049/modules.d/98integrity/README 2018-10-08 15:38:33.000000000 +0200
    330 +++ dracut-049-magellan/modules.d/98integrity/README 2019-07-08 15:08:21.529017700 +0200
    331 @@ -20,7 +20,7 @@
    332 EVMKEY="/etc/keys/evm-trusted.blob"
    333 --------------------------------------------------------------------------
    334
    335 -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable;
    336 +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable;
    337
    338 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command
    339 line.
    340 @@ -33,10 +33,10 @@
    341
    342 # Save the policy in a file.
    343
    344 -# Create the configuration file '/etc/sysconfig/ima' to override the path name of
    345 +# Create the configuration file '/etc/conf.d/ima' to override the path name of
    346 # the IMA custom policy.
    347 -------------- '/etc/sysconfig/ima' (with the default value) -------------
    348 -IMAPOLICY="/etc/sysconfig/ima-policy"
    349 +------------- '/etc/conf.d/ima' (with the default value) -------------
    350 +IMAPOLICY="/etc/conf.d/ima-policy"
    351 -------------------------------------------------------------------------
    352
    353
    354 @@ -64,5 +64,5 @@
    355
    356 # 98integrity/ima-keys-load.sh script loads the signed certificates stored
    357 # in the $IMAKEYSDIR onto the trusted IMA keyring. The default $IMAKEYSDIR
    358 -# directory is /etc/keys/ima, but can be specified in the /etc/sysconfig/ima
    359 +# directory is /etc/keys/ima, but can be specified in the /etc/conf.d/ima
    360 # policy.
    361 diff -Naur dracut-049/modules.d/98usrmount/mount-usr.sh dracut-049-magellan/modules.d/98usrmount/mount-usr.sh
    362 --- dracut-049/modules.d/98usrmount/mount-usr.sh 2018-10-08 15:38:33.000000000 +0200
    363 +++ dracut-049-magellan/modules.d/98usrmount/mount-usr.sh 2019-07-08 15:09:55.093534710 +0200
    364 @@ -32,7 +32,7 @@
    365 if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
    366 _fsckoptions="-f $_fsckoptions"
    367 elif [ -f "$NEWROOT"/.autofsck ]; then
    368 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck
    369 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck
    370 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    371 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    372 fi
    373 diff -Naur dracut-049/test/TEST-04-FULL-SYSTEMD/test.sh dracut-049-magellan/test/TEST-04-FULL-SYSTEMD/test.sh
    374 --- dracut-049/test/TEST-04-FULL-SYSTEMD/test.sh 2018-10-08 15:38:33.000000000 +0200
    375 +++ dracut-049-magellan/test/TEST-04-FULL-SYSTEMD/test.sh 2019-07-08 15:10:48.450701082 +0200
    376 @@ -87,7 +87,7 @@
    377 inst /lib/systemd/system/systemd-remount-fs.service
    378 inst /lib/systemd/systemd-remount-fs
    379 inst /lib/systemd/system/systemd-journal-flush.service
    380 - inst /etc/sysconfig/init
    381 + inst /etc/conf.d/init
    382 inst /lib/systemd/system/slices.target
    383 inst /lib/systemd/system/system.slice
    384 inst_multiple -o /lib/systemd/system/dracut*
    385 @@ -99,7 +99,7 @@
    386 inst_multiple -o \
    387 /etc/machine-id \
    388 /etc/adjtime \
    389 - /etc/sysconfig/init \
    390 + /etc/conf.d/init \
    391 /etc/passwd \
    392 /etc/shadow \
    393 /etc/group \
    394 diff -Naur dracut-049/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh
    395 --- dracut-049/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2018-10-08 15:38:33.000000000 +0200
    396 +++ dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2019-07-08 15:12:22.692247007 +0200
    397 @@ -11,7 +11,7 @@
    398 (
    399 echo OK
    400 ip -o -4 address show scope global | while read n if rest; do echo $if;done | sort
    401 - for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do
    402 + for i in /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-*; do
    403 echo $i
    404 grep -v 'UUID=' $i
    405 done
    406 diff -Naur dracut-049/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
    407 --- dracut-049/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2018-10-08 15:38:33.000000000 +0200
    408 +++ dracut-049-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2019-07-08 15:12:08.506464512 +0200
    409 @@ -150,7 +150,7 @@
    410 rd.neednet=1
    411 root=nfs:192.168.50.1:/nfs/client bootdev=ens3
    412 " \
    413 - 'ens3 ens5.0004 ens5.3 vlan0001 vlan2 /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.0004 # Generated by dracut initrd NAME="ens5.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens5.0004" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5.3 # Generated by dracut initrd NAME="ens5.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens5.3" VLAN=yes PHYSDEV="ens5" /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="ens5" /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="ens5" EOF ' \
    414 + 'ens3 ens5.0004 ens5.3 vlan0001 vlan2 /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens3 # Generated by dracut initrd NAME="ens3" DEVICE="ens3" ONBOOT=yes NETBOOT=yes IPV6INIT=yes BOOTPROTO=dhcp TYPE=Ethernet /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5.0004 # Generated by dracut initrd NAME="ens5.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens5.0004" VLAN=yes PHYSDEV="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5.3 # Generated by dracut initrd NAME="ens5.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens5.3" VLAN=yes PHYSDEV="ens5" /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="ens5" /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="ens5" EOF ' \
    415 || return 1
    416
    417 client_test "Multiple Bonds" \
    418 @@ -163,7 +163,7 @@
    419 rd.neednet=1
    420 root=nfs:192.168.50.1:/nfs/client bootdev=bond0
    421 " \
    422 - '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \
    423 + '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond0" DEVICE="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens6" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes SLAVE=yes MASTER="bond1" DEVICE="ens7" EOF ' \
    424 || return 1
    425
    426 client_test "Multiple Bridges" \
    427 @@ -176,7 +176,7 @@
    428 rd.neednet=1
    429 root=nfs:192.168.50.1:/nfs/client bootdev=br0
    430 " \
    431 - '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \
    432 + '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-ens4 # Generated by dracut initrd NAME="ens4" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens5 # Generated by dracut initrd NAME="ens5" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br0" DEVICE="ens5" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens6 # Generated by dracut initrd NAME="ens6" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens6" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens7 # Generated by dracut initrd NAME="ens7" TYPE=Ethernet ONBOOT=yes NETBOOT=yes BRIDGE="br1" DEVICE="ens7" EOF ' \
    433 || return 1
    434
    435 kill_server