diff --git a/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_post-start.sh b/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_post-start.sh deleted file mode 100644 index dbb1df8..0000000 --- a/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_post-start.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: target/sheba/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_post-start.sh -# Copyright (C) 2008 - 2009 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# 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. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -. D_libdir/util-vserver/util-vserver-vars - -if grep -q '[ ]/dev[ ]' "$__CONFDIR/$2/fstab"; then - # guest has /dev as tmpfs - # - - case "$(readlink -f etc/mtab)" in - /proc/*) xflag=-n ;; - esac - # mount devpts after /dev was populated - # - $_SECURE_MOUNT -t devpts -o gid=5,mode=620,dev $xflag --chroot none /dev/pts - - # 144 is what qemu wants... I know it's wrong to hardcode this here, but - # I don't have the time for a better implementation (fstab) yet - $_SECURE_MOUNT -t tmpfs -o size=144m $xflag --chroot none /dev/shm -fi diff --git a/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_pre-start.sh b/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_pre-start.sh index a2f81ae..d134348 100644 --- a/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_pre-start.sh +++ b/pkgs/util-vserver/D%sysconfdir_vservers_.defaults_scripts_pre-start.sh @@ -35,4 +35,12 @@ if grep -q '[ ]/dev[ ]' "$__CONFDIR/$2/fstab"; then for x in .defaults "$2"; do [ ! -d "$__CONFDIR/$x/dev" ] || install_nodes "$__CONFDIR/$x/dev" done + + # mount devpts after /dev was populated + # + $_SECURE_MOUNT -t devpts -o gid=5,mode=620,dev --chroot none dev/pts + + # 144 is what qemu wants... I know it's wrong to hardcode this here, but + # I don't have the time for a better implementation (fstab) yet + $_SECURE_MOUNT -t tmpfs -o size=144m --chroot none dev/shm fi