From 3058020743d597724f5faaf7ce090cbf636b0dc1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 31 Oct 2007 11:20:03 +0100 Subject: Adding lh_chroot_devpts. --- helpers/lh_binary | 2 ++ helpers/lh_chroot | 2 ++ helpers/lh_chroot_devpts | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100755 helpers/lh_chroot_devpts diff --git a/helpers/lh_binary b/helpers/lh_binary index be6dbd0..b6a30cd 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -39,6 +39,7 @@ lh_binary_chroot ${*} if [ "${LH_CHROOT_BUILD}" = "enabled" ] then # Configuring chroot + lh_chroot_devpts install ${*} lh_chroot_proc install ${*} lh_chroot_sysfs install ${*} lh_chroot_hosts install ${*} @@ -81,4 +82,5 @@ then lh_chroot_hosts remove ${*} lh_chroot_sysfs remove ${*} lh_chroot_proc remove ${*} + lh_chroot_devpts remove ${*} fi diff --git a/helpers/lh_chroot b/helpers/lh_chroot index aafe71f..c8502bd 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -35,6 +35,7 @@ Set_defaults # Configuring chroot lh_chroot_cache restore ${*} +lh_chroot_devpts install ${*} lh_chroot_proc install ${*} lh_chroot_sysfs install ${*} lh_chroot_debianchroot install ${*} @@ -76,4 +77,5 @@ lh_chroot_dpkg remove ${*} lh_chroot_debianchroot remove ${*} lh_chroot_sysfs remove ${*} lh_chroot_proc remove ${*} +lh_chroot_devpts remove ${*} lh_chroot_cache save ${*} diff --git a/helpers/lh_chroot_devpts b/helpers/lh_chroot_devpts new file mode 100755 index 0000000..236777a --- /dev/null +++ b/helpers/lh_chroot_devpts @@ -0,0 +1,82 @@ +#!/bin/sh + +# lh_chroot_devpts(1) - mount /dev/pts +# Copyright (C) 2006-2007 Daniel Baumann +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. + +set -e + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="mount /dev/pts" +HELP="" +USAGE="${PROGRAM} {install|remove} [--force]" + +Arguments "${@}" + +# Ensure that a system is built as root +lh_testroot + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Read_conffile "${LH_CONFIG}" +Set_defaults + +Echo_message "Begin mounting /dev/pts..." + +# Requiring stage file +Require_stagefile .stage/bootstrap + +case "${1}" in + install) + # Checking stage file + Check_stagefile .stage/chroot_devpts + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Creating mountpoint + mkdir -p chroot/dev/pts + + # Mounting /dev/pts + ${LH_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts + + # Creating stage file + Create_stagefile .stage/chroot_devpts + ;; + + remove) + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + # Unmounting /dev/pts + ${LH_ROOT_COMMAND} umount chroot/dev/pts > /dev/null 2>&1 + + # Removing stage file + rm -f .stage/chroot_devpts + ;; + + *) + Usage + ;; +esac -- cgit v1.0