diff -Naur dracut-023/dracut.conf.d/magellan.conf.example dracut-023-magellan/dracut.conf.d/magellan.conf.example --- dracut-023/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 +++ dracut-023-magellan/dracut.conf.d/magellan.conf.example 2012-08-16 17:22:26.386978889 +0200 @@ -0,0 +1,15 @@ +# Dracut config file customized for Magellan-Linux. + +# i18n +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefont:CONSOLEFONT" +omit_drivers+=" .*/fs/ocfs/.* " +stdloglvl=3 +install_items+=" nano /etc/nanorc lsmod ps grep cat rm " +prefix="/" +systemdutildir=/usr/lib/systemd +systemdsystemunitdir=/usr/lib/systemd/system +udevdir=/usr/lib/udev +omit_dracutmodules+=" dash " +# disabled not working with current systemd-188 +#add_dracutmodules+=" systemd " +realinitpath="/usr/lib/systemd/systemd" diff -Naur dracut-023/Makefile dracut-023-magellan/Makefile --- dracut-023/Makefile 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/Makefile 2012-08-16 17:21:17.549980324 +0200 @@ -86,6 +86,9 @@ install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf mkdir -p $(DESTDIR)$(sysconfdir)/dracut.conf.d + install -m 0644 dracut.conf.d/magellan.conf.example $(DESTDIR)$(sysconfdir)/dracut.conf.d/01-magellan.conf + mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d + install -m 0644 dracut.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/dracut install -m 0755 dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions.sh install -m 0755 dracut-version.sh $(DESTDIR)$(pkglibdir)/dracut-version.sh ln -fs dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions diff -Naur dracut-023/modules.d/10i18n/console_init.sh dracut-023-magellan/modules.d/10i18n/console_init.sh --- dracut-023/modules.d/10i18n/console_init.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/10i18n/console_init.sh 2012-08-16 17:21:17.549980324 +0200 @@ -11,7 +11,7 @@ [ -e /etc/vconsole.conf ] && . /etc/vconsole.conf DEFAULT_FONT=LatArCyrHeb-16 -DEFAULT_KEYMAP=/etc/sysconfig/console/default.kmap +DEFAULT_KEYMAP=/etc/conf.d/console/default.kmap set_keyboard() { local param diff -Naur dracut-023/modules.d/40network/module-setup.sh dracut-023-magellan/modules.d/40network/module-setup.sh --- dracut-023/modules.d/40network/module-setup.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/40network/module-setup.sh 2012-08-16 17:21:17.549980324 +0200 @@ -16,7 +16,7 @@ } depends() { - [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg + [ -d /etc/conf.d/network-scripts/ ] && echo ifcfg return 0 } diff -Naur dracut-023/modules.d/40uvesafb/module-setup.sh dracut-023-magellan/modules.d/40uvesafb/module-setup.sh --- dracut-023/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 +++ dracut-023-magellan/modules.d/40uvesafb/module-setup.sh 2012-08-16 17:21:17.549980324 +0200 @@ -0,0 +1,19 @@ +#!/bin/sh + +check() { + [ -x /sbin/v86d ] +} + +depends() { + return 0 +} + +installkernel() { + hostonly='' instmods uvesafb +} + +install() { + dracut_install /sbin/v86d + inst_hook pre-trigger 9 "$moddir"/uvesafb-pretrigger.sh +} + diff -Naur dracut-023/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-023-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh --- dracut-023/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100 +++ dracut-023-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-08-16 17:21:17.549980324 +0200 @@ -0,0 +1,6 @@ +#!/bin/sh + +if getargbool 1 rd.uvesafb -n rd_NO_UVESAFB; then + [ ! -c /dev/fb0 -a -e /sbin/v86d ] && modprobe uvesafb +fi + diff -Naur dracut-023/modules.d/45ifcfg/write-ifcfg.sh dracut-023-magellan/modules.d/45ifcfg/write-ifcfg.sh --- dracut-023/modules.d/45ifcfg/write-ifcfg.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/45ifcfg/write-ifcfg.sh 2012-08-16 17:21:17.549980324 +0200 @@ -227,13 +227,13 @@ done # Pass network opts -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts mkdir -m 0755 -p /run/initramfs/state/var/lib/dhclient -echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab +echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab echo "files /var/lib/dhclient" >> /run/initramfs/rwtab { cp /tmp/net.* /run/initramfs/ cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/resolv.conf - copytree /tmp/ifcfg /run/initramfs/state/etc/sysconfig/network-scripts + copytree /tmp/ifcfg /run/initramfs/state/etc/conf.d/network-scripts cp /tmp/ifcfg-leases/* /run/initramfs/state/var/lib/dhclient } > /dev/null 2>&1 diff -Naur dracut-023/modules.d/80cms/cms-write-ifcfg.sh dracut-023-magellan/modules.d/80cms/cms-write-ifcfg.sh --- dracut-023/modules.d/80cms/cms-write-ifcfg.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/80cms/cms-write-ifcfg.sh 2012-08-16 17:21:17.549980324 +0200 @@ -4,7 +4,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh -mkdir -m 0755 -p /run/initramfs/state/etc/sysconfig/network-scripts +mkdir -m 0755 -p /run/initramfs/state/etc/conf.d/network-scripts function cms_write_config() { @@ -24,18 +24,18 @@ uuid=$(cat /proc/sys/kernel/random/uuid) - IFCFGFILE=/run/initramfs/state/etc/sysconfig/network-scripts/ifcfg-$DEVICE + IFCFGFILE=/run/initramfs/state/etc/conf.d/network-scripts/ifcfg-$DEVICE strstr "$IPADDR" '*:*:*' && ipv6=1 # to please NetworkManager on startup in loader before loader reconfigures net - cat > /etc/sysconfig/network << EOF + cat > /etc/conf.d/network << EOF HOSTNAME=$HOSTNAME EOF if [ "$ipv6" ]; then - echo "NETWORKING_IPV6=yes" >> /etc/sysconfig/network + echo "NETWORKING_IPV6=yes" >> /etc/conf.d/network else - echo "NETWORKING=yes" >> /etc/sysconfig/network + echo "NETWORKING=yes" >> /etc/conf.d/network fi cat > $IFCFGFILE << EOF @@ -97,7 +97,7 @@ unset optstr unset DNS1 unset DNS2 - echo "files /etc/sysconfig/network-scripts" >> /run/initramfs/rwtab + echo "files /etc/conf.d/network-scripts" >> /run/initramfs/rwtab echo "files /var/lib/dhclient" >> /run/initramfs/rwtab } diff -Naur dracut-023/modules.d/95rootfs-block/mount-root.sh dracut-023-magellan/modules.d/95rootfs-block/mount-root.sh --- dracut-023/modules.d/95rootfs-block/mount-root.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/95rootfs-block/mount-root.sh 2012-08-16 17:21:17.550980377 +0200 @@ -34,8 +34,8 @@ READONLY= fsckoptions= - if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then - . "$NEWROOT"/etc/sysconfig/readonly-root + if [ -f "$NEWROOT"/etc/conf.d/readonly-root ]; then + . "$NEWROOT"/etc/conf.d/readonly-root fi if getargbool 0 "readonlyroot=" -y readonlyroot; then @@ -58,8 +58,8 @@ if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then fsckoptions="-f $fsckoptions" elif [ -f "$NEWROOT"/.autofsck ]; then - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && \ - . "$NEWROOT"/etc/sysconfig/autofsck + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && \ + . "$NEWROOT"/etc/conf.d/autofsck if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then AUTOFSCK_OPT="$AUTOFSCK_OPT -f" fi diff -Naur dracut-023/modules.d/95udev-rules/module-setup.sh dracut-023-magellan/modules.d/95udev-rules/module-setup.sh --- dracut-023/modules.d/95udev-rules/module-setup.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/95udev-rules/module-setup.sh 2012-08-16 17:21:17.550980377 +0200 @@ -54,6 +54,13 @@ [ -f /etc/arch-release ] && \ inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh + # magellan uses a special modprobe script too + if [ -f /etc/mageversion ] + then + [ -e /lib/udev/modprobe.sh ] && dracut_install /lib/udev/modprobe.sh + [ -f /etc/udev/blacklist ] && dracut_install /etc/udev/blacklist + fi + inst_libdir_file "libnss_files*" } diff -Naur dracut-023/modules.d/97masterkey/masterkey.sh dracut-023-magellan/modules.d/97masterkey/masterkey.sh --- dracut-023/modules.d/97masterkey/masterkey.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/97masterkey/masterkey.sh 2012-08-16 17:21:17.550980377 +0200 @@ -8,7 +8,7 @@ # TORSEC group -- http://security.polito.it # Roberto Sassu -MASTERKEYSCONFIG="${NEWROOT}/etc/sysconfig/masterkey" +MASTERKEYSCONFIG="${NEWROOT}/etc/conf.d/masterkey" MULTIKERNELMODE="NO" PCRLOCKNUM=11 diff -Naur dracut-023/modules.d/97masterkey/README dracut-023-magellan/modules.d/97masterkey/README --- dracut-023/modules.d/97masterkey/README 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/97masterkey/README 2012-08-16 17:21:17.550980377 +0200 @@ -39,7 +39,7 @@ MASTERKEY="/etc/keys/kmk-${MASTERKEYTYPE}.blob" -------------------------------------------------------------------------- -2) create the configuration file '/etc/sysconfig/masterkey' to override the +2) create the configuration file '/etc/conf.d/masterkey' to override the value of one or all variables; 3) specify these parameters in the kernel command line: diff -Naur dracut-023/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-023-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh --- dracut-023/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-08-16 17:21:17.550980377 +0200 @@ -8,7 +8,7 @@ # TORSEC group -- http://security.polito.it # Roberto Sassu -ECRYPTFSCONFIG="${NEWROOT}/etc/sysconfig/ecryptfs" +ECRYPTFSCONFIG="${NEWROOT}/etc/conf.d/ecryptfs" ECRYPTFSKEYTYPE="encrypted" ECRYPTFSKEYDESC="1000100010001000" ECRYPTFSKEYID="" diff -Naur dracut-023/modules.d/98ecryptfs/README dracut-023-magellan/modules.d/98ecryptfs/README --- dracut-023/modules.d/98ecryptfs/README 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/98ecryptfs/README 2012-08-16 17:21:17.550980377 +0200 @@ -23,13 +23,13 @@ ECRYPTFSKEY="/etc/keys/ecryptfs-trusted.blob" -------------------------------------------------------------------------- -2) create the configuration file '/etc/sysconfig/ecryptfs' and set the ECRYPTFSKEY +2) create the configuration file '/etc/conf.d/ecryptfs' and set the ECRYPTFSKEY variable; 3) specify the eCryptfs key path name in the 'ecryptfskey=' parameter of the kernel command line. -# The configuration file '/etc/sysconfig/ecryptfs' is also used to specify +# The configuration file '/etc/conf.d/ecryptfs' is also used to specify # more options for mounting the eCryptfs filesystem: ECRYPTFSSRCDIR: existent directory in the lower root filesystem; @@ -39,7 +39,7 @@ option is automatically added by the dracut script). # Example of the configuration file: ------------ '/etc/sysconfig/ecryptfs' (with default values) ----------- +----------- '/etc/conf.d/ecryptfs' (with default values) ----------- ECRYPTFS_KEY="/etc/keys/ecryptfs-trusted.blob" ECRYPTFSSRCDIR="/secret" ECRYPTFSDSTDIR="${ECRYPTFSSRCDIR}" diff -Naur dracut-023/modules.d/98integrity/evm-enable.sh dracut-023-magellan/modules.d/98integrity/evm-enable.sh --- dracut-023/modules.d/98integrity/evm-enable.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/98integrity/evm-enable.sh 2012-08-16 17:21:17.550980377 +0200 @@ -9,7 +9,7 @@ # Roberto Sassu EVMSECFILE="${SECURITYFSDIR}/evm" -EVMCONFIG="${NEWROOT}/etc/sysconfig/evm" +EVMCONFIG="${NEWROOT}/etc/conf.d/evm" EVMKEYDESC="evm-key" EVMKEYTYPE="encrypted" EVMKEYID="" diff -Naur dracut-023/modules.d/98integrity/ima-policy-load.sh dracut-023-magellan/modules.d/98integrity/ima-policy-load.sh --- dracut-023/modules.d/98integrity/ima-policy-load.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/98integrity/ima-policy-load.sh 2012-08-16 17:21:17.550980377 +0200 @@ -9,8 +9,8 @@ # Roberto Sassu IMASECDIR="${SECURITYFSDIR}/ima" -IMACONFIG="${NEWROOT}/etc/sysconfig/ima" -IMAPOLICY="/etc/sysconfig/ima-policy" +IMACONFIG="${NEWROOT}/etc/conf.d/ima" +IMAPOLICY="/etc/conf.d/ima-policy" load_ima_policy() { diff -Naur dracut-023/modules.d/98integrity/README dracut-023-magellan/modules.d/98integrity/README --- dracut-023/modules.d/98integrity/README 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/98integrity/README 2012-08-16 17:21:17.551980426 +0200 @@ -20,7 +20,7 @@ EVMKEY="/etc/keys/evm-trusted.blob" -------------------------------------------------------------------------- -2) create the configuration file '/etc/sysconfig/evm' and set the EVMKEY variable; +2) create the configuration file '/etc/conf.d/evm' and set the EVMKEY variable; 3) specify the EVM key path name in the 'evmkey=' parameter of the kernel command line. @@ -33,8 +33,8 @@ # Save the policy in a file. -# Create the configuration file '/etc/sysconfig/ima' to override the path name of +# Create the configuration file '/etc/conf.d/ima' to override the path name of # the IMA custom policy. -------------- '/etc/sysconfig/ima' (with the default value) ------------- -IMAPOLICY="/etc/sysconfig/ima-policy" +------------- '/etc/conf.d/ima' (with the default value) ------------- +IMAPOLICY="/etc/conf.d/ima-policy" ------------------------------------------------------------------------- diff -Naur dracut-023/modules.d/98usrmount/mount-usr.sh dracut-023-magellan/modules.d/98usrmount/mount-usr.sh --- dracut-023/modules.d/98usrmount/mount-usr.sh 2012-08-01 15:30:30.000000000 +0200 +++ dracut-023-magellan/modules.d/98usrmount/mount-usr.sh 2012-08-16 17:21:17.551980426 +0200 @@ -19,7 +19,7 @@ if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then _fsckoptions="-f $_fsckoptions" elif [ -f "$NEWROOT"/.autofsck ]; then - [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck + [ -f "$NEWROOT"/etc/conf.d/autofsck ] && . "$NEWROOT"/etc/conf.d/autofsck if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then AUTOFSCK_OPT="$AUTOFSCK_OPT -f" fi