commit: 0c67ce6aa22247e600f9f62fc208d00198132aa4 Author: Richard Yao <ryao <AT> gentoo <DOT> org> AuthorDate: Fri Sep 11 21:53:45 2015 +0000 Commit: Richard Yao <ryao <AT> gentoo <DOT> org> CommitDate: Fri Sep 11 21:53:45 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c67ce6a
sys-fs/zfs: ${EROOT} includes / Package-Manager: portage-2.2.20.1 Signed-off-by: Richard Yao <ryao <AT> gentoo.org> sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.1-r4.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.2-r1.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.2-r2.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.2-r3.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.2-r4.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.2-r5.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.2.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.3-r2.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.3.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.4.2.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.4.ebuild | 6 +++--- sys-fs/zfs/zfs-0.6.5.ebuild | 28 ++++++++++++++-------------- sys-fs/zfs/zfs-9999.ebuild | 6 +++--- 15 files changed, 56 insertions(+), 56 deletions(-) diff --git a/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild index ef49fd8..1e30b58 100644 --- a/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild +++ b/sys-fs/zfs/zfs-0.6.0_rc13-r2.ebuild @@ -104,13 +104,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild index 8d6fc4f..d77c696 100644 --- a/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild +++ b/sys-fs/zfs/zfs-0.6.0_rc14-r1.ebuild @@ -110,13 +110,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.1-r4.ebuild b/sys-fs/zfs/zfs-0.6.1-r4.ebuild index 3f8d9e9..31a1ee0 100644 --- a/sys-fs/zfs/zfs-0.6.1-r4.ebuild +++ b/sys-fs/zfs/zfs-0.6.1-r4.ebuild @@ -135,13 +135,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.2-r1.ebuild b/sys-fs/zfs/zfs-0.6.2-r1.ebuild index 479144b..b5d8952 100644 --- a/sys-fs/zfs/zfs-0.6.2-r1.ebuild +++ b/sys-fs/zfs/zfs-0.6.2-r1.ebuild @@ -133,13 +133,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.2-r2.ebuild b/sys-fs/zfs/zfs-0.6.2-r2.ebuild index 25f16ca..9b9b1f6 100644 --- a/sys-fs/zfs/zfs-0.6.2-r2.ebuild +++ b/sys-fs/zfs/zfs-0.6.2-r2.ebuild @@ -133,13 +133,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.2-r3.ebuild b/sys-fs/zfs/zfs-0.6.2-r3.ebuild index a3b52c1..d15d9b4 100644 --- a/sys-fs/zfs/zfs-0.6.2-r3.ebuild +++ b/sys-fs/zfs/zfs-0.6.2-r3.ebuild @@ -133,13 +133,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.2-r4.ebuild b/sys-fs/zfs/zfs-0.6.2-r4.ebuild index 8351d52..8070a53 100644 --- a/sys-fs/zfs/zfs-0.6.2-r4.ebuild +++ b/sys-fs/zfs/zfs-0.6.2-r4.ebuild @@ -134,13 +134,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.2-r5.ebuild b/sys-fs/zfs/zfs-0.6.2-r5.ebuild index c2dd53b..4b4401d 100644 --- a/sys-fs/zfs/zfs-0.6.2-r5.ebuild +++ b/sys-fs/zfs/zfs-0.6.2-r5.ebuild @@ -134,13 +134,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.2.ebuild b/sys-fs/zfs/zfs-0.6.2.ebuild index f40224d..2b9ac7d 100644 --- a/sys-fs/zfs/zfs-0.6.2.ebuild +++ b/sys-fs/zfs/zfs-0.6.2.ebuild @@ -123,13 +123,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.3-r2.ebuild b/sys-fs/zfs/zfs-0.6.3-r2.ebuild index a13ca79..6ee83c3 100644 --- a/sys-fs/zfs/zfs-0.6.3-r2.ebuild +++ b/sys-fs/zfs/zfs-0.6.3-r2.ebuild @@ -131,13 +131,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.3.ebuild b/sys-fs/zfs/zfs-0.6.3.ebuild index 13ebead..ea2577e 100644 --- a/sys-fs/zfs/zfs-0.6.3.ebuild +++ b/sys-fs/zfs/zfs-0.6.3.ebuild @@ -123,13 +123,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.4.2.ebuild b/sys-fs/zfs/zfs-0.6.4.2.ebuild index abf9ee9..eb1f74d 100644 --- a/sys-fs/zfs/zfs-0.6.4.2.ebuild +++ b/sys-fs/zfs/zfs-0.6.4.2.ebuild @@ -123,13 +123,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.4.ebuild b/sys-fs/zfs/zfs-0.6.4.ebuild index aeb6694..f3d5411 100644 --- a/sys-fs/zfs/zfs-0.6.4.ebuild +++ b/sys-fs/zfs/zfs-0.6.4.ebuild @@ -124,13 +124,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-0.6.5.ebuild b/sys-fs/zfs/zfs-0.6.5.ebuild index 7695557..cfc238f 100644 --- a/sys-fs/zfs/zfs-0.6.5.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.ebuild @@ -124,7 +124,7 @@ pkg_postinst() { update_moduledb fi - if [ -e "${EROOT}/etc/runlevels/boot/zfs" ] + if [ -e "${EROOT}etc/runlevels/boot/zfs" ] then einfo 'The zfs boot script has been split into the zfs-import,' einfo 'zfs-mount and zfs-share scripts, with zed being added in the' @@ -136,29 +136,29 @@ pkg_postinst() { einfo 'The zfs-import and zfs-mount scripts have been added to the boot' einfo 'runlevel while the zfs-share script is in the default runlevel.' - rm "${EROOT}/etc/runlevels/boot/zfs" - ln -snf "${EROOT}/etc/init.d/zfs-import" \ - "${EROOT}/etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}/etc/init.d/zfs-mount" \ - "${EROOT}/etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}/etc/init.d/zfs-share" \ - "${EROOT}/etc/runlevels/default/zfs-share" + rm "${EROOT}etc/runlevels/boot/zfs" + ln -snf "${EROOT}etc/init.d/zfs-import" \ + "${EROOT}etc/runlevels/boot/zfs-import" + ln -snf "${EROOT}etc/init.d/zfs-mount" \ + "${EROOT}etc/runlevels/boot/zfs-mount" + ln -snf "${EROOT}etc/init.d/zfs-share" \ + "${EROOT}etc/runlevels/default/zfs-share" else - [ -e "${EROOT}/etc/runlevels/boot/zfs-import" ] || \ + [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ] || \ + [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}/etc/runlevels/default/zfs-share" ] || \ + [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ einfo "You should add zfs-share to the default runlevel." fi - [ -e "${EROOT}/etc/runlevels/default/zfs-zed" ] || \ + [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ einfo "You should add zfs-zed to the default runlevel." - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi } diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index d5eac19..0bb7b67 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -132,13 +132,13 @@ pkg_postinst() { update_moduledb fi - [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' - if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] + if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] then einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" + rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi }