Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

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