X-Git-Url: https://git.sommitrealweird.co.uk/lxc-debian-unprivileged.git/blobdiff_plain/ca64ca60d4154c6e7f530ebd47bc81b7d1c7a440..3b596e49987beae7359485d7f308bba03ebf1041:/templates/lxc-debian-unprivileged diff --git a/templates/lxc-debian-unprivileged b/templates/lxc-debian-unprivileged index 7c6abd1..dd7bdaf 100755 --- a/templates/lxc-debian-unprivileged +++ b/templates/lxc-debian-unprivileged @@ -31,9 +31,13 @@ done if [ "$MAPPED" == "no" ]; then echo "This template can only be used for unprivileged containers." 1>&2 - echo "You might want the \"debian\" template instead." 1|&2 + echo "You might want the \"debian\" template instead." 1>&2 + exit 1 fi +set -e +set -u + # Make sure the usual locations are in PATH export PATH=/usr/sbin:/usr/bin:/sbin:/bin:$PATH export GREP_OPTIONS="" @@ -50,11 +54,40 @@ Required arguments: Optional arguments: [ -m | --mirror ]: The debian mirror to user +[ -n | --network ]: How to configure networking + +Network spec: + [,options] + + type is one of: + dhcp4: v4 dhcp will be enabled. + dhcp6: v6 dhcp will be enabled. + dhcp: v4 and v6 dhcp will be enabled. + static: no dhcp will be enabled + + options: + this is a , seperated list, and sets up static assignments for v4 or v6, + regardless of type. + The order of arguments is + staticv4/staticnetmask + staticv6/staticv6netmask + gateway + v6gateway + + examples: + + --network dhcp4 (default) + --network dhcp6 (v6 dhcp) + --network dhcp (v4 and v6 dhcp) + --network dhcp4,,2001:db8:1234:5678::1/64 (dhcp4 and static v6 address) + --network static,,2001:db8:1234:5678::5/64,,fe80::1 (static v6) + --network static,192.0.2.15/24,,192.0.2.1 (static v4) + EOF return 0 } -options=$(getopt -o r:m:h -l release:,mirror:,help,mapped-uid:,mapped-gid:,name:,path:,rootfs: -- "$@") +options=$(getopt -o r:m:n:h -l release:,mirror:,network:,help,mapped-uid:,mapped-gid:,name:,path:,rootfs: -- "$@") if [ $? -ne 0 ]; then usage @@ -65,6 +98,7 @@ eval set -- "$options" DEBIAN_MIRROR="http://mirror.mythic-beasts.com/debian/" DEBIAN_RELEASE="jessie" +NETWORK_CONFIG="" disable_initscripts() { cat < "${LXC_ROOTFS}/usr/sbin/policy-rc.d" @@ -86,6 +120,7 @@ while :; do -h|--help) usage && exit 1;; -r|--release) DEBIAN_RELEASE="$2"; shift 2;; -m|--mirror) DEBIAN_MIRROR="$2"; shift 2;; + -n|--network) NETWORK_CONFIG="$2"; shift 2;; --mapped-uid) MAPPED_UID="$2"; shift 2;; --mapped-gid) MAPPED_GID="$2"; shift 2;; --name) LXC_NAME="$2"; shift 2;; @@ -95,6 +130,136 @@ while :; do esac done +INTERFACE_DEFAULTS="auto eth0 +iface eth0 inet dhcp" + +generate_network_config() { + if [ "$NETWORK_CONFIG" == "" ]; then + echo "$INTERFACE_DEFAULTS" + return 0 + fi + + ETH0_HEADER="auto eth0" + ETH0_IPV4="" + ETH0_IPV6="" + + echo "auto eth0" + # see if there's a type + network_type=${NETWORK_CONFIG/,*} + other_params=${NETWORK_CONFIG#*,} + + v4_configured=no + v6_configured=no + + if [ "$network_type" == "dhcp" ]; then + ETH0_IPV4="iface eth0 inet dhcp" + ETH0_IPV6="iface eth0 inet6 dhcp" + v4_configured=yes + v6_configured=yes + elif [ "$network_type" == "dhcp4" ]; then + ETH0_IPV4="iface eth0 inet dhcp" + v4_configured=yes + elif [ "$network_type" == "dhcp6" ]; then + ETH0_IPV6="iface eth0 inet6 dhcp" + v6_configured=yes + elif [ "$network_type" != "static" ]; then + echo "Unknown network type: $network_type" 1>&2 + echo 1>&2 + usage 1>&2 + exit 1 + fi + + [ "$network_type" == "$other_params" ] && return 0 + + v4_static=${other_params/,*} + other_params=${other_params#*,} + + if [ "$v4_static" != "" ]; then + if [ "$v4_configured" == "yes" ]; then + echo "Both v4 DHCP and Static - giving up." 1>&2 + echo 1>&2 + usage 1>&2 + exit 1 + fi + fi + + if [ "$v4_static" == "$other_params" ]; then + if [ "$v4_static" != "" ]; then + echo "iface eth0 inet static" + echo " address $v4_static" + fi + fi + + v6_static=${other_params/,*} + other_params=${other_params#*,} + + if [ "$v6_static" != "" ]; then + if [ "$v6_configured" == "yes" ]; then + echo "Both v6 DHCP and Static - giving up." 1>&2 + echo 1>&2 + usage 1>&2 + exit 1 + fi + fi + + if [ "$v6_static" == "$other_params" ]; then + if [ "$v4_static" ]; then + echo "iface eth0 inet static" + echo " address $v4_static" + echo + fi + + echo "iface eth0 inet6 static" + echo " address $v6_static" + + return 0 + fi + + v4_gateway=${other_params/,*} + other_params=${other_params#*,} + + if [ "$v4_gateway" == "$other_params" ]; then + if [ "$v4_static" != "" ]; then + echo "iface eth0 inet static" + echo " address $v4_static" + [ "$v4_gateway" != "" ] && echo " gateway $v4_gateway" + + if [ "$v6_static" != "" ]; then + echo "iface eth0 inet6 static" + echo " address $v6_static" + fi + + return 0 + fi + + if [ "$v4_configured" == "yes" ]; then + echo "DHCP and static gateway not supported, giving up." 1>&2 + echo 1>&2 + usage 1>&2 + exit 1 + fi + fi + + v6_gateway=${other_params/,*} + + if [ "$v4_static" != "" ]; then + echo "iface eth0 inet static" + echo " address $v4_static" + [ "$v4_gateway" != "" ] && echo " gateway $v4_gateway" + echo + fi + + if [ "$v6_static" != "" ]; then + echo "iface eth0 inet6 static" + echo " address $v6_static" + [ "$v6_gateway" != "" ] && echo " gateway $v6_gateway" + fi + + return 0 +} + +INTERFACE_DETAILS="$(generate_network_config)" + # rewrite the default config file sed -i -e "/lxc./{w ${LXC_PATH}/config-auto" -e "d}" "${LXC_PATH}/config" @@ -120,7 +285,15 @@ mkdir "${LXC_PATH}/bin" cat < "${LXC_PATH}/bin/mknod" #!/bin/sh -exec touch "\$1" +# look for the first argument that looks like a path +for i do + case \$i in + /*) + exec touch "\$i" + ;; + esac +done + EOF chmod 755 "${LXC_PATH}/bin/mknod" @@ -129,6 +302,8 @@ export PATH="${LXC_PATH}/bin:$PATH" debootstrap --foreign --include debian-archive-keyring,ifupdown,isc-dhcp-client,locales,openssh-server $DEBIAN_RELEASE "${LXC_ROOTFS}" $DEBIAN_MIRROR +echo "DEBOOTSTRAP STAGE 1 COMPLETE" + # now totally skip that check in the new root, because it sucks. sed -i -e 's#check_sane_mount () {#check_sane_mount () {\n\treturn 0#;' "${LXC_ROOTFS}/debootstrap/functions" @@ -140,7 +315,9 @@ keyring_dpkg=$(sed -ne "/^debian-archive-keyring/ { s#.* ##; p; }" "${LXC_ROOTFS (cd "${LXC_ROOTFS}" && dpkg-deb -x ".$keyring_dpkg" .) # replace the tar containing devices with something that doesn't contain any -(cd "$LXC_ROOTFS/debootstrap" && rm devices.tar.gz && tar czvf devices.tar.gz --files-from=/dev/null) +if [ -e "$LXC_ROOTFS/debootstrap/devices.tar.gz" ]; then + (cd "$LXC_ROOTFS/debootstrap" && rm devices.tar.gz && tar czvf devices.tar.gz --files-from=/dev/null) +fi # and mount a shitload of things for fun and profit... for file in /var/lib/lxcfs/proc/*; do @@ -202,17 +379,22 @@ sed -i -e 's#^\(session.*required.*pam_loginuid.so\)#\#\1#;' "${LXC_ROOTFS}"/etc # set the hostname echo $LXC_NAME > "${LXC_ROOTFS}/etc/hostname" +SECURITY="" +if [ "$DEBIAN_RELEASE" != "sid" ] && [ "$DEBIAN_RELEASE" != "unstable" ]; then + SECURITY="deb http://security.debian.org/ $DEBIAN_RELEASE/updates main" +fi + # setup sources.list cat < "${LXC_ROOTFS}/etc/apt/sources.list" deb $DEBIAN_MIRROR $DEBIAN_RELEASE main -deb http://security.debian.org/ $DEBIAN_RELEASE/updates main +$SECURITY EOF -# disable bits of systemd that we hates -chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f checkroot.sh disable > /dev/null 2>&1 -chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f umountfs disable > /dev/null 2>&1 -chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f hwclock.sh disable > /dev/null 2>&1 -chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f hwclockfirst.sh disable > /dev/null 2>&1 +# disable bits of systemd / initrd that break things +chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f checkroot.sh disable > /dev/null 2>&1 || true +chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f umountfs disable > /dev/null 2>&1 || true +chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f hwclock.sh disable > /dev/null 2>&1 || true +chroot "${LXC_ROOTFS}" /usr/sbin/update-rc.d -f hwclockfirst.sh disable > /dev/null 2>&1 || true if [ -e "${LXC_ROOTFS}/etc/systemd/system/" ]; then touch "${LXC_ROOTFS}/etc/systemd/system/systemd-setup-dgram-qlen.service" @@ -227,10 +409,7 @@ if [ -e "${LXC_ROOTFS}/lib/systemd/system/systemd-journald-audit.socket" ]; then touch "${LXC_ROOTFS}/etc/systemd/system/systemd-journald-audit.socket" fi -cat <> "${LXC_ROOTFS}${NETWORK_FILE}" -auto eth0 -iface eth0 inet dhcp -EOF +echo "$INTERFACE_DETAILS" >> "${LXC_ROOTFS}${NETWORK_FILE}" # and update to the latest security chroot "${LXC_ROOTFS}" apt-get update @@ -255,4 +434,20 @@ enable_initscripts rm -r "${LXC_PATH}/bin" +cat <