4 files changed, 12 insertions, 18 deletions
diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest
index 1b8869a..78bd4c7 100644
--- a/virtual/miller-base/Manifest
+++ b/virtual/miller-base/Manifest
@@ -5,7 +5,7 @@ AUX daily-av-update.cron 31 RMD160 17399a1386d96221b51960ec38c7059af01c609e SHA1
 AUX hourly-distclean-updatedb.cron 940 RMD160 f6f420a2da2588be0f5ba47c3c887a403002fce0 SHA1 f5626fcddd829d6bfa75bb132e2644162548f9d2 SHA256 ce2ec02cd3a9b1af3df6f7eba15dedb1b4ca8b224fc68431a9afc1a76702c0c6
 AUX lvmroot/init 403 RMD160 146e3a99db8fdf8aeedbb67ce7087905c7ac1577 SHA1 17a6b6ac787188046e0768c63baa5589a6675e4b SHA256 9890397895b356be0134c6b0fcd21206ba9518077db94accffb8774992172b80
 AUX lvmroot/initrd.list 2205 RMD160 1d8b1458f53c018ebff371cdff1297df99723966 SHA1 4a25d22322974b4410f75896230952ce1baefc53 SHA256 334ff5dfa4e7bf366f34378bb11a869d4e43fda2dd077e443d368410d94ed353
-AUX lvmroot/makefile 596 RMD160 96d70fd0ff7da3ae20e816c8368f9eaf4f891fe4 SHA1 c541137a801302fb259491ca475ed1877e4b1e2c SHA256 8dc59305409dc77acb2f2f37954ca4d8a70223901dd49f2610febb70dcfaa90a
+AUX lvmroot/makefile 629 RMD160 5dad92e861fed86aed55d1599d04a17dc6cb9481 SHA1 475a9cd1908db664db402da0ac83b35603329d51 SHA256 ca2258e730ea98a585a7acde1669f8e9c57a8240779f8ae79112c1f459628171
 AUX lvmroot/mtab 713 RMD160 0d20da9702f47582e0b26cb81da6912a3dd008a5 SHA1 cefc750a24a4b55114c2482310ce10bb93ce2c76 SHA256 0edc5d3656174c228b8a961305a26b4cd3481ae41dc4dc55918bed3c6f8a0b5a
 AUX lvmroot/rebuild-initrd 64 RMD160 1e552145402fa7e3da14a6b78a237f4bd32a222e SHA1 6b9be43f578cfb283735ce91318afbea024dcc6a SHA256 0c51117369e8b65d74d3a6a4c79164e2d359d727267d6e1ca831123a847a8011
 AUX restart/acpid 26 RMD160 8cfc0166085c906033ec644ca539717b393e5a72 SHA1 2dc489949373231ca3c5e68e3a3bde4d63d34c00 SHA256 50abc8abc84d1837795a7db062baa2d0e5fea2160993c4f9cb442f3edc8c41e7
@@ -50,4 +50,4 @@ AUX weekly-distclean-exec-eclean.cron 40 RMD160 3c0f801ebbb3e575590aa7764e5020a8
 AUX weekly-distclean-exec.cron 664 RMD160 af55d070f6f442feedbfb7a324ccaa5ceff53037 SHA1 76f91d4eac90a44f3d9e636640279d1754f2739e SHA256 98808e9a3402beea0f023db32cd09df6195d608256672e01d7f05e21536af141
 AUX write-new-updates 108 RMD160 1eccc342427d7c6523f23f8d7bd4bf2966638cb2 SHA1 8886bae7ac2c2f01c6cbd47ffcaa15ffcc210214 SHA256 b910f8d64a069e8038965c1c8af3bf05729f027e2da264cd6e0fa2ea627ec164
 EBUILD miller-base-7-r2.ebuild 3018 RMD160 e25aff842a0bd512890914e2c56b038bb377e3ab SHA1 b9a9fef1092339035b546e5c8eefad9825fdae9d SHA256 6035d0bc20312ed8b941cea3a18f2917bc5144f9f822c944fcd8d0572b3d1d52
