Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2902 - (show annotations) (download)
    Tue Apr 4 12:38:10 2017 UTC (7 years ago) by niro
    File size: 25848 byte(s) 
    -re-diffed against 045
    1 diff -Naur dracut-045/dracut.conf.d/magellan.conf.example dracut-045-magellan/dracut.conf.d/magellan.conf.example
    2 --- dracut-045/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100
    3 +++ dracut-045-magellan/dracut.conf.d/magellan.conf.example 2017-04-04 14:28:02.458606631 +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/consolefont: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-045/Makefile dracut-045-magellan/Makefile
    24 --- dracut-045/Makefile 2017-04-03 10:26:25.000000000 +0200
    25 +++ dracut-045-magellan/Makefile 2017-04-04 14:28:02.459606618 +0200
    26 @@ -123,6 +123,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-045/modules.d/10i18n/console_init.sh dracut-045-magellan/modules.d/10i18n/console_init.sh
    37 --- dracut-045/modules.d/10i18n/console_init.sh 2017-04-03 10:26:25.000000000 +0200
    38 +++ dracut-045-magellan/modules.d/10i18n/console_init.sh 2017-04-04 14:28:02.459606618 +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-045/modules.d/40network/ifup.sh dracut-045-magellan/modules.d/40network/ifup.sh
    49 --- dracut-045/modules.d/40network/ifup.sh 2017-04-03 10:26:25.000000000 +0200
    50 +++ dracut-045-magellan/modules.d/40network/ifup.sh 2017-04-04 14:34:44.682345439 +0200
    51 @@ -314,12 +314,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-045/modules.d/40network/module-setup.sh dracut-045-magellan/modules.d/40network/module-setup.sh
    71 --- dracut-045/modules.d/40network/module-setup.sh 2017-04-03 10:26:25.000000000 +0200
    72 +++ dracut-045-magellan/modules.d/40network/module-setup.sh 2017-04-04 14:34:01.209896374 +0200
    73 @@ -53,7 +53,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 @@ -72,12 +72,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-045/modules.d/45ifcfg/module-setup.sh dracut-045-magellan/modules.d/45ifcfg/module-setup.sh
    98 --- dracut-045/modules.d/45ifcfg/module-setup.sh 2017-04-03 10:26:25.000000000 +0200
    99 +++ dracut-045-magellan/modules.d/45ifcfg/module-setup.sh 2017-04-04 14:28:02.459606618 +0200
    100 @@ -2,7 +2,7 @@
    101
    102 # called by dracut
    103 check() {
    104 - [[ -d /etc/sysconfig/network-scripts ]] && return 0
    105 + [[ -d /etc/conf.d/network-scripts ]] && return 0
    106 return 255
    107 }
    108
    109 diff -Naur dracut-045/modules.d/45ifcfg/write-ifcfg.sh dracut-045-magellan/modules.d/45ifcfg/write-ifcfg.sh
    110 --- dracut-045/modules.d/45ifcfg/write-ifcfg.sh 2017-04-03 10:26:25.000000000 +0200
    111 +++ dracut-045-magellan/modules.d/45ifcfg/write-ifcfg.sh 2017-04-04 14:28:02.459606618 +0200
    112 @@ -280,13 +280,13 @@
    113 done
    114
    115 # Pass network opts
    116 -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
    117 +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts
    118 mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient
    119 -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    120 +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    121 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    122 {
    123 cp /tmp/net.* /run/initramfs/
    124 cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf
    125 - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts
    126 + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts
    127 cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient
    128 } > /dev/null 2>&1
    129 diff -Naur dracut-045/modules.d/80cms/cms-write-ifcfg.sh dracut-045-magellan/modules.d/80cms/cms-write-ifcfg.sh
    130 --- dracut-045/modules.d/80cms/cms-write-ifcfg.sh 2017-04-03 10:26:25.000000000 +0200
    131 +++ dracut-045-magellan/modules.d/80cms/cms-write-ifcfg.sh 2017-04-04 14:28:02.459606618 +0200
    132 @@ -2,7 +2,7 @@
    133
    134 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
    135
    136 -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
    137 +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts
    138
    139 function cms_write_config()
    140 {
    141 @@ -23,19 +23,19 @@
    142
    143 uuid=$(cat /proc/sys/kernel/random/uuid)
    144
    145 - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE
    146 + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE
    147
    148 strglobin "$IPADDR" '*:*:*' && ipv6=1
    149
    150 # to please NetworkManager on startup in loader before loader reconfigures net
    151 - cat > /etc/sysconfig/network << EOF
    152 + cat > /etc/conf.d/network << EOF
    153 HOSTNAME=$HOSTNAME
    154 EOF
    155 echo "$HOSTNAME" > /etc/hostname
    156 if [ "$ipv6" ]; then
    157 - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network
    158 + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network
    159 else
    160 - echo "NETWORKING=yes" >> /etc/sysconfig/network
    161 + echo "NETWORKING=yes" >> /etc/conf.d/network
    162 fi
    163
    164 cat > $IFCFGFILE << EOF
    165 @@ -97,7 +97,7 @@
    166 unset optstr
    167 unset DNS1
    168 unset DNS2
    169 - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    170 + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    171 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    172 }
    173
    174 diff -Naur dracut-045/modules.d/95rootfs-block/mount-root.sh dracut-045-magellan/modules.d/95rootfs-block/mount-root.sh
    175 --- dracut-045/modules.d/95rootfs-block/mount-root.sh 2017-04-03 10:26:25.000000000 +0200
    176 +++ dracut-045-magellan/modules.d/95rootfs-block/mount-root.sh 2017-04-04 14:28:02.460606604 +0200
    177 @@ -33,8 +33,8 @@
    178
    179 READONLY=
    180 fsckoptions=
    181 - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then
    182 - . "$NEWROOT"/etc/sysconfig/readonly-root
    183 + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then
    184 + . "$NEWROOT"/etc/conf.d/readonly-root
    185 fi
    186
    187 if getargbool 0 "readonlyroot=" -y readonlyroot; then
    188 @@ -57,8 +57,8 @@
    189 if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
    190 fsckoptions="-f $fsckoptions"
    191 elif [ -f "$NEWROOT"/.autofsck ]; then
    192 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \
    193 - . "$NEWROOT"/etc/sysconfig/autofsck
    194 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \
    195 + . "$NEWROOT"/etc/conf.d/autofsck
    196 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    197 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    198 fi
    199 diff -Naur dracut-045/modules.d/97masterkey/masterkey.sh dracut-045-magellan/modules.d/97masterkey/masterkey.sh
    200 --- dracut-045/modules.d/97masterkey/masterkey.sh 2017-04-03 10:26:25.000000000 +0200
    201 +++ dracut-045-magellan/modules.d/97masterkey/masterkey.sh 2017-04-04 14:28:02.460606604 +0200
    202 @@ -6,7 +6,7 @@
    203 # TORSEC group -- http://security.polito.it
    204 # Roberto Sassu <roberto.sassu@polito.it>
    205
    206 -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey"
    207 +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey"
    208 MULTIKERNELMODE="NO"
    209 PCRLOCKNUM=11
    210
    211 diff -Naur dracut-045/modules.d/97masterkey/README dracut-045-magellan/modules.d/97masterkey/README
    212 --- dracut-045/modules.d/97masterkey/README 2017-04-03 10:26:25.000000000 +0200
    213 +++ dracut-045-magellan/modules.d/97masterkey/README 2017-04-04 14:28:02.460606604 +0200
    214 @@ -39,7 +39,7 @@
    215 MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob"
    216 --------------------------------------------------------------------------
    217
    218 -2) create the configuration file '/etc/sysconfig/masterkey' to override the
    219 +2) create the configuration file '/etc/conf.d/masterkey' to override the
    220 value of one or all variables;
    221
    222 3) specify these parameters in the kernel command line:
    223 diff -Naur dracut-045/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-045-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh
    224 --- dracut-045/modules.d/98ecryptfs/ecryptfs-mount.sh 2017-04-03 10:26:25.000000000 +0200
    225 +++ dracut-045-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2017-04-04 14:28:02.460606604 +0200
    226 @@ -6,7 +6,7 @@
    227 # TORSEC group -- http://security.polito.it
    228 # Roberto Sassu <roberto.sassu@polito.it>
    229
    230 -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs"
    231 +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs"
    232 ECRYPTFSKEYTYPE="encrypted"
    233 ECRYPTFSKEYDESC="1000100010001000"
    234 ECRYPTFSKEYID=""
    235 diff -Naur dracut-045/modules.d/98ecryptfs/README dracut-045-magellan/modules.d/98ecryptfs/README
    236 --- dracut-045/modules.d/98ecryptfs/README 2017-04-03 10:26:25.000000000 +0200
    237 +++ dracut-045-magellan/modules.d/98ecryptfs/README 2017-04-04 14:28:02.460606604 +0200
    238 @@ -23,13 +23,13 @@
    239 ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob"
    240 --------------------------------------------------------------------------
    241
    242 -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY
    243 +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY
    244 variable;
    245
    246 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command
    247 line.
    248
    249 -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify
    250 +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify
    251 # more options for mounting the eCryptfs filesystem:
    252
    253 ECRYPTFSSRCDIR: existent directory in the lower root filesystem;
    254 @@ -39,7 +39,7 @@
    255 option is automatically added by the dracut script).
    256
    257 # Example of the configuration file:
    258 ------------ '/etc/sysconfig/ecryptfs' (with default values) -----------
    259 +----------- '/etc/conf.d/ecryptfs' (with default values) -----------
    260 ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob"
    261 ECRYPTFSSRCDIR="/secret"
    262 ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}"
    263 diff -Naur dracut-045/modules.d/98integrity/evm-enable.sh dracut-045-magellan/modules.d/98integrity/evm-enable.sh
    264 --- dracut-045/modules.d/98integrity/evm-enable.sh 2017-04-03 10:26:25.000000000 +0200
    265 +++ dracut-045-magellan/modules.d/98integrity/evm-enable.sh 2017-04-04 14:28:02.460606604 +0200
    266 @@ -7,7 +7,7 @@
    267 # Roberto Sassu <roberto.sassu@polito.it>
    268
    269 EVMSECFILE="${SECURITYFSDIR}/evm"
    270 -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm"
    271 +EVMCONFIG="${NEWROOT}/etc/conf.d/evm"
    272 EVMKEYDESC="evm-key"
    273 EVMKEYTYPE="encrypted"
    274 EVMKEYID=""
    275 diff -Naur dracut-045/modules.d/98integrity/ima-keys-load.sh dracut-045-magellan/modules.d/98integrity/ima-keys-load.sh
    276 --- dracut-045/modules.d/98integrity/ima-keys-load.sh 2017-04-03 10:26:25.000000000 +0200
    277 +++ dracut-045-magellan/modules.d/98integrity/ima-keys-load.sh 2017-04-04 14:28:02.460606604 +0200
    278 @@ -2,7 +2,7 @@
    279
    280 SECURITYFSDIR="/sys/kernel/security"
    281 IMASECDIR="${SECURITYFSDIR}/ima"
    282 -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
    283 +IMACONFIG="${NEWROOT}/etc/conf.d/ima"
    284
    285 load_x509_keys()
    286 {
    287 diff -Naur dracut-045/modules.d/98integrity/ima-policy-load.sh dracut-045-magellan/modules.d/98integrity/ima-policy-load.sh
    288 --- dracut-045/modules.d/98integrity/ima-policy-load.sh 2017-04-03 10:26:25.000000000 +0200
    289 +++ dracut-045-magellan/modules.d/98integrity/ima-policy-load.sh 2017-04-04 14:28:02.461606590 +0200
    290 @@ -7,8 +7,8 @@
    291 # Roberto Sassu <roberto.sassu@polito.it>
    292
    293 IMASECDIR="${SECURITYFSDIR}/ima"
    294 -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
    295 -IMAPOLICY="/etc/sysconfig/ima-policy"
    296 +IMACONFIG="${NEWROOT}/etc/conf.d/ima"
    297 +IMAPOLICY="/etc/conf.d/ima-policy"
    298
    299 load_ima_policy()
    300 {
    301 diff -Naur dracut-045/modules.d/98integrity/README dracut-045-magellan/modules.d/98integrity/README
    302 --- dracut-045/modules.d/98integrity/README 2017-04-03 10:26:25.000000000 +0200
    303 +++ dracut-045-magellan/modules.d/98integrity/README 2017-04-04 14:28:02.461606590 +0200
    304 @@ -20,7 +20,7 @@
    305 EVMKEY="/etc/keys/evm-trusted.blob"
    306 --------------------------------------------------------------------------
    307
    308 -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable;
    309 +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable;
    310
    311 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command
    312 line.
    313 @@ -33,10 +33,10 @@
    314
    315 # Save the policy in a file.
    316
    317 -# Create the configuration file '/etc/sysconfig/ima' to override the path name of
    318 +# Create the configuration file '/etc/conf.d/ima' to override the path name of
    319 # the IMA custom policy.
    320 -------------- '/etc/sysconfig/ima' (with the default value) -------------
    321 -IMAPOLICY="/etc/sysconfig/ima-policy"
    322 +------------- '/etc/conf.d/ima' (with the default value) -------------
    323 +IMAPOLICY="/etc/conf.d/ima-policy"
    324 -------------------------------------------------------------------------
    325
    326
    327 @@ -64,5 +64,5 @@
    328
    329 # 98integrity/ima-keys-load.sh script loads the signed certificates stored
    330 # in the $IMAKEYSDIR onto the trusted IMA keyring. The default $IMAKEYSDIR
    331 -# directory is /etc/keys/ima, but can be specified in the /etc/sysconfig/ima
    332 +# directory is /etc/keys/ima, but can be specified in the /etc/conf.d/ima
    333 # policy.
    334 diff -Naur dracut-045/modules.d/98usrmount/mount-usr.sh dracut-045-magellan/modules.d/98usrmount/mount-usr.sh
    335 --- dracut-045/modules.d/98usrmount/mount-usr.sh 2017-04-03 10:26:25.000000000 +0200
    336 +++ dracut-045-magellan/modules.d/98usrmount/mount-usr.sh 2017-04-04 14:28:02.461606590 +0200
    337 @@ -32,7 +32,7 @@
    338 if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
    339 _fsckoptions="-f $_fsckoptions"
    340 elif [ -f "$NEWROOT"/.autofsck ]; then
    341 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck
    342 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck
    343 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    344 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    345 fi
    346 diff -Naur dracut-045/test/TEST-04-FULL-SYSTEMD/test.sh dracut-045-magellan/test/TEST-04-FULL-SYSTEMD/test.sh
    347 --- dracut-045/test/TEST-04-FULL-SYSTEMD/test.sh 2017-04-03 10:26:25.000000000 +0200
    348 +++ dracut-045-magellan/test/TEST-04-FULL-SYSTEMD/test.sh 2017-04-04 14:28:02.461606590 +0200
    349 @@ -87,7 +87,7 @@
    350 inst /lib/systemd/system/systemd-remount-fs.service
    351 inst /lib/systemd/systemd-remount-fs
    352 inst /lib/systemd/system/systemd-journal-flush.service
    353 - inst /etc/sysconfig/init
    354 + inst /etc/conf.d/init
    355 inst /lib/systemd/system/slices.target
    356 inst /lib/systemd/system/system.slice
    357 inst_multiple -o /lib/systemd/system/dracut*
    358 @@ -99,7 +99,7 @@
    359 inst_multiple -o \
    360 /etc/machine-id \
    361 /etc/adjtime \
    362 - /etc/sysconfig/init \
    363 + /etc/conf.d/init \
    364 /etc/passwd \
    365 /etc/shadow \
    366 /etc/group \
    367 diff -Naur dracut-045/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh dracut-045-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh
    368 --- dracut-045/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2017-04-03 10:26:25.000000000 +0200
    369 +++ dracut-045-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/client-init.sh 2017-04-04 14:33:16.654464647 +0200
    370 @@ -11,7 +11,7 @@
    371 (
    372 echo OK
    373 ip -o -4 address show scope global | while read n if rest; do echo $if;done
    374 - for i in /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-*; do
    375 + for i in /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-*; do
    376 echo $i
    377 grep -v 'UUID=' $i
    378 done
    379 diff -Naur dracut-045/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh dracut-045-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
    380 --- dracut-045/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2017-04-03 10:26:25.000000000 +0200
    381 +++ dracut-045-magellan/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh 2017-04-04 14:32:48.147830204 +0200
    382 @@ -125,7 +125,7 @@
    383 rd.neednet=1
    384 root=nfs:192.168.50.1:/nfs/client bootdev=ens3
    385 " \
    386 - 'ens3 ens4.0004 ens4.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-ens4.0004 # Generated by dracut initrd NAME="ens4.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens4.0004" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-ens4.3 # Generated by dracut initrd NAME="ens4.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens4.3" VLAN=yes PHYSDEV="ens4" /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="ens4" /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="ens4" EOF ' \
    387 + 'ens3 ens4.0004 ens4.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-ens4.0004 # Generated by dracut initrd NAME="ens4.0004" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.57.104" PREFIX="24" GATEWAY="192.168.57.1" TYPE=Vlan DEVICE="ens4.0004" VLAN=yes PHYSDEV="ens4" /run/initramfs/state/etc/conf.d/network-scripts/ifcfg-ens4.3 # Generated by dracut initrd NAME="ens4.3" ONBOOT=yes NETBOOT=yes BOOTPROTO=none IPADDR="192.168.56.103" PREFIX="24" GATEWAY="192.168.56.1" TYPE=Vlan DEVICE="ens4.3" VLAN=yes PHYSDEV="ens4" /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="ens4" /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="ens4" EOF ' \
    388 || return 1
    389
    390 client_test "Multiple Bonds" \
    391 @@ -138,7 +138,7 @@
    392 rd.neednet=1
    393 root=nfs:192.168.50.1:/nfs/client bootdev=bond0
    394 " \
    395 - '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 ' \
    396 + '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 ' \
    397 || return 1
    398
    399 client_test "Multiple Bridges" \
    400 @@ -151,7 +151,7 @@
    401 rd.neednet=1
    402 root=nfs:192.168.50.1:/nfs/client bootdev=br0
    403 " \
    404 - '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 ' \
    405 + '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 ' \
    406 || return 1
    407
    408 kill_server