From f50a7909bc927fa7af0a46690c074fa550097be6 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 8 Jan 2010 16:55:07 +0000 Subject: Do not shut down network interfaces when we shut down; closes bug #278535. Package-Manager: portage-2.2_rc61/cvs/Linux i686 --- sys-apps/sysvinit/ChangeLog | 11 +++- sys-apps/sysvinit/Manifest | 14 ++---- sys-apps/sysvinit/files/inittab-2.87 | 59 ++++++++++++++++++++++ sys-apps/sysvinit/sysvinit-2.87-r2.ebuild | 83 +++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 13 deletions(-) create mode 100644 sys-apps/sysvinit/files/inittab-2.87 create mode 100644 sys-apps/sysvinit/sysvinit-2.87-r2.ebuild (limited to 'sys-apps/sysvinit') diff --git a/sys-apps/sysvinit/ChangeLog b/sys-apps/sysvinit/ChangeLog index 079b474b0a04..cd406e6bb3eb 100644 --- a/sys-apps/sysvinit/ChangeLog +++ b/sys-apps/sysvinit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/sysvinit -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.65 2009/11/11 21:51:27 vapier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/ChangeLog,v 1.66 2010/01/08 16:55:06 williamh Exp $ + +*sysvinit-2.87-r2 (08 Jan 2010) + + 08 Jan 2010; William Hubbs +files/inittab-2.87, + +sysvinit-2.87-r2.ebuild: + Do not shut down network interfaces when we shut down. + This closes bug #278535. *sysvinit-2.87-r1 (11 Nov 2009) diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 1f8e1909a420..a1717fbea413 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 2.86-gentoo.patch 641 RMD160 9e3f9ace9e58c3352f536649491a8a5b3f89e512 SHA1 d5bd112a171285768f5618e530cab5d22f7b6f55 SHA256 6edd083b1b09b75f76b75fc299e2ddab7344a0df8f212e3cd86f27c44caa8c01 AUX 2.86-selinux-1.patch 2628 RMD160 e17994e12ea022c5f7d8a80345fb2d3265f7044d SHA1 0057c3fec271ab8e56210e1182c5c1b5b037836a SHA256 a70ba499bdc3598fc18d0911ff32757356db353ebdd5d9f6a69aaf1ed277254f AUX 2.86-selinux.patch 6525 RMD160 b50310333e3c7da300daadddee6135471b0a07ee SHA1 72bf861751567f47b66154102b4bbbee2e18b414 SHA256 ccf4aecf38732569bc41feaa0dcb4abc21009f8d7a21a3bc402132f5ef7f88f8 @@ -8,6 +5,7 @@ AUX change_console.8 657 RMD160 03a46941d92dd280d92252f83f58273353c0b7bb SHA1 24 AUX change_console.c 929 RMD160 168c97e47c6dae4f378b4ae13040156fad2a75db SHA1 5fb2a3ca5faaf15ee8c9f97a169771f15fd4500c SHA256 1e61b16274dee6f27ae69db13aff9230195feb6719f650dad027520503ea69b4 AUX inittab 1645 RMD160 d0e2122734b8a9574519012a9a970aefd8cb2de1 SHA1 d6e3071cf30e30238c30f18179107df61e620829 SHA256 5471f187bbfc56ad2d5b4d9a49edb5c77e627f3290a591d49f783a10cdd48e66 AUX inittab-2.86-r12 1893 RMD160 daea3482f3754c1311a24bf4e3864ba980596a6f SHA1 a6f9a4bfd0184c4a77ade518c81b169b3f21a53f SHA256 621ae4514773b72a535db4b7cd17d72c6a82564fae8e975d21b582e1e3279c9c +AUX inittab-2.87 1890 RMD160 ee4dcba9b3c3541905950f1cd5deb74163aab784 SHA1 03af334e70d50511b2de5d25278d3f1673d2e8ee SHA256 fff7016910c9e2aa29e2c4ed76f371723196e3122a4f9f744274f4993ea1a733 AUX reboot.sh 304 RMD160 bbc92c46217361abfa9ca6842e206e818959886b SHA1 2515f89492a9d225abfdd9f99fb674a8dbb66629 SHA256 967fa572014ac6dd69f5e7e24d5250abad9c20c644563b927b295778608cafef AUX shutdown.sh 385 RMD160 5038d76195793b9996429f216fe9d4cd597b7725 SHA1 074471c08e01bfaa32bff4e6745795cf35794bef SHA256 2cc84a5194a949f16a82c6215459f4bf6d8156e50d8d9130d310f085bb208d4c AUX sysvinit-2.86-POSIX-1003.1e.patch 1358 RMD160 a4e22a9c6c13373c0196aeb7c274e05bc0ea552f SHA1 878078b0b3c7a5090d19588085d91ba6bf749d8d SHA256 73729ddfae95826bf6f3e7f1bf0da53c8647d24126fb7a307020f5a5fa8bff04 @@ -26,13 +24,7 @@ DIST sysvinit_2.87dsf.orig.tar.gz 106102 RMD160 69d4bc75ee55a23f650f7bfc7beb5b04 EBUILD sysvinit-2.86-r10.ebuild 2988 RMD160 195322b20d7cc3a1e6013611339de5b8ab5d051b SHA1 70d73bf765c3343fe8801c2d32a7ec73674fde43 SHA256 1f59adbcace2e2562322bcdc624d9417dcf1302b4af31727a9e82f0f0a943246 EBUILD sysvinit-2.86-r12.ebuild 3015 RMD160 3beb1e67a75bcdb9521dd85fcf1383768c53ce45 SHA1 0ca70ab79dd5dbb0783762d38b0a3003529cabfa SHA256 09dceab4de1e947c24981da5d547ffa5b7120745951a62f5326e0fc0ee9bc575 EBUILD sysvinit-2.87-r1.ebuild 2677 RMD160 c38d07f237e8568bf7d135456d932c0b0d745795 SHA1 a95539833aee1640e92bec87ce176a9b5e5f142b SHA256 dec3610793dd5c72d2556f25464f7fe481dc0dd256e61c29ccf4d0ddb3d40952 +EBUILD sysvinit-2.87-r2.ebuild 2676 RMD160 651fd79455f0a98c2af96731092cd3d684c562fb SHA1 18a1bc77d3ac2a25eb2870e858f014c0997734fd SHA256 52b25a9342c6ed25549ee81d749c1f9fd346a907c1240c57d8d53204cf47a309 EBUILD sysvinit-2.87.ebuild 2674 RMD160 5ff2d304bac066f754966caa2524c3e26acaab15 SHA1 67154cf694f2e7dc3ca47af0e8e2ccdc29f5bd2d SHA256 653a6dfffa453fbba2affda4b69870d69e2e6f75b5370f48ab3646a97bddee5d -MISC ChangeLog 9718 RMD160 dfc23680310fca845e0249f9e8835e6804d05504 SHA1 0b7f62e1b21397187794c0aab6e30442d693cad5 SHA256 c6b086cd32376e3c28073db7bd35b49a88b1edcd49fd29f92e5ca146d6d40bd1 +MISC ChangeLog 9938 RMD160 0eae80ceb8101969e3ab55f0737de7e360bfc79f SHA1 17e8f7461ea3d233647b8055e76ce37aa4229cbb SHA256 b227d2270bcc208b2e64ee7766d8cf0809a7ef84d3f21e8ab799095ce410f2c5 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) - -iEYEARECAAYFAkr7MmoACgkQlPl3HsVfCDrp7QCeJpZlDBXBX297di6V6ZGZBckV -GuQAni/T+HeKomGSUc/Qoy14BIWCPAB4 -=PKPs ------END PGP SIGNATURE----- diff --git a/sys-apps/sysvinit/files/inittab-2.87 b/sys-apps/sysvinit/files/inittab-2.87 new file mode 100644 index 000000000000..a6a04f371629 --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.87 @@ -0,0 +1,59 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, +# Modified by: Patrick J. Volkerding, +# Modified by: Daniel Robbins, +# Modified by: Martin Schlemmer, +# Modified by: Mike Frysinger, +# Modified by: Robin H. Johnson, +# +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/files/inittab-2.87,v 1.1 2010/01/08 16:55:07 williamh Exp $ + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/rc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/rc boot + +l0:0:wait:/sbin/rc shutdown +l0s:0:wait:/sbin/halt -dhp +l1:1:wait:/sbin/rc single +l2:2:wait:/sbin/rc nonetwork +l3:3:wait:/sbin/rc default +l4:4:wait:/sbin/rc default +l5:5:wait:/sbin/rc default +l6:6:wait:/sbin/rc reboot +l6r:6:wait:/sbin/reboot -dk +#z6:6:respawn:/sbin/sulogin + +# new-style single-user +su0:S:wait:/sbin/rc single +su1:S:wait:/sbin/sulogin + +# TERMINALS +c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh + diff --git a/sys-apps/sysvinit/sysvinit-2.87-r2.ebuild b/sys-apps/sysvinit/sysvinit-2.87-r2.ebuild new file mode 100644 index 000000000000..758ced8d4e25 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.87-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysvinit/sysvinit-2.87-r2.ebuild,v 1.1 2010/01/08 16:55:06 williamh Exp $ + +inherit eutils toolchain-funcs flag-o-matic + +PATCH_VER="1" +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="http://freshmeat.net/projects/sysvinit/" +SRC_URI="mirror://debian/pool/main/s/sysvinit/${PN}_${PV}dsf.orig.tar.gz + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" +F="ftp://ftp.cistron.nl/pub/people/miquels/software/${P}.tar.gz + ftp://sunsite.unc.edu/pub/Linux/system/daemons/init/${P}.tar.gz + http://www.gc-linux.org/down/isobel/kexec/sysvinit/sysvinit-2.86-kexec.patch" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="selinux ibm static kernel_FreeBSD" + +RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )" +DEPEND="${RDEPEND} + virtual/os-headers" + +S=${WORKDIR}/${P}dsf + +src_unpack() { + unpack ${A} + cd "${S}" + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches + sed -i '/^STRIP/s|=.*|=:|' src/Makefile + + # Mung inittab for specific architectures + cd "${WORKDIR}" + cp "${FILESDIR}"/inittab-${PV} inittab || die "cp inittab" + local insert="" + use ppc && insert='#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' + use arm && insert='#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' + use hppa && insert='b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' + use s390 && insert='s0:12345:respawn:/sbin/agetty 38400 console' + if use ibm ; then + insert="${insert}#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0"$'\n' + insert="${insert}#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0" + fi + (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab + if use kernel_FreeBSD ; then + sed -i \ + -e 's/linux/cons25/g' \ + -e 's/ttyS0/cuaa0/g' \ + -e 's/ttyS1/cuaa1/g' \ + inittab #121786 + fi + [[ -n ${insert} ]] && echo "# Architecture specific features"$'\n'"${insert}" >> inittab +} + +src_compile() { + tc-export CC + use static && append-ldflags -static + emake -C src || die +} + +src_install() { + emake -C src \ + install \ + ROOT="${D}" \ + || die "make install" + dodoc README doc/* + + insinto /etc + doins "${WORKDIR}"/inittab || die "inittab" + + doinitd "${FILESDIR}"/{reboot,shutdown}.sh || die +} + +pkg_postinst() { + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ ${ROOT} == / ]] ; then + # Do not return an error if this fails + /sbin/telinit U &>/dev/null + fi +} -- cgit v1.2.3-65-gdbad