[lxc-devel] [PATCH 2/2] Update lxc-archlinux template to properly work with systemd and utilize arch-install-scripts for installation
Alexander Vladimirov
alexander.idkfa.vladimirov at gmail.com
Mon Dec 10 05:33:35 UTC 2012
---
templates/lxc-archlinux.in | 285 ++++++++-------------------------------------
1 file changed, 51 insertions(+), 234 deletions(-)
diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
index 18ec064..c68e502 100644
--- a/templates/lxc-archlinux.in
+++ b/templates/lxc-archlinux.in
@@ -25,19 +25,19 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# defaults
-arch=$(arch)
-cache=/var/cache/lxc/arch/${arch}
+arch=$(uname -m)
lxc_network_type="veth"
lxc_network_link="br0"
default_path=/var/lib/lxc
-default_rc_locale="en-US.UTF-8"
-default_rc_timezone="UTC"
+default_locale="en-US.UTF-8"
+default_timezone="UTC"
host_mirror="http://mirrors.kernel.org/archlinux/\$repo/os/$arch"
# sort of minimal package set
base_packages=(
+ "systemd"
+ "systemd-sysvcompat"
"filesystem"
- "initscripts"
"coreutils"
"module-init-tools"
"procps"
@@ -63,21 +63,6 @@ base_packages=(
)
declare -a additional_packages
-[ -f /etc/arch-release ] && is_arch=true
-
-# find and extract parameter value from given config file
-# ${1} - file to read parameter from
-# ${2} - parameter name
-# ${result} - result value on success
-function read_parameter_value {
- [ -f ${1} ] && [ "${2}" ] || return 1
- local pattern="^[[:space:]]*${2}[[:space:]]*=[[:space:]]*"
- local str=$(grep "${pattern}" "${1}")
- local str=${str/#$(grep -o "${pattern}" "${1}")/}
- result=${str//\"/}
- return 0
-}
-
# split comma-separated string into an array
# ${1} - string to split
# ${2} - separator (default is ",")
@@ -90,127 +75,47 @@ function split_string {
return 0
}
+[ -f /etc/arch-release ] && is_arch=true
+
# Arch-specific preconfiguration for container
function configure_arch {
# read locale and timezone defaults from system rc.conf if running on Arch
if [ "${is_arch}" ]; then
- read_parameter_value "/etc/rc.conf" "LOCALE"
- rc_locale=${result:-${default_rc_locale}}
- read_parameter_value "/etc/rc.conf" "TIMEZONE"
- rc_timezone=${result:-${default_rc_timezone}}
+ cp -p /etc/vconsole.conf /etc/locale.conf /etc/locale.gen "${rootfs_path}/etc/"
else
- rc_locale=${default_rc_locale}
- rc_timezone=${default_rc_timezone}
- fi
-
- echo "Setting up rc.conf"
- cat > "${rootfs_path}/etc/rc.conf" << EOF
-# /etc/rc.conf - Main Configuration for Arch Linux
-LOCALE="${rc_locale}"
-DAEMON_LOCALE="no"
-HARDWARECLOCK="local"
-TIMEZONE="${rc_timezone}"
-KEYMAP=us
-CONSOLEFONT=
-CONSOLEMAP=
-USECOLOR="yes"
-MODULES=()
-HOSTNAME="${name}"
-interface=eth0
-address=
-netmask=
-broadcast=
-gateway=
-DAEMONS=(syslog-ng crond network)
+ echo "LANG=${default_lang}" > "${rootfs_path}/etc/locale.conf"
+ echo "KEYMAP=us" > "${rootfs_path}/etc/vconsole.conf"
+ cat > "${rootfs_path}/etc/adjtime" << EOF
+0.0 0.0 0.0
+0
+LOCAL
EOF
-
- if [ -e "${rootfs_path}/etc/locale.gen" ]; then
- sed -i 's@^#\(en_US\.UTF-8\)@\1@' "${rootfs_path}/etc/locale.gen"
- if [ ! "${rc_locale}" = "en_US.UTF-8" ]; then
- echo "${rc_locale} ${rc_locale##*.}" >> "${rootfs_path}/etc/locale.gen"
+ if [ -e "${rootfs_path}/etc/locale.gen" ]; then
+ sed -i 's@^#\(en_US\.UTF-8\)@\1@' "${rootfs_path}/etc/locale.gen"
+ if [ ! "${default_locale}" = "en_US.UTF-8" ]; then
+ echo "${default_locale} ${default_locale##*.}" >> "${rootfs_path}/etc/locale.gen"
+ fi
fi
- chroot "${rootfs_path}" locale-gen
fi
- cp "${rootfs_path}/usr/share/zoneinfo/${rc_timezone}" \
+ echo "${name}" > "${rootfs_path}/etc/hostname"
+ ln -s "${rootfs_path}/usr/share/zoneinfo/${default_timezone}" \
"${rootfs_path}/etc/localtime"
-
- echo "Setting up rc.sysinit"
- cat > "${rootfs_path}/etc/rc.sysinit.lxc" << EOF
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-echo "starting Arch Linux"
-rm -f \$(find /var/run -name '*pid')
-rm -f /run/daemons/*
-rm -f /var/lock/subsys/*
-rm -f /etc/mtab
-touch /etc/mtab
-run_hook sysinit_end
-EOF
-
- echo "Setting up rc.shutdown"
- cat > "${rootfs_path}/etc/rc.shutdown.lxc" << EOF
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-stty onlcr
-run_hook shutdown_start
-[[ -x /etc/rc.local.shutdown ]] && /etc/rc.local.shutdown
-stop_all_daemons
-run_hook shutdown_prekillall
-kill_all
-run_hook shutdown_postkillall
-[[ \${TIMEZONE} ]] && cp --remove-destination "/usr/share/zoneinfo/\${TIMEZONE}" /etc/localtime
-halt -w
-umount -a -r -t nodevtmpfs,notmpfs,nosysfs,noproc,nodevpts -O no_netdev
-run_hook shutdown_postumount
-run_hook shutdown_poweroff
-if [[ \${RUNLEVEL} = 0 ]]; then
- poweroff -d -f -i
-else
- reboot -d -f -i
-fi
-# vim: set ts=2 sw=2 noet:
-EOF
- chmod 755 "${rootfs_path}/etc/rc.shutdown.lxc" "${rootfs_path}/etc/rc.sysinit.lxc"
-
- echo "Setting up inittab"
- cat > "${rootfs_path}/etc/inittab" << EOF
-id:3:initdefault:
-rc::sysinit:/etc/rc.sysinit.lxc
-rs:S1:wait:/etc/rc.single
-rm:2345:wait:/etc/rc.multi
-rh:06:wait:/etc/rc.shutdown.lxc
-su:S:wait:/sbin/sulogin -p
-c1:2345:respawn:/sbin/agetty -8 38400 tty1 linux
-EOF
-
- echo "Setting up hosts"
cat > "${rootfs_path}/etc/hosts" << EOF
127.0.0.1 localhost.localdomain localhost ${name}
::1 localhost.localdomain localhost
EOF
-
- echo "Setting up nameserver"
grep nameserver /etc/resolv.conf > "${rootfs_path}/etc/resolv.conf"
- echo "Setting up device nodes"
- mkdir -m 755 "${rootfs_path}/dev/pts"
- mkdir -m 1777 "${rootfs_path}/dev/shm"
- mknod -m 666 "${rootfs_path}/dev/null" c 1 3
- mknod -m 666 "${rootfs_path}/dev/full" c 1 7
- mknod -m 666 "${rootfs_path}/dev/random" c 1 8
- mknod -m 666 "${rootfs_path}/dev/urandom" c 1 9
- mknod -m 666 "${rootfs_path}/dev/tty0" c 4 0
- mknod -m 666 "${rootfs_path}/dev/tty1" c 4 1
- mknod -m 666 "${rootfs_path}/dev/tty2" c 4 2
- mknod -m 666 "${rootfs_path}/dev/tty3" c 4 3
- mknod -m 666 "${rootfs_path}/dev/tty4" c 4 4
- mknod -m 600 "${rootfs_path}/dev/initctl" p
- mknod -m 666 "${rootfs_path}/dev/tty" c 5 0
- mknod -m 666 "${rootfs_path}/dev/console" c 5 1
- mknod -m 666 "${rootfs_path}/dev/ptmx" c 5 2
+ chroot "${rootfs_path}" locale-gen
+ # disable services unavailable for container
+ chroot "${rootfs_path}" ln -s /dev/null /etc/systemd/system/systemd-udevd.service
+ chroot "${rootfs_path}" ln -s /dev/null /etc/systemd/system/systemd-udevd-control.socket
+ chroot "${rootfs_path}" ln -s /dev/null /etc/systemd/system/systemd-udevd-kernel.socket
+ chroot "${rootfs_path}" ln -s /dev/null /etc/systemd/system/proc-sys-fs-binfmt_misc.automount
+ chroot "${rootfs_path}" ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+ mkdir "${rootfs_path}/run/lock"
+ sed -i 's/After=dev-%i.device/After=/' "${rootfs_path}/lib/systemd/system/getty at .service"
+ echo "lxc/console" >> "${rootfs_path}/etc/securetty"
return 0
}
@@ -220,14 +125,14 @@ function copy_configuration {
mkdir -p "${config_path}"
cat > "${config_path}/config" << EOF
lxc.utsname=${name}
+lxc.devttydir=lxc
lxc.tty=4
lxc.pts=1024
lxc.rootfs=${rootfs_path}
lxc.mount=${config_path}/fstab
-
-# When using LXC with apparmor, uncomment the next line to run unconfined:
-#lxc.aa_profile = unconfined
-
+lxc.cap.drop = sys_module mac_admin mac_override
+#hooks
+lxc.hook.mount=/usr/share/lxc/hooks/mount
#networking
lxc.network.type=${lxc_network_type}
lxc.network.flags=up
@@ -236,29 +141,27 @@ lxc.network.name=eth0
lxc.network.mtu=1500
#cgroups
lxc.cgroup.devices.deny = a
-# /dev/null and zero
+lxc.cgroup.devices.allow = c *:* m
+lxc.cgroup.devices.allow = b *:* m
lxc.cgroup.devices.allow = c 1:3 rwm
lxc.cgroup.devices.allow = c 1:5 rwm
-# consoles
-lxc.cgroup.devices.allow = c 5:1 rwm
-lxc.cgroup.devices.allow = c 5:0 rwm
-lxc.cgroup.devices.allow = c 4:0 rwm
-lxc.cgroup.devices.allow = c 4:1 rwm
-# /dev/{,u}random
-lxc.cgroup.devices.allow = c 1:9 rwm
+lxc.cgroup.devices.allow = c 1:7 rwm
lxc.cgroup.devices.allow = c 1:8 rwm
-# /dev/pts
-lxc.cgroup.devices.allow = c 136:* rwm
+lxc.cgroup.devices.allow = c 1:9 rwm
+lxc.cgroup.devices.allow = c 1:9 rwm
+lxc.cgroup.devices.allow = c 4:1 rwm
+lxc.cgroup.devices.allow = c 5:0 rwm
+lxc.cgroup.devices.allow = c 5:1 rwm
lxc.cgroup.devices.allow = c 5:2 rwm
-# rtc
-lxc.cgroup.devices.allow = c 254:0 rwm
+lxc.cgroup.devices.allow = c 136:* rwm
EOF
cat > "${config_path}/fstab" << EOF
-none ${rootfs_path}/dev/pts devpts defaults 0 0
-none ${rootfs_path}/proc proc nodev,noexec,nosuid 0 0
-none ${rootfs_path}/sys sysfs defaults 0 0
-none ${rootfs_path}/dev/shm tmpfs defaults 0 0
+none ${rootfs_path}/dev tmpfs dev 0 0
+sysfs sys sysfs ro,defaults 0 0
+proc proc proc nodev,noexec,nosuid 0 0
+/proc/sys ${rootfs_path}/proc/sys none ro,bind 0 0
+#/var/log/journal ${rootfs_path}/var/log/journal none bind 0 0
EOF
if [ ${?} -ne 0 ]; then
@@ -269,100 +172,13 @@ EOF
return 0
}
-# lock chroot and mount subdirectories before installing container
-function mount_chroot {
- echo "mounting chroot"
- umask 0022
- [ -e "${rootfs_path}/sys" ] || mkdir "${rootfs_path}/sys"
- mount -t sysfs sysfs "${rootfs_path}/sys"
- [ -e "${rootfs_path}/proc" ] || mkdir "${rootfs_path}/proc"
- mount -t proc proc "${rootfs_path}/proc"
- [ -e "${rootfs_path}/dev" ] || mkdir "${rootfs_path}/dev"
- mount -t tmpfs dev "${rootfs_path}/dev" -o mode=0755,size=10M,nosuid
- mknod -m 666 "${rootfs_path}/dev/null" c 1 3
- mknod -m 666 "${rootfs_path}/dev/zero" c 1 5
- mknod -m 600 "${rootfs_path}/dev/console" c 5 1
- mknod -m 644 "${rootfs_path}/dev/random" c 1 8
- mknod -m 644 "${rootfs_path}/dev/urandom" c 1 9
- mknod -m 666 "${rootfs_path}/dev/tty" c 5 0
- mknod -m 666 "${rootfs_path}/dev/tty0" c 4 0
- mknod -m 666 "${rootfs_path}/dev/full" c 1 7
- ln -s /proc/kcore "${rootfs_path}/dev/core"
- ln -s /proc/self/fd "${rootfs_path}/dev/fd"
- ln -s /proc/self/fd/0 "${rootfs_path}/dev/stdin"
- ln -s /proc/self/fd/1 "${rootfs_path}/dev/stdout"
- ln -s /proc/self/fd/2 "${rootfs_path}/dev/stderr"
- [ -e "${rootfs_path}/dev/shm" ] || mkdir "${rootfs_path}/dev/shm"
- mount -t tmpfs shm "${rootfs_path}/dev/shm" -o nodev,nosuid,size=128M
- [ -e "${rootfs_path}/dev/pts" ] || mkdir "${rootfs_path}/dev/pts"
- mount -t devpts devpts "${rootfs_path}/dev/pts" -o newinstance,ptmxmode=666
- ln -s pts/ptmx "${rootfs_path}/dev/ptmx"
- [ -e "${cache_dir}" ] || mkdir -p "${cache_dir}"
- [ -e "${rootfs_path}/${cache_dir}" ] || mkdir -p "${rootfs_path}/${cache_dir}"
- mount -o bind "${cache_dir}" "${rootfs_path}/${cache_dir}"
- if [ -n "${host_mirror_path}" ]; then
- [ -e "${rootfs_path}/${host_mirror_path}" ] || mkdir -p "${rootfs_path}/${host_mirror_path}"
- mount -o bind "${host_mirror_path}" "${rootfs_path}/${host_mirror_path}"
- mount -o remount,ro,bind "${host_mirror_path}" "${rootfs_path}/${host_mirror_path}"
- fi
- trap 'umount_chroot' EXIT INT QUIT TERM HUP
-}
-
-function umount_chroot {
- if [ -z "${umount_done}" ]; then
- echo "unmounting chroot"
- umount "${rootfs_path}/proc"
- umount "${rootfs_path}/sys"
- umount "${rootfs_path}/dev/pts"
- umount "${rootfs_path}/dev/shm"
- umount "${rootfs_path}/dev"
- umount "${rootfs_path}/${cache_dir}"
- [ -n "${host_mirror_path}" ] && umount "${rootfs_path}/${host_mirror_path}"
- umount_done=1
- fi
-}
-
# install packages within container chroot
function install_arch {
- pacman_config=$(mktemp)
-
- cat <<EOF > "${pacman_config}"
-[options]
-HoldPkg = pacman glibc
-SyncFirst = pacman
-Architecture = auto
-#IgnorePkg = udev
-[core]
-Include = /etc/pacman.d/mirrorlist
-Server = ${host_mirror}
-[extra]
-Include = /etc/pacman.d/mirrorlist
-Server = ${host_mirror}
-[community]
-Include = /etc/pacman.d/mirrorlist
-Server = ${host_mirror}
-EOF
-
- mkdir -p "${rootfs_path}/var/lib/pacman/sync"
- mkdir -p "${rootfs_path}/etc"
-
- if echo "${host_mirror}" | grep -q 'file://'; then
- host_mirror_path=$(echo "${host_mirror}" | sed -E 's#file://(/.*)/\$repo/os/\$arch#\1#g')
- fi
- cache_dir=$( (grep -m 1 '^CacheDir' "${pacman_config}" || echo 'CacheDir = /var/cache/pacman/pkg') | sed 's/CacheDir\s*=\s*//')
- mount_chroot
- params="--root ${rootfs_path} --config=${pacman_config} --noconfirm"
- if ! pacman -Sydd ${params} --dbonly udev; then
- echo "Failed to preinstall udev package record"
- return 1
- fi
- if ! pacman -S ${params} ${base_packages[@]}; then
+ if ! pacstrap -cd "${rootfs_path}" ${base_packages[@]}; then
echo "Failed to install container packages"
return 1
fi
[ -d "${rootfs_path}/lib/modules" ] && ldconfig -r "${rootfs_path}"
- mv "${pacman_config}" "${rootfs_path}/etc/pacman.conf"
- umount_chroot
return 0
}
@@ -449,6 +265,7 @@ if [ ${#additional_packages[@]} -gt 0 ]; then
base_packages+=(${result[@]})
fi
+mkdir -p "${rootfs_path}"
install_arch
if [ ${?} -ne 0 ]; then
echo "failed to install Arch linux"
--
1.8.0.1
More information about the lxc-devel
mailing list