Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

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