Magellan Linux

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

    Annotation of /trunk/dracut/patches/dracut-023-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

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