Rebuild dracut image

4 files changed, 4 insertions, 142 deletions

diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 2cac2da..d3d20c0 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -45,12 +45,11 @@ AUX restart/vsftpd 27 RMD160 91be22938c872d12b96c8c695f9cba1c2767ed45 SHA1 016b4
 AUX sync-distclean-exec.cron 60 RMD160 b012f4963ffa84869ce9e9593f64e5e26e09cf8c SHA1 c0389c2e1e947e75910a5ff3b9b0a7a122754c76 SHA256 043df18d533148d33abe2f2cf588953b0193c4a47ea0a428e5e2d531ee4d5d0e
 AUX update-autoshutdown 88 RMD160 f029249c1e727d4feaa06bbdc8bac1a9e84ba178 SHA1 2f55e2283efae01ae9fa30d5ae136989257563c2 SHA256 e90d95d158222c493d4fbf8ebcd9c2927535048d97ee743fe658d47e50aa6fb6
 AUX update-install2 465 RMD160 1d4c5ecf72bfa132d72fed4d4671949c7e3b46d7 SHA1 e2ac26e09a6c85f5b449ac5d9cbbd637d2d3022a SHA256 42c5a9a7effbed59f8c02afebeadb29c19a453b914783fa238c41e4dd4f182ca
-AUX update-kernel 435 RMD160 0b7becad4f9a43110cc7e9b0b8912c97cfafe4b7 SHA1 6634ec3b65d631a496bfaade36385b82cf8251ff SHA256 272a3ed8d5d2f863279ec77bc81578f0547c716cfa852ba3d32072d2600754fa
+AUX update-kernel 488 RMD160 22f8e214e482fcbb3ac37390cc91356d18b60cac SHA1 a6cc9f8b164cf6b345ac4775755de835f699ae40 SHA256 0d7d6441d9c0469611db50063f401656a54e1bcd6b44cd1c963ac73ce1c11ff3
 AUX update.portage.cron 171 RMD160 c388289e78342b65d48077868f4acbe9b3b00849 SHA1 d7430ff8e906ad8d66918750c29722bfa6030c73 SHA256 394b727e294166db136d5b5c46ab0ac180952d6f20cd93b4a356a2cfc9bedf03
 AUX update.portage.cron-2 159 RMD160 eada35db78d363502c4d0486cfcbc8493514562f SHA1 4be58a5f236829928865c800585cc9c811a6aad3 SHA256 a910ae7e18b6e759380f1d9e30bffa100912b3a6f1c60c69f33b9cd186d0e92c
 AUX weekly-av-scan.cron 232 RMD160 1eb8c0e031fc10a8299f8d00cddf46aee7dc011a SHA1 d39efdf4398a679b8a87603c51e92f01ce1e9362 SHA256 1b1e3751560d72c0e146046149084e213f8bc8f878e8cb24446be8ee45b6da28
 AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a820e5f5fe SHA1 a077c7c5265c3d9817fa4846dbbab8bc9addfeb5 SHA256 dbb37593b994102324c5a24b5d5d21597c215924a29d065d84b8c64af3049b38
 AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141
 AUX write-new-updates 123 RMD160 bd8177f3baf9287676389a8c24d3419a995400bb SHA1 2812937b3a746c919fe5bea90b3b6c9930d203f0 SHA256 98d35a82d75ed3e4a7b9857c57ab41f3cbf60a82dc255b7c62d372e0ed410d84
