Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2491 - (show annotations) (download)
    Sun Aug 10 14:19:05 2014 UTC (9 years, 8 months ago) by niro
    File size: 13577 byte(s) 
    -re-diffed for 038
    1 diff -Naur dracut-038/dracut.conf.d/magellan.conf.example dracut-038-magellan/dracut.conf.d/magellan.conf.example
    2 --- dracut-038/dracut.conf.d/magellan.conf.example 1970-01-01 00:00:00.000000000 +0000
    3 +++ dracut-038-magellan/dracut.conf.d/magellan.conf.example 2014-07-01 15:44:20.956000000 +0000
    4 @@ -0,0 +1,15 @@
    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_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 diff -Naur dracut-038/Makefile dracut-038-magellan/Makefile
    21 --- dracut-038/Makefile 2014-06-30 10:03:12.000000000 +0000
    22 +++ dracut-038-magellan/Makefile 2014-07-01 15:45:06.509000000 +0000
    23 @@ -109,6 +109,9 @@
    24 install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf
    25 mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d
    26 mkdir -p $(DESTDIR)$(pkglibdir)/dracut.conf.d
    27 + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf
    28 + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d
    29 + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut
    30 install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh
    31 install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh
    32 ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions
    33 diff -Naur dracut-038/modules.d/10i18n/console_init.sh dracut-038-magellan/modules.d/10i18n/console_init.sh
    34 --- dracut-038/modules.d/10i18n/console_init.sh 2014-06-30 10:03:12.000000000 +0000
    35 +++ dracut-038-magellan/modules.d/10i18n/console_init.sh 2014-07-01 15:45:44.326000000 +0000
    36 @@ -11,7 +11,7 @@
    37 [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf
    38
    39 DEFAULT_FONT=LatArCyrHeb-16
    40 -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap
    41 +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap
    42
    43 set_keyboard() {
    44 local param
    45 diff -Naur dracut-038/modules.d/45ifcfg/module-setup.sh dracut-038-magellan/modules.d/45ifcfg/module-setup.sh
    46 --- dracut-038/modules.d/45ifcfg/module-setup.sh 2014-06-30 10:03:12.000000000 +0000
    47 +++ dracut-038-magellan/modules.d/45ifcfg/module-setup.sh 2014-07-01 15:46:11.750000000 +0000
    48 @@ -4,7 +4,7 @@
    49
    50 # called by dracut
    51 check() {
    52 - [[ -d /etc/sysconfig/network-scripts ]] && return 0
    53 + [[ -d /etc/conf.d/network-scripts ]] && return 0
    54 return 255
    55 }
    56
    57 diff -Naur dracut-038/modules.d/45ifcfg/write-ifcfg.sh dracut-038-magellan/modules.d/45ifcfg/write-ifcfg.sh
    58 --- dracut-038/modules.d/45ifcfg/write-ifcfg.sh 2014-06-30 10:03:12.000000000 +0000
    59 +++ dracut-038-magellan/modules.d/45ifcfg/write-ifcfg.sh 2014-08-10 16:49:14.764000000 +0000
    60 @@ -271,13 +271,13 @@
    61 done
    62
    63 # Pass network opts
    64 -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
    65 +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts
    66 mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient
    67 -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    68 +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    69 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    70 {
    71 cp /tmp/net.* /run/initramfs/
    72 cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf
    73 - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts
    74 + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts
    75 cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient
    76 } > /dev/null 2>&1
    77 diff -Naur dracut-038/modules.d/80cms/cms-write-ifcfg.sh dracut-038-magellan/modules.d/80cms/cms-write-ifcfg.sh
    78 --- dracut-038/modules.d/80cms/cms-write-ifcfg.sh 2014-06-30 10:03:12.000000000 +0000
    79 +++ dracut-038-magellan/modules.d/80cms/cms-write-ifcfg.sh 2014-08-10 16:50:16.562000000 +0000
    80 @@ -4,7 +4,7 @@
    81
    82 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
    83
    84 -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts
    85 +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts
    86
    87 function cms_write_config()
    88 {
    89 @@ -24,19 +24,19 @@
    90
    91 uuid=$(cat /proc/sys/kernel/random/uuid)
    92
    93 - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE
    94 + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE
    95
    96 strglobin "$IPADDR" '*:*:*' && ipv6=1
    97
    98 # to please NetworkManager on startup in loader before loader reconfigures net
    99 - cat > /etc/sysconfig/network << EOF
    100 + cat > /etc/conf.d/network << EOF
    101 HOSTNAME=$HOSTNAME
    102 EOF
    103 echo "$HOSTNAME" > /etc/hostname
    104 if [ "$ipv6" ]; then
    105 - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network
    106 + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network
    107 else
    108 - echo "NETWORKING=yes" >> /etc/sysconfig/network
    109 + echo "NETWORKING=yes" >> /etc/conf.d/network
    110 fi
    111
    112 cat > $IFCFGFILE << EOF
    113 @@ -98,7 +98,7 @@
    114 unset optstr
    115 unset DNS1
    116 unset DNS2
    117 - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab
    118 + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab
    119 echo "files /var/lib/dhclient" >> /run/initramfs/rwtab
    120 }
    121
    122 diff -Naur dracut-038/modules.d/95rootfs-block/mount-root.sh dracut-038-magellan/modules.d/95rootfs-block/mount-root.sh
    123 --- dracut-038/modules.d/95rootfs-block/mount-root.sh 2014-06-30 10:03:12.000000000 +0000
    124 +++ dracut-038-magellan/modules.d/95rootfs-block/mount-root.sh 2014-08-10 16:51:45.765000000 +0000
    125 @@ -35,8 +35,8 @@
    126
    127 READONLY=
    128 fsckoptions=
    129 - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then
    130 - . "$NEWROOT"/etc/sysconfig/readonly-root
    131 + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then
    132 + . "$NEWROOT"/etc/conf.d/readonly-root
    133 fi
    134
    135 if getargbool 0 "readonlyroot=" -y readonlyroot; then
    136 @@ -59,8 +59,8 @@
    137 if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
    138 fsckoptions="-f $fsckoptions"
    139 elif [ -f "$NEWROOT"/.autofsck ]; then
    140 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \
    141 - . "$NEWROOT"/etc/sysconfig/autofsck
    142 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \
    143 + . "$NEWROOT"/etc/conf.d/autofsck
    144 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    145 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    146 fi
    147 diff -Naur dracut-038/modules.d/97masterkey/masterkey.sh dracut-038-magellan/modules.d/97masterkey/masterkey.sh
    148 --- dracut-038/modules.d/97masterkey/masterkey.sh 2014-06-30 10:03:12.000000000 +0000
    149 +++ dracut-038-magellan/modules.d/97masterkey/masterkey.sh 2014-08-10 16:52:13.725000000 +0000
    150 @@ -8,7 +8,7 @@
    151 # TORSEC group -- http://security.polito.it
    152 # Roberto Sassu <roberto.sassu@polito.it>
    153
    154 -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey"
    155 +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey"
    156 MULTIKERNELMODE="NO"
    157 PCRLOCKNUM=11
    158
    159 diff -Naur dracut-038/modules.d/97masterkey/README dracut-038-magellan/modules.d/97masterkey/README
    160 --- dracut-038/modules.d/97masterkey/README 2014-06-30 10:03:12.000000000 +0000
    161 +++ dracut-038-magellan/modules.d/97masterkey/README 2014-08-10 16:52:01.643000000 +0000
    162 @@ -39,7 +39,7 @@
    163 MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob"
    164 --------------------------------------------------------------------------
    165
    166 -2) create the configuration file '/etc/sysconfig/masterkey' to override the
    167 +2) create the configuration file '/etc/conf.d/masterkey' to override the
    168 value of one or all variables;
    169
    170 3) specify these parameters in the kernel command line:
    171 diff -Naur dracut-038/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-038-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh
    172 --- dracut-038/modules.d/98ecryptfs/ecryptfs-mount.sh 2014-06-30 10:03:12.000000000 +0000
    173 +++ dracut-038-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2014-08-10 16:48:44.699000000 +0000
    174 @@ -8,7 +8,7 @@
    175 # TORSEC group -- http://security.polito.it
    176 # Roberto Sassu <roberto.sassu@polito.it>
    177
    178 -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs"
    179 +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs"
    180 ECRYPTFSKEYTYPE="encrypted"
    181 ECRYPTFSKEYDESC="1000100010001000"
    182 ECRYPTFSKEYID=""
    183 diff -Naur dracut-038/modules.d/98ecryptfs/README dracut-038-magellan/modules.d/98ecryptfs/README
    184 --- dracut-038/modules.d/98ecryptfs/README 2014-06-30 10:03:12.000000000 +0000
    185 +++ dracut-038-magellan/modules.d/98ecryptfs/README 2014-08-10 16:48:31.399000000 +0000
    186 @@ -23,13 +23,13 @@
    187 ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob"
    188 --------------------------------------------------------------------------
    189
    190 -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY
    191 +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY
    192 variable;
    193
    194 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command
    195 line.
    196
    197 -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify
    198 +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify
    199 # more options for mounting the eCryptfs filesystem:
    200
    201 ECRYPTFSSRCDIR: existent directory in the lower root filesystem;
    202 @@ -39,7 +39,7 @@
    203 option is automatically added by the dracut script).
    204
    205 # Example of the configuration file:
    206 ------------ '/etc/sysconfig/ecryptfs' (with default values) -----------
    207 +----------- '/etc/conf.d/ecryptfs' (with default values) -----------
    208 ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob"
    209 ECRYPTFSSRCDIR="/secret"
    210 ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}"
    211 diff -Naur dracut-038/modules.d/98integrity/evm-enable.sh dracut-038-magellan/modules.d/98integrity/evm-enable.sh
    212 --- dracut-038/modules.d/98integrity/evm-enable.sh 2014-06-30 10:03:12.000000000 +0000
    213 +++ dracut-038-magellan/modules.d/98integrity/evm-enable.sh 2014-08-10 16:50:32.499000000 +0000
    214 @@ -9,7 +9,7 @@
    215 # Roberto Sassu <roberto.sassu@polito.it>
    216
    217 EVMSECFILE="${SECURITYFSDIR}/evm"
    218 -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm"
    219 +EVMCONFIG="${NEWROOT}/etc/conf.d/evm"
    220 EVMKEYDESC="evm-key"
    221 EVMKEYTYPE="encrypted"
    222 EVMKEYID=""
    223 diff -Naur dracut-038/modules.d/98integrity/ima-policy-load.sh dracut-038-magellan/modules.d/98integrity/ima-policy-load.sh
    224 --- dracut-038/modules.d/98integrity/ima-policy-load.sh 2014-06-30 10:03:12.000000000 +0000
    225 +++ dracut-038-magellan/modules.d/98integrity/ima-policy-load.sh 2014-08-10 16:51:13.487000000 +0000
    226 @@ -9,8 +9,8 @@
    227 # Roberto Sassu <roberto.sassu@polito.it>
    228
    229 IMASECDIR="${SECURITYFSDIR}/ima"
    230 -IMACONFIG="${NEWROOT}/etc/sysconfig/ima"
    231 -IMAPOLICY="/etc/sysconfig/ima-policy"
    232 +IMACONFIG="${NEWROOT}/etc/conf.d/ima"
    233 +IMAPOLICY="/etc/conf.d/ima-policy"
    234
    235 load_ima_policy()
    236 {
    237 diff -Naur dracut-038/modules.d/98integrity/README dracut-038-magellan/modules.d/98integrity/README
    238 --- dracut-038/modules.d/98integrity/README 2014-06-30 10:03:12.000000000 +0000
    239 +++ dracut-038-magellan/modules.d/98integrity/README 2014-08-10 16:50:54.900000000 +0000
    240 @@ -20,7 +20,7 @@
    241 EVMKEY="/etc/keys/evm-trusted.blob"
    242 --------------------------------------------------------------------------
    243
    244 -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable;
    245 +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable;
    246
    247 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command
    248 line.
    249 @@ -33,8 +33,8 @@
    250
    251 # Save the policy in a file.
    252
    253 -# Create the configuration file '/etc/sysconfig/ima' to override the path name of
    254 +# Create the configuration file '/etc/conf.d/ima' to override the path name of
    255 # the IMA custom policy.
    256 -------------- '/etc/sysconfig/ima' (with the default value) -------------
    257 -IMAPOLICY="/etc/sysconfig/ima-policy"
    258 +------------- '/etc/conf.d/ima' (with the default value) -------------
    259 +IMAPOLICY="/etc/conf.d/ima-policy"
    260 -------------------------------------------------------------------------
    261 diff -Naur dracut-038/modules.d/98usrmount/mount-usr.sh dracut-038-magellan/modules.d/98usrmount/mount-usr.sh
    262 --- dracut-038/modules.d/98usrmount/mount-usr.sh 2014-06-30 10:03:12.000000000 +0000
    263 +++ dracut-038-magellan/modules.d/98usrmount/mount-usr.sh 2014-08-10 16:49:37.905000000 +0000
    264 @@ -34,7 +34,7 @@
    265 if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
    266 _fsckoptions="-f $_fsckoptions"
    267 elif [ -f "$NEWROOT"/.autofsck ]; then
    268 - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck
    269 + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck
    270 if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
    271 AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
    272 fi
    273 diff -Naur dracut-038/test/TEST-04-FULL-SYSTEMD/test.sh dracut-038-magellan/test/TEST-04-FULL-SYSTEMD/test.sh
    274 --- dracut-038/test/TEST-04-FULL-SYSTEMD/test.sh 2014-06-30 10:03:12.000000000 +0000
    275 +++ dracut-038-magellan/test/TEST-04-FULL-SYSTEMD/test.sh 2014-08-10 16:47:42.233000000 +0000
    276 @@ -86,7 +86,7 @@
    277 inst /lib/systemd/system/systemd-remount-fs.service
    278 inst /lib/systemd/systemd-remount-fs
    279 inst /lib/systemd/system/systemd-journal-flush.service
    280 - inst /etc/sysconfig/init
    281 + inst /etc/conf.d/init
    282 inst /lib/systemd/system/slices.target
    283 inst /lib/systemd/system/system.slice
    284 inst_multiple -o /lib/systemd/system/dracut*
    285 @@ -98,7 +98,7 @@
    286 inst_multiple -o \
    287 /etc/machine-id \
    288 /etc/adjtime \
    289 - /etc/sysconfig/init \
    290 + /etc/conf.d/init \
    291 /etc/passwd \
    292 /etc/shadow \
    293 /etc/group \