Magellan Linux

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

    Contents of /trunk/dracut/patches/dracut-033-magellan-2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

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