From e4325044a8839cd09f34e5fd73e7f0ce01fcd986 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Thu, 2 Jan 2020 21:15:46 +0000
Subject: Thu Jan  2 21:15:46 UTC 2020

a/dialog-1.3_20191210-x86_64-1.txz:  Upgraded.
a/shadow-4.8-x86_64-2.txz:  Rebuilt.
  Don't ship /etc/environment.new since sudo is no longer complaining about it.
ap/lxc-2.0.11_fad08f383-x86_64-4.txz:  Rebuilt.
  Make sure all initial devices are properly created.
  Fix accidental handling of rc.lxc as a modified-for-lxc init script.
  Thanks to crts.
d/python-setuptools-44.0.0-x86_64-1.txz:  Upgraded.
l/libedit-20191231_3.1-x86_64-1.txz:  Upgraded.
l/python-pillow-7.0.0-x86_64-1.txz:  Upgraded.
---
 source/ap/lxc/lxc-slackware.in | 15 +++++++++++----
 source/ap/lxc/lxc.SlackBuild   |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'source/ap/lxc')

diff --git a/source/ap/lxc/lxc-slackware.in b/source/ap/lxc/lxc-slackware.in
index c49366ac6..c362e95d8 100644
--- a/source/ap/lxc/lxc-slackware.in
+++ b/source/ap/lxc/lxc-slackware.in
@@ -90,8 +90,15 @@ cp $rootfs/etc/HOSTNAME $rootfs/etc/hostname
 # http://www.vislab.uq.edu.au/howto/lxc/MAKEDEV.sh
 DEV=$rootfs/dev
 mkdir -p ${DEV}
-# Make sure ${DEV}/null isn't accidentally a file by deleting it first:
-rm -f ${DEV}/null
+# Remove any existing "devices" first, as these might be files
+# created by package install scripts:
+for clear_device in ${DEV}/null ${DEV}/zero ${DEV}/random ${DEV}/urandom \
+  ${DEV}/tty ${DEV}/console ${DEV}/tty0 ${DEV}/tty1 ${DEV}/tty2 ${DEV}/tty3 \
+  ${DEV}/tty4 ${DEV}/tty5 ${DEV}/full ${DEV}/initctl ${DEV}/loop0 \
+  ${DEV}/loop1 ; do
+  rm -f $clear_device
+done
+# Create initial set of devices:
 mknod -m 666 ${DEV}/null c 1 3
 mknod -m 666 ${DEV}/zero c 1 5
 mknod -m 666 ${DEV}/random c 1 8
@@ -126,8 +133,8 @@ EOF
 # Back up the existing init scripts and install the lxc versions:
 ( cd $rootfs/etc/rc.d
   cp -a /usr/share/lxc/scripts/slackware/* .
-  chmod 755 *.lxc
-  for file in *.lxc ; do
+  chmod 755 rc.*.lxc
+  for file in rc.*.lxc ; do
     cp -a $(basename $file .lxc) $(basename $file .lxc).orig
     cp -a $file $(basename $file .lxc)
   done
diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild
index c6fb1c278..d44f5a883 100755
--- a/source/ap/lxc/lxc.SlackBuild
+++ b/source/ap/lxc/lxc.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=lxc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
-- 
cgit v1.2.3-65-gdbad