From 1704f5d6c0584dc6fcdca1da6161de511f04c3bc Mon Sep 17 00:00:00 2001 From: randomdan Date: Wed, 28 Apr 2010 17:31:07 +0000 Subject: Support tuxonice resume and use fbres to build right images in --- virtual/miller-base/files/lvmroot/init | 6 +- virtual/miller-base/files/lvmroot/initrd.list | 2 +- virtual/miller-base/files/lvmroot/makefile | 2 +- virtual/miller-base/miller-base-8-r2.ebuild | 119 -------------------------- virtual/miller-base/miller-base-8-r3.ebuild | 119 ++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 virtual/miller-base/miller-base-8-r2.ebuild create mode 100644 virtual/miller-base/miller-base-8-r3.ebuild diff --git a/virtual/miller-base/files/lvmroot/init b/virtual/miller-base/files/lvmroot/init index e1036e9..6921b5e 100755 --- a/virtual/miller-base/files/lvmroot/init +++ b/virtual/miller-base/files/lvmroot/init @@ -1,19 +1,19 @@ #!/bin/sh mount -n -t proc proc /proc -mount -n -t sysfs sysfs /sysfs +mount -n -t sysfs sysfs /sys mount -n -t tmpfs tmpfs /dev/mapper mount -n -t tmpfs tmpfs /dev/data CMDLINE=`cat /proc/cmdline` vgchange -ay - +echo > /sys/power/tuxonice/do_resume mount -n -r -t ext4 /dev/mapper/data-root /newroot || lvm cd /newroot umount /dev/mapper umount /dev/data -umount /sysfs +umount /sys umount /proc exec chroot . /bin/sh -c "exec /sbin/init ${CMDLIND}" dev/console 2>&1 diff --git a/virtual/miller-base/files/lvmroot/initrd.list b/virtual/miller-base/files/lvmroot/initrd.list index a8a1741..3a2b512 100644 --- a/virtual/miller-base/files/lvmroot/initrd.list +++ b/virtual/miller-base/files/lvmroot/initrd.list @@ -11,7 +11,7 @@ dir etc/lvm/backup 0755 0 0 dir proc 0755 0 0 dir newroot 0755 0 0 dir lib 0755 0 0 -dir sysfs 0755 0 0 +dir sys 0755 0 0 dir sbin 0755 0 0 nod dev/hda 0600 0 0 b 3 0 nod dev/hda1 0600 0 0 b 3 1 diff --git a/virtual/miller-base/files/lvmroot/makefile b/virtual/miller-base/files/lvmroot/makefile index 8ea7d2c..9abdcc3 100644 --- a/virtual/miller-base/files/lvmroot/makefile +++ b/virtual/miller-base/files/lvmroot/makefile @@ -3,7 +3,7 @@ initrd.cpio.lzma : initrd.cpio.gz 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 + /usr/sbin/splash_geninitramfs -a $@ -r `fbres` livecd-2007.0 --no8bpp initrd.deps.mk : initrd.list makefile /usr/src/linux/usr/gen_init_cpio echo -n 'initrd.cpio.gz : ' > $@ diff --git a/virtual/miller-base/miller-base-8-r2.ebuild b/virtual/miller-base/miller-base-8-r2.ebuild deleted file mode 100644 index 2483382..0000000 --- a/virtual/miller-base/miller-base-8-r2.ebuild +++ /dev/null @@ -1,119 +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 -minimal autoupdate autoshutdown autoservicerestart lvmroot" - -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[smbclient] ) ) - xfs? ( sys-fs/xfsdump ) - !lvmroot? ( sys-fs/lvm2 ) - lvmroot? ( - sys-fs/lvm2[static] - sys-apps/busybox[static] - sys-apps/v86d - sys-apps/tuxonice-userui[fbsplash] - ) - >=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 ) - dev-util/cvs - !minimal? ( x11-apps/xauth ) - sys-process/lsof - app-portage/layman[subversion] - app-admin/syslog-ng - app-admin/logrotate - !minimal? ( app-antivirus/clamav ) - !hardened? ( 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-apps/kexec-tools - 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 - 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-r3.ebuild b/virtual/miller-base/miller-base-8-r3.ebuild new file mode 100644 index 0000000..2483382 --- /dev/null +++ b/virtual/miller-base/miller-base-8-r3.ebuild @@ -0,0 +1,119 @@ +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 +minimal autoupdate autoshutdown autoservicerestart lvmroot" + +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[smbclient] ) ) + xfs? ( sys-fs/xfsdump ) + !lvmroot? ( sys-fs/lvm2 ) + lvmroot? ( + sys-fs/lvm2[static] + sys-apps/busybox[static] + sys-apps/v86d + sys-apps/tuxonice-userui[fbsplash] + ) + >=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 ) + dev-util/cvs + !minimal? ( x11-apps/xauth ) + sys-process/lsof + app-portage/layman[subversion] + app-admin/syslog-ng + app-admin/logrotate + !minimal? ( app-antivirus/clamav ) + !hardened? ( 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-apps/kexec-tools + 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 + 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