[packages/lxc] cleanups, do not overwrite /etc/hosts
glen
glen at pld-linux.org
Sun Nov 17 02:55:43 CET 2013
commit 90e87d7e51819a18ac326b37eac1e8ed76125458
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Nov 17 03:54:39 2013 +0200
cleanups, do not overwrite /etc/hosts
lxc-pld.in.sh | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
---
diff --git a/lxc-pld.in.sh b/lxc-pld.in.sh
index bf296ad..aee9ebf 100755
--- a/lxc-pld.in.sh
+++ b/lxc-pld.in.sh
@@ -30,13 +30,6 @@ cache_base=@LOCALSTATEDIR@/cache/lxc/pld/$arch
default_path=@LXCPATH@
root_password=root
-# is this pld?
-# Alow for weird remixes like the Raspberry Pi
-#
-# Use the Mitre standard CPE identifier for the release ID if possible...
-# This may be in /etc/os-release or /etc/system-release-cpe. We
-# should be able to use EITHER. Give preference to /etc/os-release for now.
-
if [ -e /etc/os-release ]; then
# This is a shell friendly configuration file. We can just source it.
# What we're looking for in here is the ID, VERSION_ID and the CPE_NAME
@@ -76,6 +69,7 @@ configure_pld()
fi
# set minimal hosts
+ test -e $rootfs_path/etc/hosts || \
cat <<EOF > $rootfs_path/etc/hosts
127.0.0.1 localhost.localdomain localhost $utsname
::1 localhost6.localdomain6 localhost6
@@ -158,7 +152,6 @@ download_pld()
mkdir -p $INSTALL_ROOT at LOCALSTATEDIR@/lib/rpm
rpm --root $INSTALL_ROOT --initdb
- rpm --root $INSTALL_ROOT -ivh ${INSTALL_ROOT}/${RELEASE_RPM}
$POLDEK -u $PKG_LIST
if [ $? -ne 0 ]; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxc.git/commitdiff/3a633be641733311348735c4b9cc2ee5d0c5666d
More information about the pld-cvs-commit
mailing list