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
c267f3cf
Commit
c267f3cf
authored
Jul 08, 2014
by
Alexander Dreweke
Committed by
Stéphane Graber
Jul 12, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lxc-debian: fix formatting
added space ">/" -> "> /" Signed-off-by:
Alexander Dreweke
<
alexander@dreweke.net
>
Acked-by:
Stéphane Graber
<
stgraber@ubuntu.com
>
parent
dbc34c7a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
lxc-debian.in
templates/lxc-debian.in
+5
-5
No files found.
templates/lxc-debian.in
View file @
c267f3cf
...
@@ -101,7 +101,7 @@ EOF
...
@@ -101,7 +101,7 @@ EOF
else
else
encoding
=
$(
echo
$LANG
|
cut
-d
.
-f2
)
encoding
=
$(
echo
$LANG
|
cut
-d
.
-f2
)
chroot
$rootfs
sed
-e
"s/^#
\(
${
LANG
}
${
encoding
}
\)
/
\1
/"
\
chroot
$rootfs
sed
-e
"s/^#
\(
${
LANG
}
${
encoding
}
\)
/
\1
/"
\
-i
/etc/locale.gen 2>/dev/null
-i
/etc/locale.gen 2>
/dev/null
chroot
$rootfs
locale-gen
$LANG
$encoding
chroot
$rootfs
locale-gen
$LANG
$encoding
chroot
$rootfs
update-locale
LANG
=
$LANG
chroot
$rootfs
update-locale
LANG
=
$LANG
fi
fi
...
@@ -286,7 +286,7 @@ copy_configuration()
...
@@ -286,7 +286,7 @@ copy_configuration()
## Add the container-specific config
## Add the container-specific config
echo
""
>>
$path
/config
echo
""
>>
$path
/config
echo
"# Container specific configuration"
>>
$path
/config
echo
"# Container specific configuration"
>>
$path
/config
grep
-q
"^lxc.rootfs"
$path
/config 2>/dev/null
||
echo
"lxc.rootfs =
$rootfs
"
>>
$path
/config
grep
-q
"^lxc.rootfs"
$path
/config 2>
/dev/null
||
echo
"lxc.rootfs =
$rootfs
"
>>
$path
/config
cat
<<
EOF
>>
$path
/config
cat
<<
EOF
>>
$path
/config
lxc.mount =
$path
/fstab
lxc.mount =
$path
/fstab
...
@@ -342,7 +342,7 @@ if [ $? -ne 0 ]; then
...
@@ -342,7 +342,7 @@ if [ $? -ne 0 ]; then
fi
fi
eval set
--
"
$options
"
eval set
--
"
$options
"
if
which dpkg
>
/dev/null 2>&1
;
then
if
which dpkg
>
/dev/null 2>&1
;
then
arch
=
$(
dpkg
--print-architecture
)
arch
=
$(
dpkg
--print-architecture
)
else
else
arch
=
$(
uname
-m
)
arch
=
$(
uname
-m
)
...
@@ -416,7 +416,7 @@ if [ "$(id -u)" != "0" ]; then
...
@@ -416,7 +416,7 @@ if [ "$(id -u)" != "0" ]; then
exit
1
exit
1
fi
fi
current_release
=
`
wget
${
MIRROR
}
/dists/stable/Release
-O
- 2>/dev/null |
\
current_release
=
`
wget
${
MIRROR
}
/dists/stable/Release
-O
- 2>
/dev/null |
\
head
|awk
'/^Codename: (.*)$/ { print $2; }'
`
head
|awk
'/^Codename: (.*)$/ { print $2; }'
`
release
=
${
release
:-${
current_release
}}
release
=
${
release
:-${
current_release
}}
valid_releases
=(
'squeeze'
'wheezy'
'jessie'
'sid'
)
valid_releases
=(
'squeeze'
'wheezy'
'jessie'
'sid'
)
...
@@ -429,7 +429,7 @@ fi
...
@@ -429,7 +429,7 @@ fi
# detect rootfs
# detect rootfs
config
=
"
$path
/config"
config
=
"
$path
/config"
if
[
-z
"
$rootfs
"
]
;
then
if
[
-z
"
$rootfs
"
]
;
then
if
grep
-q
'^lxc.rootfs'
$config
2>/dev/null
;
then
if
grep
-q
'^lxc.rootfs'
$config
2>
/dev/null
;
then
rootfs
=
$(
awk
-F
=
'/^lxc.rootfs =/{ print $2 }'
$config
)
rootfs
=
$(
awk
-F
=
'/^lxc.rootfs =/{ print $2 }'
$config
)
else
else
rootfs
=
$path
/rootfs
rootfs
=
$path
/rootfs
...
...
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