[lxc-devel] [lxc-ci/master] images: Fix Plamo post unpack
monstermunchkin on Github
lxc-bot at linuxcontainers.org
Thu Aug 15 07:30:33 UTC 2019
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 356 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190815/3f67fcda/attachment.bin>
-------------- next part --------------
From c331c51c4886684a8eacf0236104490b7e10b672 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Thu, 15 Aug 2019 09:29:41 +0200
Subject: [PATCH] images: Fix Plamo post unpack
Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
images/plamo.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/images/plamo.yaml b/images/plamo.yaml
index c831576..30734cf 100644
--- a/images/plamo.yaml
+++ b/images/plamo.yaml
@@ -116,10 +116,10 @@ files:
#d2:12345:respawn:/sbin/agetty -mt60 38400,19200,9600,2400,1200 ttyS1 vt100
# Runlevel 4 used to be for an X-window only system, until we discovered
- # that it throws init into a loop that keeps your load avg at least 1 all
+ # that it throws init into a loop that keeps your load avg at least 1 all
# the time. Thus, there is now one getty opened on tty6. Hopefully no one
# will notice. ;^)
- # It might not be bad to have one text console anyway, in case something
+ # It might not be bad to have one text console anyway, in case something
# happens to X.
x1:4:wait:/etc/rc.d/rc.4
@@ -212,7 +212,7 @@ packages:
update:
cmd: updatepkg
clean:
- cmd: true
+ cmd: true
refresh:
cmd: true
@@ -239,7 +239,7 @@ actions:
sed -i 's/="err"/=0/' /etc/udev/udev.conf
# Configure glibc
- mv /etc/ld.so.conf.new /etc/ld.so.conf
+ [ -f /etc/ld.so.conf.new ] && mv /etc/ld.so.conf.new /etc/ld.so.conf
ldconfig
# Delete unnecessary process from rc.S
More information about the lxc-devel
mailing list