The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/60

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
From c331c51c4886684a8eacf0236104490b7e10b672 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Thu, 15 Aug 2019 09:29:41 +0200
Subject: [PATCH] images: Fix Plamo post unpack

Signed-off-by: Thomas Hipp <thomas.h...@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
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to