-EBUILD miller-base-8-r12.ebuild 4109 RMD160 e24b7d27d6a8af7fbebe69fb881e0aeec26a50c8 SHA1 897334774b154ba69130acd28424090832ef6f0a SHA256 4a4d669cccaab337742b997c68ce9dd322f685c5c9bc8ecabd8d09e1ff2c271f
-EBUILD miller-base-9.ebuild 3407 RMD160 23af1f232cb6c3f8a5f727741307a0b4127ccbbf SHA1 b1d7d921a7df1af6b528779aa31b029b6e81430f SHA256 32c4255e3c225486d99fac0eeb698d36cc75baedcd15ce3c1ba4b23575392ca5
+EBUILD miller-base-9-r1.ebuild 3407 RMD160 23af1f232cb6c3f8a5f727741307a0b4127ccbbf SHA1 b1d7d921a7df1af6b528779aa31b029b6e81430f SHA256 32c4255e3c225486d99fac0eeb698d36cc75baedcd15ce3c1ba4b23575392ca5
diff --git a/virtual/miller-base/files/update-kernel b/virtual/miller-base/files/update-kernel
index 43057d3..13f2b90 100755
--- a/virtual/miller-base/files/update-kernel
+++ b/virtual/miller-base/files/update-kernel
@@ -1,13 +1,9 @@
 #!/bin/bash
 
-file="/tmp/packagedModules"
-
 cd /usr/src/linux || ( echo "No kernel directory"; exit 1 )
 make -j2 || ( echo "Make failed" ; exit 1 )
 make modules -j2 || ( echo "Make modules failed" ; exit 1 )
 make modules_install -j2 || ( echo "Make modules install failed" ; exit 1 )
-qfile -q -C /lib/modules > $file
-if [ -s $file ] ; then
-	emerge -q1 `cat $file` || exit 1
-fi
+emerge -q1 /lib/modules || exit 1
 make install -j2 || ( echo "Make install failed" ; exit 1 )
