From 006a580cf5e010823e75180884c21dd700a6cc45 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 9 Dec 2012 13:08:43 +0100 Subject: [PATCH] update inner chroot scripts to sablink --- scripts/inner_chroot_script.sh | 16 +++++++++------- scripts/inner_source_chroot_update.sh | 8 ++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh index 89bc298..180b1b3 100755 --- a/scripts/inner_chroot_script.sh +++ b/scripts/inner_chroot_script.sh @@ -47,9 +47,9 @@ echo "inet_interfaces = localhost" >> /etc/postfix/main.cf # turn bashlogin shells to actual login shells sed -i 's:exec -l /bin/bash:exec -l /bin/bash -l:' /bin/bashlogin -# setup /etc/hosts, add sabayon as default hostname (required by Xfce) -sed -i "/^127.0.0.1/ s/localhost/localhost sabayon/" /etc/hosts -sed -i "/^::1/ s/localhost/localhost sabayon/" /etc/hosts +# setup /etc/hosts, add sablink as default hostname (required by Xfce) +sed -i "/^127.0.0.1/ s/localhost/localhost sablink/" /etc/hosts +sed -i "/^::1/ s/localhost/localhost sablink/" /etc/hosts # setup postfix local mail aliases newaliases @@ -97,9 +97,9 @@ for repo_conf in /etc/entropy/repositories.conf.d/entropy_*.example; do cp "${repo_conf}" "${new_repo_conf}" done -# copy Portage config from sabayonlinux.org entropy repo to system +# copy Portage config from sablink.nas-central.org entropy repo to system for conf in package.mask package.unmask package.keywords make.conf package.use; do - repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard + repo_path=/var/lib/entropy/client/database/*/sablink.nas-central.org/standard repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null) if [ -n "${repo_conf}" ]; then target_path="/etc/portage/${conf}" @@ -113,7 +113,7 @@ for conf in package.mask package.unmask package.keywords make.conf package.use; done # split config file for conf in 00-sabayon.package.use; do - repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard + repo_path=/var/lib/entropy/client/database/*/sablink.nas-central.org/standard repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null) if [ -n "${repo_conf}" ]; then target_path="/etc/portage/${conf/00-sabayon.}/${conf}" @@ -134,6 +134,8 @@ layman -d sabayon rm -rf /var/lib/layman/sabayon layman -d sabayon-distro rm -rf /var/lib/layman/sabayon-distro +layman -d sablink +rm -rf /var/lib/layman/sablink # Reset users' password # chpasswd doesn't work anymore @@ -158,7 +160,7 @@ if [ -x "/usr/bin/fluxbox-generate_menu" ]; then fluxbox-generate_menu -o /etc/skel/.fluxbox/menu fi -equo query list installed -qv > /etc/sabayon-pkglist +equo query list installed -qv > /etc/sablink-pkglist rm -rf /var/tmp/entropy/* rm -rf /var/lib/entropy/logs diff --git a/scripts/inner_source_chroot_update.sh b/scripts/inner_source_chroot_update.sh index 60c0cdc..a048d2a 100755 --- a/scripts/inner_source_chroot_update.sh +++ b/scripts/inner_source_chroot_update.sh @@ -74,9 +74,9 @@ fi rm -rf /var/lib/entropy/client/packages -# copy Portage config from sabayonlinux.org entropy repo to system +# copy Portage config from sablink.nas-central.org entropy repo to system for conf in package.mask package.unmask package.keywords make.conf package.use; do - repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard + repo_path=/var/lib/entropy/client/database/*/sablink.nas-central.org/standard repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null) if [ -n "${repo_conf}" ]; then target_path="/etc/portage/${conf}" @@ -91,7 +91,7 @@ done # split config file for conf in 00-sabayon.package.use; do - repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard + repo_path=/var/lib/entropy/client/database/*/sablink.nas-central.org/standard repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null) if [ -n "${repo_conf}" ]; then target_path="/etc/portage/${conf/00-sabayon.}/${conf}" @@ -107,4 +107,4 @@ for conf in 00-sabayon.package.use; do fi done -equo query list installed -qv > /etc/sabayon-pkglist +equo query list installed -qv > /etc/sablink-pkglist