From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 23 Nov 2007 19:49:40 +0000 (+0000)
Subject: util-vserver 0.30.214
X-Git-Tag: util-vserver-0_30_214~1
X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=30a26545c44a9b6643e01602535309cb53fbe435

util-vserver 0.30.214
---

diff --git a/distrib/etch/initpost b/distrib/etch/initpost
deleted file mode 100755
index bd6e698..0000000
--- a/distrib/etch/initpost
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 2006 Benedikt Boehm <hollow@gentoo.org>
-#  
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#  
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#  
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-## Called as: initpost <cfgdir> <path of util-vserver-vars>
-
-# setup environment
-cfgdir="$1"
-vdir="$cfgdir"/vdir
-. "$2"
-
-
-# vserver name
-NAME=$(< "$cfgdir"/name)
-
-# debian mirror
-MIRROR=$3
-
-# debian distribution
-DIST="etch"
-
-
-# go to vdir for chroot-sh
-pushd "$vdir" &>/dev/null
-
-
-# helper for sed in chroot
-chrootsed() {
-	local file="$1"
-	shift
-	
-	sedtmp=$($_MKTEMP chrootsed.XXXXXX)
-	
-	$_CHROOT_SH cat "$file" | $_SED "$@" > $sedtmp
-	$_CHROOT_SH truncate "$file"  < $sedtmp
-	
-	$_RM -f $sedtmp
-}
-
-
-# create a locale.gen if needed.
-if test -n "$LANG" && test "$LANG" != "C"; then
-	echo $LANG $(locale charmap) | $_CHROOT_SH append /etc/locale.gen
-fi
-
-
-# make apt and friends work
-$_CHROOT_SH truncate /etc/apt/sources.list <<EOF
-deb $MIRROR/ $DIST main
-deb-src $MIRROR/ $DIST main
-
-deb http://security.debian.org $DIST/updates main
-EOF
-
-
-# setting hostname
-if test -r "$cfgdir"/uts/nodename; then
-	$_CHROOT_SH truncate /etc/hostname < "$cfgdir"/uts/nodename
-fi
-
-
-# setting default /etc/hosts
-$_CHROOT_SH truncate /etc/hosts <<EOF
-# /etc/hosts
-
-127.0.0.1	localhost
-
-# The following lines are desirable for IPv6 capable hosts
-# (added automatically by netbase upgrade)
-
-::1	ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-EOF
-
-
-# copy proxy server statement from host if any
-if test -f /etc/apt/apt.conf; then
-	$_CHROOT_SH truncate /etc/apt/apt.conf < /etc/apt/apt.conf
-fi
-
-
-# fix gettys in inittab
-if $_CHROOT_SH testfile /etc/inittab; then
-	chrootsed /etc/inittab \
-		-e 's/\(^[^#].*getty.*$\)/#\1/'
-fi
-
-
-# fix /proc/cmdline in sendsigs
-if $_CHROOT_SH testfile /etc/init.d/sendsigs; then
-	chrootsed /etc/init.d/sendsigs \
-		-e 's/^\(\s\+splash_back\)$/#\1/'
-fi
-
-# from here on we need to do things live in the server
-$_CHROOT_SH truncate   /vserver-config.sh < "$__DISTRIBDIR"/etch/vserver-config.sh
-$_CHROOT_SH chmod 0755 /vserver-config.sh
-
-echo
-echo ">>> Executing post install script ... "
-echo
-
-# start vserver before we can exec anything inside it
-vserver $NAME start
-
-# run the configure commands from within the server
-vserver $NAME exec /vserver-config.sh
-$_CHROOT_SH rm /vserver-config.sh
-
-# stop the vserver
-vserver $NAME stop
-
-popd &>/dev/null
diff --git a/distrib/etch/vserver-config.sh b/distrib/etch/vserver-config.sh
deleted file mode 100755
index bceae55..0000000
--- a/distrib/etch/vserver-config.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-REMOVE_LINKS="
-bootlogd
-checkfs
-checkroot
-halt
-hwclock.sh
-ifupdown
-klogd
-libdevmapper1.02
-makedev
-module-init-tools
-mountall.sh
-mountdevsubfs.sh
-mountnfs.sh
-mountkernfs.sh
-mountvirtfs
-networking
-reboot
-setserial
-single
-stop-bootlogd
-stop-bootlogd-single
-umountfs
-umountnfs.sh
-umountroot
-urandom
-"
-
-aptitude update
-LANG=C aptitude install locales
-
-test -x /usr/sbin/locale-gen && /usr/sbin/locale-gen
-
-for link in $REMOVE_LINKS; do
-	update-rc.d -f $link remove
-done
-
diff --git a/scripts/magic.mime b/scripts/magic.mime
deleted file mode 100644
index 0e10d84..0000000
--- a/scripts/magic.mime
+++ /dev/null
@@ -1,19 +0,0 @@
-# Borrowed from file(1)
-# gzip (GNU zip, not to be confused with [Info-ZIP/PKWARE] zip archiver)
-0	string		\037\213		application/x-gzip
-# tar posix
-257	string		ustar\0			application/x-tar
-# tar gnu
-257	string		ustar\040\040\0		application/x-tar
-# cpio
-0	short		070707			application/x-cpio
-# cpio swapped
-0	short		0143561			application/x-cpio
-# bzip2
-0	string		BZh			application/x-bzip2
-# dump/restore new-fs big and little endian
-24	belong		60012			application/x-dump
-24	lelong		60012			application/x-dump
-# dump/restore old-fs big and little endian
-24	belong		60011			application/x-dump
-24	lelong		60011			application/x-dump