+[ -x /usr/sbin/dracut ] && /usr/sbin/dracut -H -f --lzma /boot/dracut.initrd.cpio.lzma $(head /boot/config -n3 | tail -n1 | cut -d ' ' -f 3)
diff --git a/virtual/miller-base/miller-base-8-r12.ebuild b/virtual/miller-base/miller-base-8-r12.ebuild
deleted file mode 100644
index a35beb7..0000000
--- a/virtual/miller-base/miller-base-8-r12.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-DESCRIPTION="Virtual for Miller servers"
-
-EAPI="2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="cdr hardened nohourlyupdate fuse xfs bash-completion nomedia git fbsplash
-minimal autoupdate autoshutdown autoservicerestart lvmroot sw-suspend raid
-video_cards_nvidia"
-
-DEPEND="
-	!minimal? ( www-servers/apache )
-	raid? ( sys-fs/mdadm )
-	app-admin/ide-smart
-	sys-cluster/glusterfs
-	sys-cluster/netfs
-	sys-apps/ethtool
-	cdr? ( app-cdr/k3b )
-	!nomedia? ( media-tv/mythtv media-plugins/mythvideo )
-	sys-apps/hdparm
-	sys-apps/unscd
-	!minimal? ( net-dns/bind-tools )
-	fuse? ( sys-fs/sshfs-fuse )
-	!minimal? ( || (
-		net-fs/mount-cifs
-		net-fs/samba-client
-		net-fs/samba[client] ) )
-	xfs? ( sys-fs/xfsdump )
-	!lvmroot? ( sys-fs/lvm2 )
-	lvmroot? (
-			>=sys-boot/grub-1.98
-			sys-fs/lvm2[static]
-			sys-apps/busybox[static]
-			)
-	video_cards_nvidia? ( sys-apps/v86d )
-	>=app-portage/gentoolkit-0.2.1
-	sys-process/vixie-cron
-	!minimal? ( virtual/eject )
-	app-admin/sudo
-	mail-client/mailx
-	sys-apps/pciutils
-	!minimal? ( app-dicts/myspell-en )
-	net-misc/ntp
-	!minimal? ( net-analyzer/netcat )
-	!minimal? ( net-ftp/ncftp )
-	!minimal? ( x11-apps/xauth )
-	sys-process/lsof
-	app-portage/layman[subversion]
-	app-admin/syslog-ng
-	app-admin/logrotate
-	!minimal? ( app-antivirus/clamav )
-	!hardened? ( 
-			!sw-suspend? ( sys-kernel/gentoo-sources )
-			sw-suspend? ( sys-apps/tuxonice-userui
-				|| ( sys-kernel/tuxonice-sources
-					sys-kernel/pf-sources ) ) )
-	hardened? ( sys-kernel/hardened-sources =sys-apps/gradm-2.2.2* )
-	!minimal? ( ||
-		( app-text/dos2unix <app-text/unix2dos-5 )
-		( >=app-text/dos2unix-5 !app-text/unix2dos ) )
-	app-misc/screen
-	sys-boot/grub
-	app-vim/gentoo-syntax
-	sys-auth/pam_ldap
-	sys-auth/nss_ldap
-	app-editors/gvim
-	git? ( dev-vcs/git )
-	!minimal? ( dev-util/strace )
-	bash-completion? ( app-shells/bash-completion )
-	net-misc/wakeonlan
-	"
-
-src_install() {
-	exeinto /etc/cron.weekly
-	use !minimal && newexe "${FILESDIR}"/weekly-av-scan.cron av-scan
-
-	exeinto /etc/cron.daily
-	use !minimal && newexe "${FILESDIR}"/daily-av-update.cron av-update
-
-	if [ -n "${UPDATETIME}" ]; then
-		mkdir -p ${D}/etc/cron.d
-		echo "${UPDATETIME} root /sbin/gentoo-portage-update" > ${D}/etc/cron.d/gentoo-portage-update
-		exeinto /sbin
-	else
-		use nohourlyupdate && exeinto /etc/cron.daily
-		use !nohourlyupdate && exeinto /etc/cron.hourly
-	fi
-	newexe "${FILESDIR}"/update.portage.cron-2 gentoo-portage-update
-
-	exeinto /etc/portage/postsync.d/
-	newexe "${FILESDIR}"/sync-distclean-exec.cron 60-portage-distclean-exec
-	use !autoupdate && newexe "${FILESDIR}"/auto-download-packages 70-auto-download-package
-	newexe "${FILESDIR}"/auto-update-overlays 10-auto-update-overlays
-	newexe "${FILESDIR}"/write-new-updates 50-write-new-updates
-	if use autoupdate ; then
-		dosym /sbin/update-install /etc/portage/postsync.d/75-update-install
-		if use autoshutdown ; then
-			newexe "${FILESDIR}"/update-autoshutdown 99-auto-shutdown
-		else
-			if use autoservicerestart ; then
-				exeinto /usr/libexec/scripts/auto-restart
-				for f in ${FILESDIR}/restart/* ; do
-					newexe ${FILESDIR}/restart/`basename $f` `basename $f`
-				done
-				exeinto /etc/portage/postsync.d/
-				newexe "${FILESDIR}"/auto-restart-services 80-auto-restart-services
-			fi
-		fi
-	fi
-	if use lvmroot ; then
-		exeinto /usr/share/lvmroot/
-		newexe ${FILESDIR}/lvmroot/init init
-		insinto /usr/share/lvmroot/
-		doins ${FILESDIR}/lvmroot/initrd.list
-		if use video_cards_nvidia ; then
-			cat ${FILESDIR}/lvmroot/initrd.list.v86d >> ${D}/usr/share/lvmroot/initrd.list
-		fi
-		if use sw-suspend ; then
-			if use fbsplash ; then
-				cat ${FILESDIR}/lvmroot/initrd.list.icefb >> ${D}/usr/share/lvmroot/initrd.list
-			else
-				cat ${FILESDIR}/lvmroot/initrd.list.icetext >> ${D}/usr/share/lvmroot/initrd.list
-			fi
-		fi
-		doins ${FILESDIR}/lvmroot/makefile
-		doins ${FILESDIR}/lvmroot/mtab
-		exeinto /etc/portage/postsync.d/
-		newexe "${FILESDIR}"/lvmroot/rebuild-initrd 80-rebuild-initrd
-	fi
-
-	exeinto /sbin
-	newexe "${FILESDIR}"/update-install2 update-install
-	newexe "${FILESDIR}"/update-kernel update-kernel
-}
diff --git a/virtual/miller-base/miller-base-9.ebuild b/virtual/miller-base/miller-base-9-r1.ebuild
index 09d4b93..09d4b93 100644
--- a/virtual/miller-base/miller-base-9.ebuild
+++ b/virtual/miller-base/miller-base-9-r1.ebuild