Commit a9ae28a0 by Denis Pynkin Committed by Stéphane Graber

Updated template for ALTLinux.

- Added predefined package list if /etc/lxc/profiles/default is absent. - Fixed syntax mistake in options list. Signed-off-by: 's avatarDenis Pynkin <dans@altlinux.ru> Acked-by: 's avatarStéphne Graber <stgraber@ubuntu.com>
parent 70bb1a9c
...@@ -119,10 +119,6 @@ EOF ...@@ -119,10 +119,6 @@ EOF
echo "c1:2345:respawn:/sbin/mingetty --noclear console" >> ${rootfs_path}/etc/inittab echo "c1:2345:respawn:/sbin/mingetty --noclear console" >> ${rootfs_path}/etc/inittab
subst 's,\/dev\/tty12,/var/log/syslog/console,' ${rootfs_path}/etc/syslog.conf subst 's,\/dev\/tty12,/var/log/syslog/console,' ${rootfs_path}/etc/syslog.conf
# touch file for fastboot
touch ${rootfs_path}/fastboot
chattr +i ${rootfs_path}/fastboot
dev_path="${rootfs_path}/dev" dev_path="${rootfs_path}/dev"
rm -rf ${dev_path} rm -rf ${dev_path}
mkdir -p ${dev_path} mkdir -p ${dev_path}
...@@ -172,10 +168,19 @@ download_altlinux() ...@@ -172,10 +168,19 @@ download_altlinux()
echo "Downloading altlinux minimal ..." echo "Downloading altlinux minimal ..."
APT_GET="apt-get -o RPM::RootDir=$INSTALL_ROOT -y" APT_GET="apt-get -o RPM::RootDir=$INSTALL_ROOT -y"
PKG_LIST="$(grep -hs '^[^#]' "$profile_dir/$profile")" PKG_LIST="$(grep -hs '^[^#]' "$profile_dir/$profile")"
# PKG_LIST="basesystem apt apt-conf-sisyphus etcnet openssh-server passwd sysklogd net-tools e2fsprogs" # if no configuration file $profile -- fall back to default list of packages
[ -z "$PKG_LIST" ] && PKG_LIST="interactivesystem apt apt-conf-sisyphus etcnet openssh-server systemd systemd-units systemd-sysvinit"
mkdir -p $INSTALL_ROOT/var/lib/rpm mkdir -p $INSTALL_ROOT/var/lib/rpm
rpm --root $INSTALL_ROOT --initdb rpm --root $INSTALL_ROOT --initdb
# some scripts want to have /dev/null at least
dev_path="$INSTALL_ROOT/dev"
if [ ! -c "${dev_path}/null" ]; then
mkdir -p "${dev_path}"
mknod -m 666 "${dev_path}/null" c 1 3
fi
$APT_GET install $PKG_LIST $APT_GET install $PKG_LIST
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
...@@ -372,7 +377,7 @@ EOF ...@@ -372,7 +377,7 @@ EOF
return 0 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: -l help,rootfs:,path:,name:,profile:,clean,release:,ipv4:,ipv6:,gw:,dns: -- "$@")
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage $(basename $0) usage $(basename $0)
exit 1 exit 1
...@@ -449,11 +454,6 @@ fi ...@@ -449,11 +454,6 @@ fi
config_path=$default_path/$name config_path=$default_path/$name
cache=$cache_base/$release/$profile cache=$cache_base/$release/$profile
if [ -f $config_path/config ]; then
echo "A container with that name exists, chose a different name"
exit 1
fi
install_altlinux install_altlinux
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "failed to install altlinux" echo "failed to install altlinux"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment