X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=templates%2Flxc-altlinux.in;h=d526fa09619a2041ea9c76223182a4cbed062940;hb=6c049d3a2637446f629105bed28c1f394e5059b7;hp=7accf2468e6911527bc451a37e26f9a592101d8b;hpb=1a9eaaab20fc41a096808fd36f355c54a0f4c1ce;p=mirror_lxc.git

diff --git a/templates/lxc-altlinux.in b/templates/lxc-altlinux.in
index 7accf2468..d526fa096 100644
--- a/templates/lxc-altlinux.in
+++ b/templates/lxc-altlinux.in
@@ -166,6 +166,15 @@ EOF
 download_altlinux()
 {
 
+    if [ -z "$aptconfver" ]; then
+        case "$release" in
+            sisyphus)
+                aptconfver=apt-conf-sisyphus ;;
+            *)
+                aptconfver=apt-conf-branch ;;
+        esac
+    fi
+
     # check the mini altlinux was not already downloaded
     INSTALL_ROOT=$cache/partial
     mkdir -p $INSTALL_ROOT
@@ -179,7 +188,7 @@ download_altlinux()
     APT_GET="apt-get -o RPM::RootDir=$INSTALL_ROOT -y"
     PKG_LIST="$(grep -hs '^[^#]' "$profile_dir/$profile")"
     # if no configuration file $profile -- fall back to default list of packages
-    [ -z "$PKG_LIST" ] && PKG_LIST="interactivesystem apt apt-conf etcnet-full openssh-server systemd-sysvinit systemd-units systemd NetworkManager-daemon"
+    [ -z "$PKG_LIST" ] && PKG_LIST="interactivesystem apt $aptconfver etcnet-full openssh-server systemd-sysvinit systemd-units systemd NetworkManager-daemon"
 
     mkdir -p $INSTALL_ROOT/var/lib/rpm
     rpm --root $INSTALL_ROOT  --initdb
@@ -212,7 +221,7 @@ copy_altlinux()
     #cp -a $cache/rootfs-$arch $rootfs_path || return 1
     # i prefer rsync (no reason really)
     mkdir -p $rootfs_path
-    rsync -Ha $cache/rootfs/ $rootfs_path/
+    rsync -SHaAX $cache/rootfs/ $rootfs_path/
     return 0
 }
 
@@ -265,41 +274,41 @@ copy_configuration()
 {
 
     mkdir -p $config_path
-    grep -q "^lxc.rootfs" $config_path/config 2>/dev/null || echo "lxc.rootfs = $rootfs_path" >> $config_path/config
+    grep -q "^lxc.rootfs.path" $config_path/config 2>/dev/null || echo "lxc.rootfs.path = $rootfs_path" >> $config_path/config
     cat <<EOF >> $config_path/config
-lxc.utsname = $name
-lxc.tty = 4
-lxc.pts = 1024
+lxc.uts.name = $name
+lxc.tty.max = 4
+lxc.pty.max = 1024
 lxc.cap.drop = sys_module mac_admin mac_override sys_time
 
 # When using LXC with apparmor, uncomment the next line to run unconfined:
-#lxc.aa_profile = unconfined
+#lxc.apparmor.profile = unconfined
 
 #networking
-#lxc.network.type = $lxc_network_type
-#lxc.network.flags = up
-#lxc.network.link = $lxc_network_link
-#lxc.network.name = veth0
-#lxc.network.mtu = 1500
+#lxc.net.0.type = $lxc_network_type
+#lxc.net.0.flags = up
+#lxc.net.0.link = $lxc_network_link
+#lxc.net.0.name = veth0
+#lxc.net.0.mtu = 1500
 EOF
 if [ ! -z ${ipv4} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv4 = $ipv4
+lxc.net.0.ipv4.address = $ipv4
 EOF
 fi
 if [ ! -z ${gw} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv4.gateway = $gw
+lxc.net.0.ipv4.gateway = $gw
 EOF
 fi
 if [ ! -z ${ipv6} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv6 = $ipv6
+lxc.net.0.ipv6.address = $ipv6
 EOF
 fi
 if [ ! -z ${gw6} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv6.gateway = $gw6
+lxc.net.0.ipv6.gateway = $gw6
 EOF
 fi
     cat <<EOF >> $config_path/config
@@ -362,6 +371,7 @@ usage:
         [-4|--ipv4=<ipv4 address>] [-6|--ipv6=<ipv6 address>]
         [-g|--gw=<gw address>] [-d|--dns=<dns address>]
         [-P|--profile=<name of the profile>] [--rootfs=<path>]
+        [-a|--apt-conf=<apt-conf>]
         [-A|--arch=<arch of the container>]
         [-h|--help]
 Mandatory args:
@@ -375,6 +385,7 @@ Optional args:
   -g,--gw           specify the default gw, eg. 192.168.1.1
   -G,--gw6          specify the default gw, eg. 2003:db8:1:0:214:1234:fe0b:3596
   -d,--dns          specify the DNS server, eg. 192.168.1.2
+  -a,--apt-conf     specify preferred 'apt-conf' package, eg. 'apt-conf-branch'
   -P,--profile      Profile name is the file name in /etc/lxc/profiles contained packages name for install to cache.
   -A,--arch         NOT USED YET. Define what arch the container will be [i686,x86_64]
   ---rootfs         rootfs path
@@ -383,7 +394,7 @@ EOF
     return 0
 }
 
-options=$(getopt -o hp:n:P:cR:4:6:g:d: -l help,rootfs:,path:,name:,profile:,clean,release:,ipv4:,ipv6:,gw:,dns: -- "$@")
+options=$(getopt -o hp:n:P:cR:4:6:g:d:a: -l help,rootfs:,path:,name:,profile:,clean,release:,ipv4:,ipv6:,gw:,dns:,apt-conf: -- "$@")
 if [ $? -ne 0 ]; then
     usage $(basename $0)
     exit 1
@@ -404,6 +415,7 @@ do
         -6|--ipv6)      ipv6=$2; shift 2;;
         -g|--gw)        gw=$2; shift 2;;
         -d|--dns)       dns=$2; shift 2;;
+        -a|--apt-conf)  aptconfver=$2; shift 2;;
         --)             shift 1; break ;;
         *)              break ;;
     esac
@@ -448,10 +460,10 @@ if [ "$(id -u)" != "0" ]; then
     exit 1
 fi
 
-# check for 'lxc.rootfs' passed in through default config by lxc-create
+# check for 'lxc.rootfs.path' passed in through default config by lxc-create
 if [ -z "$rootfs_path" ]; then
-    if grep -q '^lxc.rootfs' $path/config 2>/dev/null ; then
-        rootfs_path=$(awk -F= '/^lxc.rootfs =/{ print $2 }' $path/config)
+    if grep -q '^lxc.rootfs.path' $path/config 2>/dev/null ; then
+        rootfs_path=$(awk -F= '/^lxc.rootfs.path =/{ print $2 }' $path/config)
     else
         rootfs_path=$path/rootfs
     fi