diff -Naur dracut-017/dracut.conf.d/magellan.conf.example dracut-017-magellan/dracut.conf.d/magellan.conf.example --- dracut-017/dracut.conf.d/magellan.conf.example 1970-01-01 01:00:00.000000000 +0100 +++ dracut-017-magellan/dracut.conf.d/magellan.conf.example 2012-03-03 12:34:18.445982387 +0100 @@ -0,0 +1,9 @@ +# Dracut config file customized for Magellan-Linux + +# i18n +i18n_vars="/etc/conf.d/keymap:KEYMAP /etc/conf.d/consolefont:CONSOLEFONT" +omit_dracutmodules+=" dash " +omit_drivers+=" .*/fs/ocfs/.* " +stdloglvl=3 +realinitpath="/usr/lib/systemd/systemd" +install_items+=" nano /etc/nanorc lsmod ps grep cat rm openvt " diff -Naur dracut-017/dracut-gencmdline.sh dracut-017-magellan/dracut-gencmdline.sh --- dracut-017/dracut-gencmdline.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/dracut-gencmdline.sh 2012-03-03 12:36:49.676982386 +0100 @@ -103,7 +103,7 @@ LD_SO_CONF=/etc/ld.so.conf LD_SO_CONF_D=/etc/ld.so.conf.d/ -[ -e /etc/sysconfig/mkinitrd ] && . /etc/sysconfig/mkinitrd +[ -e /etc/conf.d/mkinitrd ] && . /etc/conf.d/mkinitrd CONFMODS="$MODULES" MODULES="" @@ -599,6 +599,9 @@ shift done +# HACK: always pass a kernel version +[ -z "$kernel" ] && kernel=$(uname -r) + [ -z "$rootfs" ] && rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab) [ -z "$rootopts" ] && rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab) [ -z "$rootopts" ] && rootopts="defaults" @@ -697,8 +700,10 @@ fi # output local keyboard/18n settings -[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard -[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n +[ -e /etc/conf.d/keymap ] && . /etc/conf.d/keymap +[ -e /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont +[ -n "$KEYMAP" ] && KEYTABLE="$KEYMAP" +[ -n "$CONSOLEFONT" ] && SYSFONT="$CONSOLEFONT" for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do val=$(eval echo \$$i) diff -Naur dracut-017/Makefile dracut-017-magellan/Makefile --- dracut-017/Makefile 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/Makefile 2012-03-03 12:38:21.347982387 +0100 @@ -38,6 +38,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 ln -s dracut-functions.sh $(DESTDIR)$(pkglibdir)/dracut-functions install -m 0755 dracut-logger.sh $(DESTDIR)$(pkglibdir)/dracut-logger.sh diff -Naur dracut-017/modules.d/10i18n/console_init.sh dracut-017-magellan/modules.d/10i18n/console_init.sh --- dracut-017/modules.d/10i18n/console_init.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/10i18n/console_init.sh 2012-03-03 12:48:37.520982386 +0100 @@ -5,7 +5,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.kmap set_keyboard() { local param diff -Naur dracut-017/modules.d/40network/module-setup.sh dracut-017-magellan/modules.d/40network/module-setup.sh --- dracut-017/modules.d/40network/module-setup.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/40network/module-setup.sh 2012-03-03 12:49:32.537982386 +0100 @@ -17,7 +17,7 @@ } depends() { - [ -d /etc/sysconfig/network-scripts/ ] && echo ifcfg + [ -d /etc/conf.d/network-scripts/ ] && echo ifcfg return 0 } diff -Naur dracut-017/modules.d/40uvesafb/module-setup.sh dracut-017-magellan/modules.d/40uvesafb/module-setup.sh --- dracut-017/modules.d/40uvesafb/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 +++ dracut-017-magellan/modules.d/40uvesafb/module-setup.sh 2012-03-03 12:39:20.578982387 +0100 @@ -0,0 +1,18 @@ +#!/bin/bash + +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-017/modules.d/40uvesafb/uvesafb-pretrigger.sh dracut-017-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh --- dracut-017/modules.d/40uvesafb/uvesafb-pretrigger.sh 1970-01-01 01:00:00.000000000 +0100 +++ dracut-017-magellan/modules.d/40uvesafb/uvesafb-pretrigger.sh 2012-03-03 12:39:53.288982385 +0100 @@ -0,0 +1,5 @@ +#!/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-017/modules.d/45ifcfg/write-ifcfg.sh dracut-017-magellan/modules.d/45ifcfg/write-ifcfg.sh --- dracut-017/modules.d/45ifcfg/write-ifcfg.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/45ifcfg/write-ifcfg.sh 2012-03-03 12:59:55.432982384 +0100 @@ -136,9 +136,9 @@ # Pass network opts [ -d /run/initramfs ] || mkdir -m 0755 -p /run/initramfs cp /tmp/net.* /run/initramfs/ >/dev/null 2>&1 -for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/sysconfig /run/initramfs/state/etc/sysconfig/network-scripts; do +for i in /run/initramfs/state /run/initramfs/state/etc/ /run/initramfs/state/etc/conf.d /run/initramfs/state/etc/conf.d/network-scripts; do [ -d $i ] || mkdir -m 0755 -p $i done cp /tmp/net.$netif.resolv.conf /run/initramfs/state/etc/ >/dev/null 2>&1 -echo "files /etc/sysconfig/network-scripts" > /run/initramfs/rwtab -cp -a -t /run/initramfs/state/etc/sysconfig/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1 +echo "files /etc/conf.d/network-scripts" > /run/initramfs/rwtab +cp -a -t /run/initramfs/state/etc/conf.d/network-scripts/ /tmp/ifcfg/* >/dev/null 2>&1 diff -Naur dracut-017/modules.d/95rootfs-block/mount-root.sh dracut-017-magellan/modules.d/95rootfs-block/mount-root.sh --- dracut-017/modules.d/95rootfs-block/mount-root.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/95rootfs-block/mount-root.sh 2012-03-03 12:54:31.720982386 +0100 @@ -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 @@ -57,7 +57,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 diff -Naur dracut-017/modules.d/95udev-rules/module-setup.sh dracut-017-magellan/modules.d/95udev-rules/module-setup.sh --- dracut-017/modules.d/95udev-rules/module-setup.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/95udev-rules/module-setup.sh 2012-03-03 12:41:03.484982385 +0100 @@ -74,6 +74,13 @@ [ -f /etc/arch-release ] && \ inst "$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 + for _i in {"$libdir","$usrlibdir"}/libnss_files*; do [ -e "$_i" ] && dracut_install "$_i" done diff -Naur dracut-017/modules.d/97masterkey/masterkey.sh dracut-017-magellan/modules.d/97masterkey/masterkey.sh --- dracut-017/modules.d/97masterkey/masterkey.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/97masterkey/masterkey.sh 2012-03-03 12:53:23.653982386 +0100 @@ -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-017/modules.d/97masterkey/README dracut-017-magellan/modules.d/97masterkey/README --- dracut-017/modules.d/97masterkey/README 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/97masterkey/README 2012-03-03 12:52:54.289982386 +0100 @@ -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-017/modules.d/98ecryptfs/ecryptfs-mount.sh dracut-017-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh --- dracut-017/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/98ecryptfs/ecryptfs-mount.sh 2012-03-03 12:55:44.499982387 +0100 @@ -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-017/modules.d/98ecryptfs/README dracut-017-magellan/modules.d/98ecryptfs/README --- dracut-017/modules.d/98ecryptfs/README 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/98ecryptfs/README 2012-03-03 12:56:18.720982386 +0100 @@ -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-017/modules.d/98integrity/evm-enable.sh dracut-017-magellan/modules.d/98integrity/evm-enable.sh --- dracut-017/modules.d/98integrity/evm-enable.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/98integrity/evm-enable.sh 2012-03-03 12:57:35.482982387 +0100 @@ -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-017/modules.d/98integrity/ima-policy-load.sh dracut-017-magellan/modules.d/98integrity/ima-policy-load.sh --- dracut-017/modules.d/98integrity/ima-policy-load.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/98integrity/ima-policy-load.sh 2012-03-03 12:56:42.959982385 +0100 @@ -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-017/modules.d/98integrity/README dracut-017-magellan/modules.d/98integrity/README --- dracut-017/modules.d/98integrity/README 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/98integrity/README 2012-03-03 12:57:14.624982386 +0100 @@ -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-017/modules.d/98usrmount/mount-usr.sh dracut-017-magellan/modules.d/98usrmount/mount-usr.sh --- dracut-017/modules.d/98usrmount/mount-usr.sh 2012-02-24 15:38:08.000000000 +0100 +++ dracut-017-magellan/modules.d/98usrmount/mount-usr.sh 2012-03-03 12:58:02.266982386 +0100 @@ -18,7 +18,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