Only remove devices.tar.gz if it exists

[lxc-debian-unprivileged.git] / templates / lxc-debian-unprivileged

diff --git a/templates/lxc-debian-unprivileged b/templates/lxc-debian-unprivileged
index 9a3f248ffb95d411f65fe39a5cc6fad00c52cf15..dd7bdafc11e5e862f594dc8378e7697a24836a29 100755 (executable)
--- a/templates/lxc-debian-unprivileged
+++ b/templates/lxc-debian-unprivileged
@@ -139,6 +139,10 @@ generate_network_config() {
         return 0
     fi
 
         return 0
     fi
 

+    ETH0_HEADER="auto eth0"
+    ETH0_IPV4=""
+    ETH0_IPV6=""
+

     echo "auto eth0"
     # see if there's a type
     network_type=${NETWORK_CONFIG/,*}
     echo "auto eth0"
     # see if there's a type
     network_type=${NETWORK_CONFIG/,*}


@@ -148,15 +152,15 @@ generate_network_config() {
     v6_configured=no
 
     if [ "$network_type" == "dhcp" ]; then
     v6_configured=no
 
     if [ "$network_type" == "dhcp" ]; then

-        echo "iface eth0 inet dhcp"
-        echo "iface eth0 inet6 dhcp"
+        ETH0_IPV4="iface eth0 inet dhcp"
+        ETH0_IPV6="iface eth0 inet6 dhcp"

         v4_configured=yes
         v6_configured=yes
     elif [ "$network_type" == "dhcp4" ]; then
         v4_configured=yes
         v6_configured=yes
     elif [ "$network_type" == "dhcp4" ]; then

-        echo "iface eth0 inet dhcp"
+        ETH0_IPV4="iface eth0 inet dhcp"

         v4_configured=yes
     elif [ "$network_type" == "dhcp6" ]; then
         v4_configured=yes
     elif [ "$network_type" == "dhcp6" ]; then

-        echo "iface eth0 inet6 dhcp"
+        ETH0_IPV6="iface eth0 inet6 dhcp"

         v6_configured=yes
     elif [ "$network_type" != "static" ]; then
         echo "Unknown network type: $network_type" 1>&2
         v6_configured=yes
     elif [ "$network_type" != "static" ]; then
         echo "Unknown network type: $network_type" 1>&2


@@ -256,10 +260,6 @@ generate_network_config() {
 
 INTERFACE_DETAILS="$(generate_network_config)"
 
 
 INTERFACE_DETAILS="$(generate_network_config)"
 

-# temporarily do something stupid
-echo "$INTERFACE_DETAILS"
-exit 1
-

 # rewrite the default config file
 
 sed -i -e "/lxc./{w ${LXC_PATH}/config-auto" -e "d}" "${LXC_PATH}/config"
 # rewrite the default config file
 
 sed -i -e "/lxc./{w ${LXC_PATH}/config-auto" -e "d}" "${LXC_PATH}/config"


@@ -285,7 +285,15 @@ mkdir "${LXC_PATH}/bin"
 cat <<EOF > "${LXC_PATH}/bin/mknod"
 #!/bin/sh
 
 cat <<EOF > "${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"
 EOF
 
 chmod 755 "${LXC_PATH}/bin/mknod"


@@ -294,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
 
 
 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"
 
 # 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"
 


@@ -305,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}" && 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
 
 # and mount a shitload of things for fun and profit...
 for file in /var/lib/lxcfs/proc/*; do