-EBUILD miller-base-8.ebuild 3433 RMD160 0d8a50ed45e7e502875388ca76b79dacf29ee112 SHA1 21d8e1a2ad6826ee2b3a3c554e7766ca10d61b71 SHA256 edd3cee1f96edc088efb1a3a6e0873f372feba2527e17065cf89ae2babc3a8fc
+EBUILD miller-base-8-r1.ebuild 3497 RMD160 f89f04b35435a9bc72d5f79a05cf9d420dcfda26 SHA1 ea8adfd6cd512591bc25f4c0d451d49c238abb62 SHA256 444f4aa070be230b89a846b7f44b7affe7ec4f85f52a3428baab7294b0318fa7
diff --git a/virtual/miller-base/files/lvmroot/initrd.list b/virtual/miller-base/files/lvmroot/initrd.list
index 435f913..d9d3f75 100644
--- a/virtual/miller-base/files/lvmroot/initrd.list
+++ b/virtual/miller-base/files/lvmroot/initrd.list
@@ -34,25 +34,13 @@ nod dev/zero 0600 0 0 c 1 5
 nod dev/mem 0600 0 0 c 1 1
 nod dev/fb0 0660 0 0 c 29 0
 nod dev/urandom 0600 0 0 c 1 9
-file lib/libpam_misc.so.0 /lib/libpam_misc.so.0 0755 0 0
-file lib/libdl.so.2 /lib/libdl.so.2 0755 0 0
-file lib/librt.so.1 /lib/librt.so.1 0755 0 0
-file lib/libdevmapper-event.so.1.02 /lib/libdevmapper-event.so.1.02 0755 0 0
-file lib/libdevmapper.so.1.02 /lib/libdevmapper.so.1.02 0755 0 0
-file lib/libpthread.so.0 /lib/libpthread.so.0 0755 0 0
-file lib/libm.so.6 /lib/libm.so.6 0755 0 0
-file lib/libc.so.6 /lib/libc.so.6 0755 0 0
-file lib/libpam.so.0 /lib/libpam.so.0 0755 0 0
-file lib/libncurses.so.5 /lib/libncurses.so.5 0755 0 0
-file lib/libreadline.so.6 /lib/libreadline.so.6 0755 0 0
-file lib/ld-linux.so.2 /lib/ld-linux.so.2 0755 0 0
 file sbin/tuxoniceui_fbsplash /sbin/tuxoniceui_fbsplash 0755 0 0
 file sbin/tuxoniceui_text /sbin/tuxoniceui_text 0755 0 0
 file sbin/v86d /sbin/v86d 0755 0 0
+file sbin/lvm /sbin/lvm.static 0755 0 0
+file bin/busybox /bin/busybox.static 0754 0 0
 file init init 0755 0 0
 file etc/mtab mtab 0644 0 0
-file bin/busybox /bin/busybox 0754 0 0
-file sbin/lvm /sbin/lvm 0755 0 0
 slink bin/ls /bin/busybox 0755 0 0
 slink bin/find /bin/busybox 0755 0 0
 slink bin/mount /bin/busybox 0755 0 0
diff --git a/virtual/miller-base/files/lvmroot/makefile b/virtual/miller-base/files/lvmroot/makefile
index 509df7a..b14f52e 100644
--- a/virtual/miller-base/files/lvmroot/makefile
+++ b/virtual/miller-base/files/lvmroot/makefile
@@ -1,7 +1,7 @@
 initrd.cpio.lzma : initrd.cpio.gz makefile init
 	gunzip -c $< | lzma -9 > $@
 
-initrd.cpio.gz : initrd.list makefile init
+initrd.cpio.gz : initrd.list makefile init /usr/src/linux/usr/gen_init_cpio
 	/usr/src/linux/usr/gen_init_cpio $< > $@
 	/usr/sbin/splash_geninitramfs -a $@ -r 1280x1024 livecd-2007.0 --no8bpp
 
diff --git a/virtual/miller-base/miller-base-8.ebuild b/virtual/miller-base/miller-base-8-r1.ebuild
index 380220b..0120928 100644
--- a/virtual/miller-base/miller-base-8.ebuild
+++ b/virtual/miller-base/miller-base-8-r1.ebuild
@@ -22,7 +22,13 @@ DEPEND="
 		net-fs/samba-client
 		net-fs/samba[smbclient] ) )
 	xfs? ( sys-fs/xfsdump )
-	sys-fs/lvm2
+	!lvmroot? ( sys-fs/lvm2 )
+	lvmroot? (
+			sys-fs/lvm2[static]
+			busybox[static]
+			sys-apps/v86d
+			sys-apps/tuxonice-userui[fbsplash]
+			)
 	>=app-portage/gentoolkit-0.2.1
 	sys-process/vixie-cron
 	!minimal? ( sys-apps/eject )