--- /dev/null
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre10-r1.ebuild,v 1.1 2005/11/10 16:11:13 uberlord Exp $
+
+inherit flag-o-matic eutils toolchain-funcs multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+ http://dev.gentoo.org/~uberlord/baselayout/${P}.tar.bz2
+ http://dev.gentoo.org/~azarah/baselayout/${P}.tar.bz2
+ http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bootstrap build static unicode"
+
+# This version of baselayout needs gawk in /bin, but as we do not have
+# a c++ compiler during bootstrap, we cannot depend on it if "bootstrap"
+# or "build" are in USE.
+RDEPEND=">=sys-apps/sysvinit-2.84
+ !build? ( !bootstrap? (
+ >=sys-libs/readline-5.0-r1
+ >=app-shells/bash-3.0-r10
+ >=sys-apps/coreutils-5.2.1
+ ) )"
+DEPEND="virtual/os-headers
+ >=sys-apps/portage-2.0.51"
+PROVIDE="virtual/baselayout"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # Fix bugs 112031, 112049
+ # Allows wpa_supplicant to specify config file and --pidfile
+ epatch "${FILESDIR}/${P}-svn-1611.patch"
+
+ # Setup unicode defaults for silly unicode users
+ if use unicode ; then
+ sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
+ fi
+
+ # Tweak arch-specific details
+ cd "${S}"
+
+ case $(tc-arch) in
+ sparc)
+ sed -i -e '/^KEYMAP=/s:us:sunkeymap:' etc/conf.d/keymaps || die
+ ;;
+ esac
+
+ # Use correct path to filefuncs.so on multilib systems
+ sed -i -e "s:/lib/rcscripts:/$(get_libdir)/rcscripts:" \
+ ${S}/src/awk/{cachedepends,genenviron}.awk || die
+}
+
+src_compile() {
+ local libdir="lib"
+
+ use static && append-ldflags -static
+
+ [[ ${SYMLINK_LIB} == "yes" ]] && libdir=$(get_abi_LIBDIR "${DEFAULT_ABI}")
+
+ make -C "${S}"/src \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getCC) ${LDFLAGS}" \
+ CFLAGS="${CFLAGS}" \
+ LIBDIR="${libdir}" || die
+}
+
+# ${PATH} should include where to get MAKEDEV when calling this
+# function
+create_dev_nodes() {
+ case $(tc-arch) in
+ # amd64 must use generic-i386 because amd64/x86_64 does not have
+ # a generic option at this time, and the default 'generic' ends
+ # up erroring out, because MAKEDEV internally doesn't know what
+ # to use
+ arm) suffix=-arm ;;
+ alpha) suffix=-alpha ;;
+ amd64) suffix=-i386 ;;
+ hppa) suffix=-hppa ;;
+ ia64) suffix=-ia64 ;;
+ m68k) suffix=-m68k ;;
+ mips) suffix=-mips ;;
+ ppc*) suffix=-powerpc ;;
+ s390) suffix=-s390 ;;
+ sparc*) suffix=-sparc ;;
+ x86) suffix=-i386 ;;
+ esac
+
+ einfo "Using generic${suffix} to make $(tc-arch) device nodes..."
+ MAKEDEV generic${suffix}
+ MAKEDEV sg scd rtc hde hdf hdg hdh input audio video
+}
+
+# This is a temporary workaround until bug 9849 is completely solved
+# in portage. We need to create the directories so they're available
+# during src_install, but when src_install is finished, call unkdir
+# to remove any empty directories instead of leaving them around.
+kdir() {
+ typeset -a args
+ typeset d
+
+ # Create the directories for the remainder of src_install, and
+ # remember how to create the directories later.
+ for d in "$@"; do
+ if [[ $d == /* ]]; then
+ install -d "${args[@]}" "${D}/${d}"
+ cat >> "${D}/usr/share/baselayout/mkdirs.sh" <<EOF
+install -d ${args[@]} "\${ROOT}/${d}" 2>/dev/null \\
+ || ewarn " can't create ${d}"
+touch "\${ROOT}/${d}/.keep" 2>/dev/null \\
+ || ewarn " can't create ${d}/.keep"
+EOF
+ else
+ args=("${args[@]}" "${d}")
+ fi
+ done
+}
+
+# Continued from kdir above... This function removes any empty
+# directories as a temporary workaround for bug 9849. The directories
+# (and .keep files) are re-created in pkg_postinst, which means they
+# aren't listed in CONTENTS, unfortunately.
+unkdir() {
+ einfo "Running unkdir to workaround bug 9849"
+ find "${D}" -depth -type d -exec rmdir {} \; 2>/dev/null
+ if [[ $? == 127 ]]; then
+ ewarn "Problem running unkdir: find command not found"
+ fi
+}
+
+# Same as kdir above, but for symlinks #103618
+ksym() {
+ echo "[[ ! -e ${ROOT}/$2 ]] && { ln -s '$1' '${ROOT}/$2' &> /dev/null || ewarn ' unable to symlink $2 to $1' ; }" \
+ >> "${D}"/usr/share/baselayout/mklinks.sh
+}
+
+src_install() {
+ local dir libdirs libdirs_env rcscripts_dir
+
+ # This directory is to stash away things that will be used in
+ # pkg_postinst; it's needed first for kdir to function
+ dodir /usr/share/baselayout
+
+ # Jeremy Huddleston <eradicator@gentoo.org>
+ # For multilib, we want to make sure that all our multilibdirs exist
+ # and make lib even if it's not listed as one (like on amd64/ppc64
+ # which sometimes has lib32/lib64 instead of lib/lib64).
+ # lib should NOT be a symlink to one of the other libdirs.
+ # Old systems with symlinks won't be affected by this change, as the
+ # symlinks already exist and won't get removed, but new systems will
+ # be setup properly.
+ #
+ # I'll be making a script to convert existing systems from symlink to
+ # nosymlink and putting it in /usr/portage/scripts.
+ libdirs=$(get_all_libdirs)
+ : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass...
+
+ # This should be /lib/rcscripts, but we have to support old profiles too.
+ if [[ ${SYMLINK_LIB} == "yes" ]]; then
+ rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
+ else
+ rcscripts_dir="/lib/rcscripts"
+ fi
+
+ einfo "Creating directories..."
+ kdir /usr
+ kdir /usr/local
+ kdir /boot
+ kdir /dev
+ kdir /dev/pts
+ kdir /dev/shm
+ kdir /etc/conf.d
+ kdir /etc/cron.daily
+ kdir /etc/cron.hourly
+ kdir /etc/cron.monthly
+ kdir /etc/cron.weekly
+ kdir /etc/env.d
+ dodir /etc/init.d # .keep file might mess up init.d stuff
+ kdir /etc/modules.autoload.d
+ kdir /etc/modules.d
+ kdir /etc/opt
+ kdir /home
+ kdir /lib/dev-state
+ kdir /lib/udev-state
+ kdir ${rcscripts_dir}
+ kdir ${rcscripts_dir}/awk
+ kdir ${rcscripts_dir}/sh
+ kdir ${rcscripts_dir}/net.modules.d
+ kdir ${rcscripts_dir}/net.modules.d/helpers.d
+ # Only install /mnt stuff at bootstrap time #88835 / #90022
+ if use build ; then
+ kdir /mnt
+ kdir -m 0700 /mnt/cdrom
+ kdir -m 0700 /mnt/floppy
+ fi
+ kdir /opt
+ kdir -o root -g uucp -m0775 /var/lock
+ kdir /proc
+ kdir -m 0700 /root
+ kdir /sbin
+ kdir /sys # for 2.6 kernels
+ kdir /usr/bin
+ kdir /usr/include
+ kdir /usr/include/asm
+ kdir /usr/include/linux
+ kdir /usr/local/bin
+ kdir /usr/local/games
+ kdir /usr/local/sbin
+ kdir /usr/local/share
+ kdir /usr/local/share/doc
+ kdir /usr/local/share/man
+ kdir /usr/local/src
+ kdir ${PORTDIR}
+ kdir /usr/sbin
+ kdir /usr/share/doc
+ kdir /usr/share/info
+ kdir /usr/share/man
+ kdir /usr/share/misc
+ kdir /usr/src
+ kdir -m 1777 /tmp
+ kdir /var
+ dodir /var/db/pkg # .keep file messes up Portage
+ kdir /var/lib/misc
+ kdir /var/lock/subsys
+ kdir /var/log/news
+ kdir /var/run
+ kdir /var/spool
+ kdir /var/state
+ kdir -m 1777 /var/tmp
+
+ for dir in ${libdirs}; do
+ libdirs_env=${libdirs_env:+$libdirs_env:}/${dir}:/usr/${dir}:/usr/local/${dir}
+ [[ ${dir} == "lib" && ${SYMLINK_LIB} == "yes" ]] && continue
+ kdir /${dir}
+ kdir /usr/${dir}
+ kdir /usr/local/${dir}
+ done
+
+ # Ugly compatibility with stupid ebuilds and old profiles symlinks
+ if [[ ${SYMLINK_LIB} == "yes" ]] ; then
+ rm -r "${D}"/{lib,usr/lib,usr/local/lib} &> /dev/null
+ ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /lib
+ ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/lib
+ ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
+ fi
+
+ # FHS compatibility symlinks stuff
+ ksym /var/tmp /usr/tmp
+ ksym share/man /usr/local/man
+
+ #
+ # Setup files in /etc
+ #
+ insopts -m0644
+ insinto /etc
+ doins -r "${S}"/etc/*
+ fperms 0640 /etc/sysctl.conf
+
+ # Install some files to /usr/share/baselayout instead of /etc to keep from
+ # (1) overwriting the user's settings, (2) screwing things up when
+ # attempting to merge files, (3) accidentally packaging up personal files
+ # with quickpkg
+ fperms 0600 /etc/shadow
+ mv "${D}"/etc/{passwd,shadow,group,fstab,hosts,issue.devfix} "${D}"/usr/share/baselayout
+
+ # doinitd doesnt respect symlinks
+ dodir /etc/init.d
+ cp -P "${S}"/init.d/* "${D}"/etc/init.d/ || die "doinitd"
+ #doinitd "${S}"/init.d/* || die "doinitd"
+ doconfd "${S}"/etc/conf.d/* || die "doconfd"
+ doenvd "${S}"/etc/env.d/* || die "doenvd"
+ insinto /etc/modules.autoload.d
+ doins "${S}"/etc/modules.autoload.d/*
+ insinto /etc/modules.d
+ doins "${S}"/etc/modules.d/*
+
+ # Special-case uglyness... For people updating from lib32 -> lib amd64
+ # profiles, keep lib32 in the search path while it's around
+ if has_multilib_profile && [ -d /lib32 -o -d /usr/lib32 ] && ! hasq lib32 ${libdirs}; then
+ libdirs_env="${libdirs_env}:/lib32:/usr/lib32:/usr/local/lib32"
+ fi
+
+ # List all the multilib libdirs in /etc/env/04multilib (only if they're
+ # actually different from the normal
+ if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then
+ echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib
+ fi
+
+ # As of baselayout-1.10-1-r1, sysvinit is its own package again, and
+ # provides the inittab itself
+ rm -f "${D}"/etc/inittab
+
+ # Stash the rc-lists for use during pkg_postinst
+ cp -r "${S}"/rc-lists "${D}"/usr/share/baselayout
+
+ # rc-scripts version for testing of features that *should* be present
+ echo "Gentoo Base System version ${PV}" > ${D}/etc/gentoo-release
+
+ #
+ # Setup files related to /dev
+ #
+ into /
+ dosbin "${S}"/sbin/MAKEDEV
+ dosym ../../sbin/MAKEDEV /usr/sbin/MAKEDEV
+ dosym ../sbin/MAKEDEV /dev/MAKEDEV
+
+ #
+ # Setup files in /bin
+ #
+ cd "${S}"/bin
+ dobin rc-status
+
+ #
+ # Setup files in /sbin
+ #
+ cd "${S}"/sbin
+ into /
+ dosbin rc rc-update
+ # Need this in /sbin, as it could be run before
+ # /usr is mounted.
+ dosbin modules-update
+ # Compat symlinks until I can get things synced.
+ dosym modules-update /sbin/update-modules
+ dosym ../../sbin/modules-update /usr/sbin/update-modules
+ # These moved from /etc/init.d/ to /sbin to help newb systems
+ # from breaking
+ dosbin runscript.sh functions.sh
+
+ # Compat symlinks between /etc/init.d and /sbin
+ # (some stuff have hardcoded paths)
+ dosym ../../sbin/depscan.sh /etc/init.d/depscan.sh
+ dosym ../../sbin/runscript.sh /etc/init.d/runscript.sh
+ dosym ../../sbin/functions.sh /etc/init.d/functions.sh
+
+ #
+ # Setup files in /lib/rcscripts
+ # These are support files for other things in baselayout that needn't be
+ # under CONFIG_PROTECTed /etc
+ #
+ cd "${S}"/sbin
+ exeinto ${rcscripts_dir}/sh
+ doexe rc-services.sh rc-daemon.sh rc-help.sh
+
+ # We can only install new, fast awk versions of scripts
+ # if 'build' or 'bootstrap' is not in USE. This will
+ # change if we have sys-apps/gawk-3.1.1-r1 or later in
+ # the build image ...
+ if ! use build; then
+ # This is for new depscan.sh and env-update.sh
+ # written in awk
+ cd "${S}"/sbin
+ into /
+ dosbin depscan.sh
+ dosbin env-update.sh
+ insinto ${rcscripts_dir}/awk
+ doins "${S}"/src/awk/*.awk
+ fi
+
+ # Original design had these in /etc/net.modules.d but that is too
+ # problematic with CONFIG_PROTECT
+ dodir ${rcscripts_dir}
+ cp -a "${S}"/lib/rcscripts/net.modules.d ${D}${rcscripts_dir}
+ chown -R root:root ${D}${rcscripts_dir}
+
+ #
+ # Install baselayout documentation
+ #
+ if ! use build ; then
+ doman "${S}"/man/*.*
+ docinto /
+ dodoc ${FILESDIR}/copyright
+ dodoc "${S}"/ChangeLog
+ fi
+
+ #
+ # Install baselayout utilities
+ #
+ cd "${S}"/src
+ make DESTDIR="${D}" install || die
+
+ # Hack to fix bug 9849, continued in pkg_postinst
+ unkdir
+}
+
+# Support function for remapping old wireless dns vars
+remap_dns_vars() {
+ local f="$1"
+
+ if [[ -f ${ROOT}/etc/conf.d/${f} ]]; then
+ sed -e 's/\<domain_/dns_domain_/g' \
+ -e 's/\<mac_domain_/mac_dns_domain_/g' \
+ -e 's/\<nameservers_/dns_servers_/g' \
+ -e 's/\<mac_nameservers_/mac_dns_servers_/g' \
+ -e 's/\<searchdomains_/dns_search_domains_/g' \
+ -e 's/\<mac_searchdomains_/mac_dns_search_domains_/g' \
+ ${ROOT}/etc/conf.d/${f} > ${IMAGE}/etc/conf.d/${f}
+ fi
+}
+
+pkg_preinst() {
+ if [[ -f ${ROOT}/etc/modules.autoload && \
+ ! -d ${ROOT}/etc/modules.autoload.d ]]; then
+ mkdir -p ${ROOT}/etc/modules.autoload.d
+ mv -f ${ROOT}/etc/modules.autoload \
+ ${ROOT}/etc/modules.autoload.d/kernel-2.4
+ ln -snf modules.autoload.d/kernel-2.4 ${ROOT}/etc/modules.autoload
+ fi
+
+ # Change some vars introduced in baselayout-1.11.0 before we go stable
+ # The new names make more sense and allow nis_domain
+ # for use in baselayout-1.12.0
+ remap_dns_vars net
+ remap_dns_vars wireless
+}
+
+pkg_postinst() {
+ local x y
+
+ # Reincarnate dirs from kdir/unkdir (hack for bug 9849)
+ einfo "Creating directories and .keep files."
+ einfo "Some of these might fail if they're read-only mounted"
+ einfo "filesystems, for example /dev or /proc. That's okay!"
+ source "${ROOT}"/usr/share/baselayout/mkdirs.sh
+ source "${ROOT}"/usr/share/baselayout/mklinks.sh
+
+ # This could be done in src_install, which would have the benefit of
+ # (1) devices.tar.bz2 would show up in CONTENTS
+ # (2) binary installations would be faster... just untar the devices tarball
+ # instead of needing to run MAKEDEV
+ # However the most common cases are that people are either updating
+ # baselayout or installing from scratch. In the installation case, it's no
+ # different to have here instead of src_install. In the update case, we
+ # save a couple minutes time by refraining from building the unnecessary
+ # tarball.
+ if [[ ! -f "${ROOT}/lib/udev-state/devices.tar.bz2" ]]; then
+ # Create a directory in which to work
+ x=$(emktemp -d ${ROOT}/tmp/devnodes.XXXXXXXXX) \
+ && cd "${x}" || die 'mktemp failed'
+
+ # Create temp device nodes
+ echo
+ einfo "Making device node tarball (this could take a couple minutes)"
+ PATH=${ROOT}/sbin:${PATH} create_dev_nodes
+
+ # Now create tarball that can also be used for udev.
+ # Need GNU tar for -j so call it by absolute path.
+ /bin/tar --one-file-system -cjpf "${ROOT}/lib/udev-state/devices.tar.bz2" *
+ rm -r *
+ cd ..
+ rmdir "${x}"
+ fi
+
+ # We don't want to create devices if this is not a bootstrap and devfs
+ # is used, as this was the cause for all the devfs problems we had
+ if use build || use bootstrap; then
+ if [[ ! -e "${ROOT}/dev/.devfsd" && ! -e "${ROOT}/dev/.udev" ]]; then
+ einfo "Populating /dev with device nodes..."
+ cd ${ROOT}/dev || die
+ /bin/tar xjpf "${ROOT}/lib/udev-state/devices.tar.bz2" || die
+ fi
+ fi
+
+ # Create /boot/boot symlink in pkg_postinst because sometimes
+ # /boot is a FAT filesystem. When that is the case, then the
+ # symlink will fail. Consequently, if we create it in
+ # src_install, then merge will fail. AFAIK there is no point to
+ # this symlink except for misconfigured grubs. See bug 50108
+ # (05 May 2004 agriffis)
+ ln -sn . "${ROOT}"/boot/boot 2>/dev/null
+
+ # Set up default runlevel symlinks
+ # This used to be done in src_install but required knowledge of ${ROOT},
+ # which meant that it was effectively broken for binary installs.
+ if [[ -z $(/bin/ls "${ROOT}"/etc/runlevels 2>/dev/null) ]]; then
+ for x in boot default nonetwork single; do
+ einfo "Creating default runlevel symlinks for ${x}"
+ mkdir -p "${ROOT}"/etc/runlevels/${x}
+ for y in $(<"${ROOT}"/usr/share/baselayout/rc-lists/${x}); do
+ if [[ ! -e ${ROOT}/etc/init.d/${y} ]]; then
+ ewarn "init.d/${y} not found -- ignoring"
+ else
+ ln -sfn /etc/init.d/${y} \
+ "${ROOT}"/etc/runlevels/${x}/${y}
+ fi
+ done
+ done
+ fi
+
+ # Create /etc/hosts in pkg_postinst so we don't overwrite an
+ # existing file during bootstrap
+ if [[ ! -e ${ROOT}/etc/hosts ]]; then
+ cp ${ROOT}/usr/share/baselayout/hosts ${ROOT}/etc
+ fi
+
+ # Touching /etc/passwd and /etc/shadow after install can be fatal, as many
+ # new users do not update them properly... see src_install() for why they
+ # are in /usr/share/baselayout/
+ for x in passwd shadow group fstab ; do
+ if [[ -e ${ROOT}/etc/${x} ]] ; then
+ touch "${ROOT}/etc/${x}"
+ else
+ cp "${ROOT}/usr/share/baselayout/${x}" "${ROOT}/etc/${x}"
+ fi
+ done
+
+ # Under what circumstances would mtab be a symlink? It would be
+ # nice if there were an explanatory comment here
+ if [[ -L ${ROOT}/etc/mtab ]]; then
+ rm -f "${ROOT}/etc/mtab"
+ if [[ ${ROOT} == / ]]; then
+ cp /proc/mounts "${ROOT}/etc/mtab"
+ else
+ touch "${ROOT}/etc/mtab"
+ fi
+ fi
+
+ # We should only install empty files if these files don't already exist.
+ [[ -e ${ROOT}/var/log/lastlog ]] || \
+ touch "${ROOT}/var/log/lastlog"
+ [[ -e ${ROOT}/var/run/utmp ]] || \
+ install -m 0664 -g utmp /dev/null "${ROOT}/var/run/utmp"
+ [[ -e ${ROOT}/var/log/wtmp ]] || \
+ install -m 0664 -g utmp /dev/null "${ROOT}/var/log/wtmp"
+
+ # 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} == / ]] && ! use build && ! use bootstrap; then
+ # Regenerate init.d dependency tree
+ /sbin/depscan.sh &>/dev/null
+
+ # Regenerate /etc/modules.conf, else it will fail at next boot
+ einfo "Updating module dependencies..."
+ /sbin/modules-update force &>/dev/null
+ else
+ rm -f ${ROOT}/etc/modules.conf
+ fi
+
+ # Enable shadow groups (we need ROOT=/ here, as grpconv only
+ # operate on / ...).
+ if [[ ${ROOT} == / && \
+ ! -f /etc/gshadow && -x /usr/sbin/grpck && -x /usr/sbin/grpconv ]]
+ then
+ if /usr/sbin/grpck -r &>/dev/null; then
+ /usr/sbin/grpconv
+ else
+ echo
+ ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
+ ewarn "run 'grpconv' afterwards!"
+ echo
+ fi
+ fi
+
+ # This is also written in src_install (so it's in CONTENTS), but
+ # write it here so that the new version is immediately in the file
+ # (without waiting for the user to do etc-update)
+ rm -f ${ROOT}/etc/._cfg????_gentoo-release
+ echo "Gentoo Base System version ${PV}" > ${ROOT}/etc/gentoo-release
+
+ echo
+ einfo "Please be sure to update all pending '._cfg*' files in /etc,"
+ einfo "else things might break at your next reboot! You can use 'etc-update'"
+ einfo "to accomplish this:"
+ einfo
+ einfo " # etc-update"
+ echo
+
+ for f in /etc/init.d/net.eth*; do
+ [[ -L ${f} ]] && continue
+ echo
+ einfo "WARNING: You have older net.eth* files in ${ROOT}/etc/init.d/"
+ einfo "They need to be converted to symlinks to net.lo. If you haven't"
+ einfo "made personal changes to those files, you can update with the"
+ einfo "following command:"
+ einfo
+ einfo " # /bin/ls /etc/init.d/net.eth* | xargs -n1 ln -sfvn net.lo"
+ echo
+ break
+ done
+
+ if sed -e 's/#.*//' ${ROOT}/etc/conf.d/{net,wireless} 2>/dev/null \
+ | egrep -q '\<(domain|nameservers|searchdomains)_' ; then
+ echo
+ ewarn "You have depreciated variables in ${ROOT}/etc/conf.d/net"
+ ewarn "or ${ROOT}/etc/conf.d/wireless"
+ ewarn
+ ewarn "domain_* -> dns_domain_*"
+ ewarn "nameservers_* -> dns_servers_*"
+ ewarn "searchdomains_* -> dns_search_domains_*"
+ ewarn
+ ewarn "They have been converted for you - ensure that you"
+ ewarn "update them via 'etc-update'"
+ echo
+ fi
+
+ if sed -e 's/#.*//' ${ROOT}/etc/conf.d/net 2>/dev/null \
+ | egrep -q '\<(ifconfig|aliases|broadcasts|netmasks|inet6|ipaddr|iproute)_'; then
+ echo
+ ewarn "You are using deprecated variables in ${ROOT}/etc/conf.d/net"
+ ewarn
+ ewarn "You are advised to review the new configuration variables as"
+ ewarn "found in ${ROOT}/etc/conf.d/net.example as there is no"
+ ewarn "guarantee that they will work in future versions."
+ echo
+ fi
+}
--- /dev/null
+Index: net.modules.d/pppd
+===================================================================
+--- lib/rcscripts/net.modules.d/pppd (revision 1605)
++++ net.modules.d/pppd (working copy)
+@@ -142,8 +142,8 @@
+ # Load any commandline options
+ eval opts=\"\$\{pppd_${ifvar}\[@\]}\"
+
+- # We don't work if nodetach or unit is set
+- for i in nodetach updetach unit ; do
++ # We don't work if unit, no detach or linkname is set.
++ for i in unit nodetach linkname ; do
+ if [[ " ${opts} " == *" ${i} "* ]]; then
+ eerror "The option \"${i}\" is not allowed"
+ return 1
+@@ -158,9 +158,9 @@
+ [[ " ${opts} " != *" mru "* ]] && opts="${opts} mru ${mtu}"
+ fi
+
+- # Detach if we're not idling
+- [[ " ${opts} " != *" idle "* && " ${opts} " != *" updetach "* ]] \
+- && opts="${opts} updetach"
++ # Set linkname because we need /var/run/ppp-${linkname}.pid
++ # This pidfile has the advantage of being there, even if ${iface} interface was never started
++ opts="linkname ${iface} ${opts}"
+
+ # Setup auth info
+ [[ -n ${username} ]] && opts="user \"${username}\" ${opts}"
+@@ -228,11 +228,13 @@
+ [[ ${insert_link_in_opts} -eq 0 ]] || opts="${link} ${opts}"
+
+ ebegin "Running pppd"
+- i=$( eval /usr/sbin/pppd ${opts} )
++ i=$( eval /usr/sbin/pppd ${opts} 2>&1 )
+ eend $? "${i}" || return 1
+
+- local addr=$( interface_get_address "${iface}" )
+- einfo "${iface} received address ${addr}"
++ if [[ " ${opts} " == *" updetach "* ]]; then
++ local addr=$( interface_get_address "${iface}" )
++ einfo "${iface} received address ${addr}"
++ fi
+ }
+
+ # bool pppd_stop(char *iface)
+@@ -242,11 +244,12 @@
+ # Returns 0 (true) if no process to kill or it terminates successfully,
+ # otherwise non-zero (false)
+ pppd_stop() {
+- local iface="$1" pidfile="/var/run/$1.pid"
++ local iface="$1" pidfile="/var/run/ppp-$1.pid"
+
+ [[ ! -s ${pidfile} ]] && return 0
+
+- local pid=$(<"${pidfile}")
++ local pid
++ read pid <"${pidfile}" #PID is the first line of the pidfile
+ einfo "Stopping pppd on ${iface}"
+ kill -s TERM "${pid}"
+ process_finished "${pid}" /usr/sbin/pppd
+Index: net.modules.d/netplugd
+===================================================================
+--- lib/rcscripts/net.modules.d/netplugd (revision 1605)
++++ net.modules.d/netplugd (working copy)
+@@ -85,11 +85,11 @@
+
+ eindent
+
+- eval timeout=\"\$\{plug_timeout_${ifvar}\:-10}\"
++ eval timeout=\"\$\{plug_timeout_${ifvar}\:--1}\"
+ if [[ ${timeout} == "0" ]]; then
+ ewarn "WARNING: infinite timeout set for ${iface} to come up"
+ elif [[ ${timeout} -lt 0 ]]; then
+- ewarn "WARNING: negative timeout set for ${iface}"
++ einfo "Backgrounding ..."
+ exit 0
+ fi
+
+Index: net.modules.d/wpa_supplicant
+===================================================================
+--- lib/rcscripts/net.modules.d/wpa_supplicant (revision 1605)
++++ net.modules.d/wpa_supplicant (working copy)
+@@ -106,8 +106,7 @@
+ pidfile="/var/run/wpa_cli-${iface}.pid"
+ if ! clean_pidfile "${pidfile}" ; then
+ ${report} && ebegin "Stopping wpa_cli on ${iface}"
+- start-stop-daemon --stop --exec /bin/wpa_cli \
+- --pidfile "${pidfile}"
++ start-stop-daemon --stop --exec /bin/wpa_cli --pidfile "${pidfile}"
+ ${report} && eend "$?"
+ fi
+
+@@ -116,7 +115,7 @@
+ if ! clean_pidfile "${pidfile}" ; then
+ ${report} && ebegin "Stopping wpa_supplicant on ${iface}"
+ start-stop-daemon --stop --exec /sbin/wpa_supplicant \
+- --pidfile "${pidfile}"
++ --pidfile "${pidfile}"
+ ${report} && eend "$?"
+ else
+ # Support wpa_supplicant-0.3.x
+@@ -130,7 +129,7 @@
+
+ # If wpa_supplicant exits uncleanly, we need to remove the stale dir
+ [[ -S "/var/run/wpa_supplicant/${iface}" ]] \
+- && rm -f "/var/run/wpa_supplicant/${iface}"
++ && rm -f "/var/run/wpa_supplicant/${iface}"
+ }
+
+ # bool wpa_supplicant_associate(char *interface)
+@@ -140,12 +139,12 @@
+ wpa_supplicant_associate() {
+ local iface="$1" ifvar=$( bash_variable "$1" ) timeout i
+ eval timeout=\"\$\{associate_timeout_${ifvar}\}\"
+- [[ -z ${timeout} ]] && eval timeout=\"\$\{wpa_timeout_${ifvar}:-60\}\"
++ [[ -z ${timeout} ]] && eval timeout=\"\$\{wpa_timeout_${ifvar}:--1\}\"
+
+ if [[ ${timeout} == "0" ]]; then
+ ewarn "WARNING: infinite timeout set for association on ${iface}"
+ elif [[ ${timeout} -lt 0 ]]; then
+- ewarn "WARNING: negative timeout set for ${iface}"
++ einfo "Backgrounding ..."
+ exit 0
+ fi
+
+@@ -187,8 +186,7 @@
+ # Start wpa_supplicant on an interface and wait for association
+ # Returns 0 (true) when successful, non-zero otherwise
+ wpa_supplicant_pre_start() {
+- local iface="$1" opts timeout action=false
+- local cfgfile="/etc/wpa_supplicant.conf"
++ local iface="$1" opts timeout action=false cfgfile
+ local actfile="/sbin/wpa_cli.action"
+
+ # We don't configure wireless if we're being called from
+@@ -242,6 +240,15 @@
+
+ ebegin "Starting wpa_supplicant on ${iface}"
+
++ cfgfile="${opts##* -c}"
++ if [[ -n ${cfgfile} && ${cfgfile} != "${opts}" ]]; then
++ [[ ${cfgfile:0:1} == " " ]] && cfgfile="${cfgfile# *}"
++ cfgfile="${cfgfile%% *}"
++ else
++ cfgfile="/etc/wpa_supplicant.conf"
++ opts="${opts} -c/etc/wpa_supplicant.conf"
++ fi
++
+ if [[ ! -f ${cfgfile} ]]; then
+ eend 1 "configuration file ${cfgfile} not found!"
+ return 1
+@@ -275,7 +282,8 @@
+ fi
+
+ start-stop-daemon --start --exec /sbin/wpa_supplicant \
+- -- ${opts} -B -c/etc/wpa_supplicant.conf -i"${iface}"
++ --pidfile "/var/run/wpa_supplicant-${iface}.pid" \
++ -- ${opts} -B -i"${iface}"
+ eend "$?" || return 1
+
+ # Starting wpa_supplication-0.4.0, we can get wpa_cli to
+@@ -284,6 +292,7 @@
+ mark_service_inactive "net.${iface}"
+ ebegin "Starting wpa_cli on ${iface}"
+ start-stop-daemon --start --exec /bin/wpa_cli \
++ --pidfile "/var/run/wpa_cli-${iface}.pid" \
+ -- -a"${actfile}" -i"${iface}" \
+ -P"/var/run/wpa_cli-${iface}.pid" -B
+ eend "$?" || return 1
+Index: net.modules.d/ifplugd
+===================================================================
+--- lib/rcscripts/net.modules.d/ifplugd (revision 1605)
++++ net.modules.d/ifplugd (working copy)
+@@ -98,11 +98,11 @@
+
+ eindent
+
+- eval timeout=\"\$\{plug_timeout_${ifvar}\:-10}\"
++ eval timeout=\"\$\{plug_timeout_${ifvar}\:--1}\"
+ if [[ ${timeout} == "0" ]]; then
+ ewarn "WARNING: infinite timeout set for ${iface} to come up"
+ elif [[ ${timeout} -lt 0 ]]; then
+- ewarn "WARNING: negative timeout set for ${iface}"
++ einfo "Backgrounding ..."
+ exit 0
+ fi
+
+Index: net.modules.d/iwconfig
+===================================================================
+--- lib/rcscripts/net.modules.d/iwconfig (revision 1605)
++++ net.modules.d/iwconfig (working copy)
+@@ -325,7 +325,6 @@
+ local iface="$1" mode="${2:-managed}"
+ local mac="$3" wep_required="$4" w="(WEP Disabled)"
+ local dessid="${ESSID//\\\\/\\\\}" key
+- wep_required="${wep_required:-off}"
+
+ iwconfig "${iface}" mode "${mode}" 2>/dev/null
+ if [[ ${ESSID} == "any" ]]; then
+Index: conf.d/net.example
+===================================================================
+--- etc/conf.d/net.example (revision 1605)
++++ conf.d/net.example (working copy)
+@@ -160,9 +160,10 @@
+ #wpa_supplicant_eth0="-Dprism54" # For Prism54 based cards
+ #wpa_supplicant_ath0="-Dmadwifi" # For Atheros based cards
+ # Consult wpa_supplicant for more drivers
+-# By default we give wpa_suppliant 60 seconds to associate and authenticate
+-# 0 means we wait indefinitely
++# By default don't wait for wpa_suppliant to associate and authenticate.
++# If you would like to, so can specify how long in seconds
+ #associate_timeout_eth0=60
++# A value of 0 means wait forever.
+
+ # GENERIC WIRELESS OPTIONS
+ # PLEASE READ THE INSTRUCTIONS IN /etc/conf.d/wireless.example FOR
+@@ -350,19 +351,31 @@
+ #ln -s net.lo net.ppp0
+ #
+ # Each PPP interface requires an interface to use as a "Link"
++#link_ppp0="/dev/ttyS0" # Most PPP links will use a serial port
+ #link_ppp0="eth0" # PPPoE requires an ethernet interface
+-#link_ppp0="/dev/ttyS0" # Most PPP links will use a serial port
++#link_ppp0="/dev/null" # PPPoA and ISDN links should have this
+ #
++# Here you should specify what pppd plugins you want to use
++# Available plugins are: pppoe, pppoa, capi, dhcpc, minconn, radius,
++# radattr, radrealms and winbind
++#plugins_ppp0=(
++# "pppoe" # Required plugin for PPPoE
++# "pppoa" # Required plugin for PPPoA
++# "capi" # Required plugin for ISDN
++#)
++#
+ # PPP requires at least a username. You can optionally set a password here too
+ # If you don't, then it will use the password specified in /etc/ppp/*-secrets
+ # against the specified username
+-#username_ppp0="user"
+-#password_ppp0="password"
++#username_ppp0='user'
++#password_ppp0='password'
+ #
+ # The PPP daemon has many options you can specify - although there are many
+-# and may seem daunting, it is recommended that you read the ppp man page
++# and may seem daunting, it is recommended that you read the pppd man page
+ # before enabling any of them
+ #pppd_ppp0=(
++# "updetach" # WARNING: If you don't specify this then we will
++# # not wait for the actual PPP link to go up
+ # "debug" # Enables syslog debugging
+ # "noauth" # Do not require the peer to authenticate itself
+ # "defaultroute" # Make this PPP interface the default route
+@@ -388,8 +401,8 @@
+ # "192.168.0.1:192.168.0.2" # Local and remote IP addresses
+ #)
+ #
+-# Dial-up PPP users need to specify a telephone number
+-#phone_number_ppp0=( "12345689" )
++# Dial-up PPP users need to specify at least one telephone number
++#phone_number_ppp0=( "12345689" ) # Maximum 2 phone numbers are supported
+ # They will also need a chat script - here's a good one
+ #chat_ppp0=(
+ # 'ABORT' 'BUSY'
+@@ -530,18 +543,18 @@
+ # To use dns settings such as these, dns_servers_eth0 must be set!
+ # If you omit the _eth0 suffix, then it applies to all interfaces unless
+ # overridden by the interface suffix.
+-# dns_domain_eth0="your.domain"
+-# dns_servers_eth0="192.168.0.2 192.168.0.3"
+-# dns_search_eth0="this.domain that.domain"
+-# dns_options_eth0=( "timeout 1" "rotate" )
+-# dns_sortlist_eth0="130.155.160.0/255.255.240.0 130.155.0.0"
++#dns_domain_eth0="your.domain"
++#dns_servers_eth0="192.168.0.2 192.168.0.3"
++#dns_search_eth0="this.domain that.domain"
++#dns_options_eth0=( "timeout 1" "rotate" )
++#dns_sortlist_eth0="130.155.160.0/255.255.240.0 130.155.0.0"
+ # See the man page for resolv.conf for details about the options and sortlist
+ # directives
+
+-# ntp_servers_eth0="192.168.0.2 192.168.0.3"
++#ntp_servers_eth0="192.168.0.2 192.168.0.3"
+
+-# nis_domain_eth0="domain"
+-# nis_servers_eth0="192.168.0.2 192.168.0.3"
++#nis_domain_eth0="domain"
++#nis_servers_eth0="192.168.0.2 192.168.0.3"
+
+ #-----------------------------------------------------------------------------
+ # Cable in/out detection
+@@ -555,15 +568,19 @@
+ # emerge sys-apps/ifplugd
+ # and you're done :)
+
+-# By default we wait 10 seconds for netplug to configure the interface for us
+-# if it doesn't, we abort but leave netplug running and the net.eth0 service
+-# marked as inactive so when a cable is plugged in it starts fine.
+-# plug_timeout="10"
++# By default we don't wait for netplug/ifplugd to configure the interface.
++# If you would like it to wait so that other services now that network is up
++# then you can specify a timeout here.
++#plug_timeout="10"
++# A value of 0 means wait forever.
+
+ # If you don't want to use netplug on a specific interface but you have it
+ # installed, you can disable it for that interface via the modules statement
+-# modules_eth0=( "!netplug" )
++#modules_eth0=( "!netplug" )
+ # You can do the same for ifplugd
++#
++# You can disable them both with the generic plug
++#modules_eth0=( "!plug" )
+
+ # To use specific ifplugd options, fex specifying wiress mode
+ #ifplugd_eth0="--api-mode wlan"
projects / gentoo.git / commitdiff