From c1fb290433468eae70b5e25d3477b057d2b305e3 Mon Sep 17 00:00:00 2001 From: randomdan Date: Fri, 30 Apr 2010 21:12:27 +0000 Subject: Proper umount of initrd with switch_root --- virtual/miller-base/Manifest | 8 +- virtual/miller-base/files/lvmroot/init | 5 +- virtual/miller-base/files/lvmroot/initrd.list | 2 + virtual/miller-base/files/lvmroot/makefile | 4 +- virtual/miller-base/miller-base-8-r3.ebuild | 119 -------------------------- virtual/miller-base/miller-base-8-r4.ebuild | 119 ++++++++++++++++++++++++++ 6 files changed, 129 insertions(+), 128 deletions(-) delete mode 100644 virtual/miller-base/miller-base-8-r3.ebuild create mode 100644 virtual/miller-base/miller-base-8-r4.ebuild diff --git a/virtual/miller-base/Manifest b/virtual/miller-base/Manifest index b1e180c..902c50a 100644 --- a/virtual/miller-base/Manifest +++ b/virtual/miller-base/Manifest @@ -3,9 +3,9 @@ AUX auto-restart-services 247 RMD160 8dabc50278db05a7ec2d1dc85d6ede0e92534303 SH AUX auto-update-overlays 25 RMD160 7c8c5594cfd401e8b38b4ae4df07f17f4c4415a4 SHA1 89423a378ba04e2615ea8bdf04e201d730392e74 SHA256 98ce8786c0fb1612bb1778a2ee0aea88728b7d74929650a5b249bc0e05d3abdd 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 435 RMD160 83b1265f28a523835c9918e3671d2ddb7fd56f9a SHA1 d96fc5b7eed31fd44e9064693fb44dd1b1f3ced1 SHA256 95c9d6895d7c2d72b8a29d9dca1d99af8b5d020807686b2eaded15e4239d4716 -AUX lvmroot/initrd.list 2009 RMD160 3a4167c07e119e55cd3c36138b4da2a55cafa134 SHA1 00c92cf0c2dc18e4cf9ee595d6b03ae633974a69 SHA256 c6b3a8a3fcbb86f7d55ffeb2df0a897456bce87a5ca93b6a2596dcc08631abea -AUX lvmroot/makefile 742 RMD160 690598080f9f318391fbde660ab795b0000f5cc9 SHA1 2710cda930b655b80de6de43d5e0aaeddb67a819 SHA256 1fef3892489db9ddf00505766e1e95970e68bb3754efc3b5af7b57a78464d712 +AUX lvmroot/init 475 RMD160 5d1909b4f0993c098a51b2b1445be3ec54a551dc SHA1 7426314cb1e65e6f581a3de04a6854cb1af03750 SHA256 5d111fef9762050acd13d8b35acc53d42ae90aca39cfabb9d156ed1ad3eeb396 +AUX lvmroot/initrd.list 2098 RMD160 0b79e6302754534958e24ae5d41c01498ad439c2 SHA1 c819ef00dda878b0181472a727edcd82fa6442e1 SHA256 2f640cd00664d2aeb992e2733f36d49fa302b3edba37d58ac151f83ea6603f7c +AUX lvmroot/makefile 831 RMD160 74ed53a1e53aeab712b801451b451c73ed3adf1f SHA1 b8192d04eab2c305e8f490edc051e03dfa85370b SHA256 c2dac31ca3992c776f8437b9ee0aab5308c0adce7357345b157e4594d1639655 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-r3.ebuild 3570 RMD160 3f5def27662e30580a82d09b298a584717d822c9 SHA1 24e6310b359e334daa13fdab9319679eb6fa6fa7 SHA256 c20f54da8c820b6fa0bd841345f5817077e10bd1b2dfb05a4f0f6a03f054e4bb +EBUILD miller-base-8-r4.ebuild 3570 RMD160 3f5def27662e30580a82d09b298a584717d822c9 SHA1 24e6310b359e334daa13fdab9319679eb6fa6fa7 SHA256 c20f54da8c820b6fa0bd841345f5817077e10bd1b2dfb05a4f0f6a03f054e4bb diff --git a/virtual/miller-base/files/lvmroot/init b/virtual/miller-base/files/lvmroot/init index 6921b5e..d0b32f0 100755 --- a/virtual/miller-base/files/lvmroot/init +++ b/virtual/miller-base/files/lvmroot/init @@ -7,13 +7,12 @@ mount -n -t tmpfs tmpfs /dev/data CMDLINE=`cat /proc/cmdline` vgchange -ay -echo > /sys/power/tuxonice/do_resume +[ -e /sys/power/tuxonice/do_resume ] && 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 /sys umount /proc -exec chroot . /bin/sh -c "exec /sbin/init ${CMDLIND}" dev/console 2>&1 +exec switch_root /newroot /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 3a2b512..7e0d5e7 100644 --- a/virtual/miller-base/files/lvmroot/initrd.list +++ b/virtual/miller-base/files/lvmroot/initrd.list @@ -63,6 +63,8 @@ slink bin/cat /bin/busybox 0755 0 0 slink bin/choot /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 +slink sbin/switch_root /bin/busybox 0755 0 0 slink sbin/pvscan /sbin/lvm 0755 0 0 slink sbin/vgscan /sbin/lvm 0755 0 0 slink sbin/vgchange /sbin/lvm 0755 0 0 diff --git a/virtual/miller-base/files/lvmroot/makefile b/virtual/miller-base/files/lvmroot/makefile index 9abdcc3..47f2773 100644 --- a/virtual/miller-base/files/lvmroot/makefile +++ b/virtual/miller-base/files/lvmroot/makefile @@ -2,8 +2,8 @@ initrd.cpio.lzma : initrd.cpio.gz makefile init gunzip -c $< | lzma -9 > $@ 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 `fbres` livecd-2007.0 --no8bpp + /usr/src/linux/usr/gen_init_cpio $< | gzip -1 > $@ + [ ! -c /dev/fb0 -o ! -x /sbin/fbres -o ! -x /usr/sbin/splash_geninitramfs ] || /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-r3.ebuild b/virtual/miller-base/miller-base-8-r3.ebuild deleted file mode 100644 index 2483382..0000000 --- a/virtual/miller-base/miller-base-8-r3.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-r4.ebuild b/virtual/miller-base/miller-base-8-r4.ebuild new file mode 100644 index 0000000..2483382 --- /dev/null +++ b/virtual/miller-base/miller-base-8-r4.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