This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".

The branch, master has been updated via 4c528699d890e109beddde481ec64d11f376f902 (commit) via de96fadddfd523f56065cef975c5e69af4d02f1a (commit) from 706e01d94194c12c924213cb47871f3ce7a52a82 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 4c528699d890e109beddde481ec64d11f376f902 Merge: de96fad 706e01d Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 31 00:30:55 2011 +0200

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit de96fadddfd523f56065cef975c5e69af4d02f1a Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jul 31 00:28:06 2011 +0200

dracut: Split package into several subpackages.

-network contains all hooks that require network components. As a firewall, it is very uncommon to boot from a network device and so we don't need that and drop a lot of dependencies.

-utils contains a couple of tools for displaying the content of the initrd and stuff.

-----------------------------------------------------------------------

Summary of changes: pkgs/dracut/dracut.nm | 66 ++++++++++++++++++++++++++++++++++++++++++++--- pkgs/dracut/ipfire.conf | 7 +++++ 2 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 pkgs/dracut/ipfire.conf

Difference in files: diff --git a/pkgs/dracut/dracut.nm b/pkgs/dracut/dracut.nm index c90c5aa..dffd2a4 100644 --- a/pkgs/dracut/dracut.nm +++ b/pkgs/dracut/dracut.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include

PKG_NAME = dracut PKG_VER = 010 -PKG_REL = 1 +PKG_REL = 2 PKG_ARCH = noarch

PKG_MAINTAINER = @@ -35,9 +35,25 @@ PKG_URL = http://sourceforge.net/apps/trac/dracut/wiki PKG_LICENSE = GPLv2+ PKG_SUMMARY = Initramfs generator using udev.

-PKG_DEPS += bash bzip2 cpio coreutils dmraid e2fsprogs eject gzip \ - iproute2 iputils kbd less libselinux lvm2 mdadm multipath-tools \ - sysvinit udev util-linux which +PKG_DEPS-dracut += \ + bash \ + bzip2 \ + cpio \ + coreutils \ + dmraid \ + e2fsprogs \ + eject \ + gzip \ + iputils \ + kbd \ + less \ + libselinux \ + lvm2 \ + mdadm \ + sysvinit \ + udev \ + util-linux \ + which

define PKG_DESCRIPTION dracut is a new, event-driven initramfs infrastructure based around udev. @@ -60,4 +76,46 @@ endef define STAGE_INSTALL cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \ sbindir=/sbin sysconfdir=/etc mandir=/usr/share/man + + # Install local configuration. + -mkdir -pv $(BUILDROOT)/etc/dracut.conf.d + cp -vf $(DIR_SOURCE)/ipfire.conf $(BUILDROOT)/etc/dracut.conf.d/ipfire.conf +endef + +# Network package +PKG_PACKAGES += dracut-network + +PKG_SUMMARY-dracut-network = Network support for the initramdisk. +define PKG_DESCRIPTION-dracut-network + This package requires everything which is needed to build a generic + all purpose initramfs with network support with dracut. +endef + +PKG_DEPS-dracut-network = \ + bridge-utils \ + dhclient \ + iproute \ + nfs-utils + +define PKG_FILES-dracut-network + /usr/share/dracut/modules.d/40network + /usr/share/dracut/modules.d/95fcoe + /usr/share/dracut/modules.d/95iscsi + /usr/share/dracut/modules.d/95nbd + /usr/share/dracut/modules.d/95nfs + /usr/share/dracut/modules.d/45ifcfg + /usr/share/dracut/modules.d/95znet +endef + +# Utils package +PKG_PACKAGES += dracut-utils + +PKG_SUMMARY-dracut-utils = Command line utils for dracut. +define PKG_DESCRIPTION-dracut-utils + Command line utils for dracut. +endef + +define PKG_FILES-dracut-utils + /sbin/dracut-* + /sbin/*initrd endef diff --git a/pkgs/dracut/ipfire.conf b/pkgs/dracut/ipfire.conf new file mode 100644 index 0000000..b27d624 --- /dev/null +++ b/pkgs/dracut/ipfire.conf @@ -0,0 +1,7 @@ +# Dracut config file customized for IPFire. + +# i18n +i18n_vars="/etc/vconsole.conf:KEYTABLE-KEYMAP,SYSFONT-FONT,FONTACM-FONT_MAP,FONT_UNIMAP" +#add_dracutmodules+=" " +stdloglvl=3 +prefix=/run/initramfs

hooks/post-receive -- IPFire 3.x development tree