Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
bb2f4389
Commit
bb2f4389
authored
Mar 14, 2017
by
Stéphane Graber
Committed by
GitHub
Mar 14, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1463 from armchair-philosophy/up_templates_arch
[templates] archlinux: resolve conflicting files
parents
9b001960
d720fa11
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
5 deletions
+0
-5
lxc-archlinux.in
templates/lxc-archlinux.in
+0
-5
No files found.
templates/lxc-archlinux.in
View file @
bb2f4389
...
...
@@ -42,7 +42,6 @@ export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin
arch
=
$(
uname
-m
)
default_path
=
"@LXCPATH@"
default_locale
=
"en-US.UTF-8"
default_timezone
=
"UTC"
pacman_config
=
"/etc/pacman.conf"
common_config
=
"@LXCTEMPLATECONFIG@/common.conf"
shared_config
=
"@LXCTEMPLATECONFIG@/archlinux.common.conf"
...
...
@@ -87,9 +86,6 @@ configure_arch() {
# hostname and nameservers
echo
"
${
name
}
"
>
"
${
rootfs_path
}
/etc/hostname"
while
read
r
;
do
[
"
${
r
#nameserver
}
"
=
"
$r
"
]
||
echo
"
$r
"
done
< /etc/resolv.conf
>
"
${
rootfs_path
}
/etc/resolv.conf"
# network configuration
cat
>
"
${
rootfs_path
}
/etc/systemd/network/eth0.network"
<<
EOF
...
...
@@ -104,7 +100,6 @@ EOF
arch-chroot
"
${
rootfs_path
}
"
/bin/bash
-s
<<
EOF
mkdir /run/lock
locale-gen
ln -s /usr/share/zoneinfo/
${
default_timezone
}
/etc/localtime
# set default boot target
ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
# override getty@.service for container ttys
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment