From 2d6f65723d03ccc744392e1bf20ede30ff8b5d9b Mon Sep 17 00:00:00 2001 From: randomdan Date: Mon, 16 Aug 2010 17:47:54 +0000 Subject: Add some bits to initrd.list to solve the mystery of how it's ever worked --- virtual/miller-base/Manifest | 4 +- virtual/miller-base/files/lvmroot/initrd.list | 4 +- virtual/miller-base/miller-base-8-r7.ebuild | 130 -------------------------- virtual/miller-base/miller-base-8-r8.ebuild | 130 ++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 133 deletions(-) delete mode 100644 virtual/miller-base/miller-base-8-r7.ebuild create mode 100644 virtual/miller-base/miller-base-8-r8.ebuild (limited to 'virtual/miller-base') diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index 93448de..f45ef3e 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -4,7 +4,7 @@ AUX auto-update-overlays 25 RMD160 7c8c5594cfd401e8b38b4ae4df07f17f4c4415a4 SHA1 AUX daily-av-update.cron 31 RMD160 17399a1386d96221b51960ec38c7059af01c609e SHA1 e4ef1c8f4d2195229da18b4d23b8a42e9b61afe8 SHA256 1b83ac59e56ffbc3ec1c0f42c3c43de2b0cf9485690292a7dcb3440d529d0f78 AUX hourly-distclean-updatedb.cron 940 RMD160 f6f420a2da2588be0f5ba47c3c887a403002fce0 SHA1 f5626fcddd829d6bfa75bb132e2644162548f9d2 SHA256 ce2ec02cd3a9b1af3df6f7eba15dedb1b4ca8b224fc68431a9afc1a76702c0c6 AUX lvmroot/init 475 RMD160 5d1909b4f0993c098a51b2b1445be3ec54a551dc SHA1 7426314cb1e65e6f581a3de04a6854cb1af03750 SHA256 5d111fef9762050acd13d8b35acc53d42ae90aca39cfabb9d156ed1ad3eeb396 -AUX lvmroot/initrd.list 1941 RMD160 a4f208bca30368acdccd02d62954416d925f7a10 SHA1 3febf0d83fa8c86a75deb17f5a10218f1c149ff8 SHA256 fed8d53011a92e0eb772e16eceefabea8636b4ce139b05eebe595bdb4877e8c9 +AUX lvmroot/initrd.list 2015 RMD160 ae7e9471ed35a0bf73b4469d668cde4016ae6dea SHA1 9f5ac312718b98f7dc78cf974e3bb4f680d30bd2 SHA256 7520da72c31b2774b84954b087c414a05a6e56e0429fc402639672446e48374f AUX lvmroot/initrd.list.icefb 65 RMD160 db0adb727387428cc9692da7e7f2f5798fd1846b SHA1 bb06204c7e811130f1e5d6dbed00eb76cfd9a30b SHA256 6bca253e53621a0acc6ac27568c20b429cac6938054d947684b2d44940e7dcc1 AUX lvmroot/initrd.list.icetext 57 RMD160 667c7999bd84c1cb64a1000dc94c74bd1bf9168f SHA1 a085a7fa4b61b8b82de6c86d39f687d3ff8bae9c SHA256 522185c1223fa71c0864ebcbb3b64592c53a353053086169daf2b8504f87247f AUX lvmroot/initrd.list.v86d 35 RMD160 a35c77a5351bdbc6aac2cb7ab8c2eb9aa2bb4909 SHA1 45e219fbb6b37bbf4097bb940acfa3820beac4bf SHA256 90bed474cd395ae7572ffd5acd807e6a961ff97c32e99c12472afd6e72959aad @@ -53,4 +53,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-r4.ebuild 3017 RMD160 0d6568da794e92b6f541194a44f1d654f7fd9de4 SHA1 9fcbe35f03ca0344fcc8c0b4421eb4aaf51f835f SHA256 a3d4868d450d1a0b54f0a79fb9e017aa6ca56ae70e93c453c659f4f1ca717ddc -EBUILD miller-base-8-r7.ebuild 4026 RMD160 00917d1efe0c7d8b16cbfde51e7eb260f8ad5038 SHA1 b5c68bf00210a82ae820ace5a417dae5ee0e9c91 SHA256 e01fd60ae26d2c56f41a3fc6a6764e8179c85aa0cfc9c350bb5528334c02f960 +EBUILD miller-base-8-r8.ebuild 4026 RMD160 00917d1efe0c7d8b16cbfde51e7eb260f8ad5038 SHA1 b5c68bf00210a82ae820ace5a417dae5ee0e9c91 SHA256 e01fd60ae26d2c56f41a3fc6a6764e8179c85aa0cfc9c350bb5528334c02f960 diff --git a/virtual/miller-base/files/lvmroot/initrd.list b/virtual/miller-base/files/lvmroot/initrd.list index efc7b65..6079ebd 100644 --- a/virtual/miller-base/files/lvmroot/initrd.list +++ b/virtual/miller-base/files/lvmroot/initrd.list @@ -53,11 +53,13 @@ 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 +slink bin/[ /bin/busybox 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 +slink bin/umount /bin/busybox 0755 0 0 slink bin/cat /bin/busybox 0755 0 0 -slink bin/choot /bin/busybox 0755 0 0 +slink bin/chroot /bin/busybox 0755 0 0 slink bin/switch_root /bin/busybox 0755 0 0 slink bin/sh /bin/busybox 0755 0 0 slink sbin/pivot_root /bin/busybox 0755 0 0 diff --git a/virtual/miller-base/miller-base-8-r7.ebuild b/virtual/miller-base/miller-base-8-r7.ebuild deleted file mode 100644 index dc164e1..0000000 --- a/virtual/miller-base/miller-base-8-r7.ebuild +++ /dev/null @@ -1,130 +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 -video_cards_nvidia" - -DEPEND=" - !minimal? ( www-servers/apache ) - sys-cluster/glusterfs - sys-apps/inotail - 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-fs/lvm2[static] - sys-apps/busybox[static] - ) - video_cards_nvidia? ( sys-apps/v86d ) - sw-suspend? ( sys-apps/tuxonice-userui ) - >=app-portage/gentoolkit-0.2.1 - sys-process/vixie-cron - !minimal? ( sys-apps/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-kernel/tuxonice-sources ) ) - hardened? ( sys-kernel/hardened-sources ) - !minimal? ( || - ( app-text/dos2unix =app-text/dos2unix-5 !app-text/unix2dos ) ) - app-misc/screen - lvmroot? ( >=sys-boot/grub-1.98 ) - 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-8-r8.ebuild b/virtual/miller-base/miller-base-8-r8.ebuild new file mode 100644 index 0000000..dc164e1 --- /dev/null +++ b/virtual/miller-base/miller-base-8-r8.ebuild @@ -0,0 +1,130 @@ +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 +video_cards_nvidia" + +DEPEND=" + !minimal? ( www-servers/apache ) + sys-cluster/glusterfs + sys-apps/inotail + 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-fs/lvm2[static] + sys-apps/busybox[static] + ) + video_cards_nvidia? ( sys-apps/v86d ) + sw-suspend? ( sys-apps/tuxonice-userui ) + >=app-portage/gentoolkit-0.2.1 + sys-process/vixie-cron + !minimal? ( sys-apps/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-kernel/tuxonice-sources ) ) + hardened? ( sys-kernel/hardened-sources ) + !minimal? ( || + ( app-text/dos2unix =app-text/dos2unix-5 !app-text/unix2dos ) ) + app-misc/screen + lvmroot? ( >=sys-boot/grub-1.98 ) + 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 +} -- cgit v1.2.3