summaryrefslogtreecommitdiff
path: root/source/ap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-05-14 19:59:26 +0000
committerEric Hameleers <alien@slackware.com>2021-05-15 08:59:55 +0200
commit2abf246183b4597599225d481bfb184e2f27ada1 (patch)
treeea863c19517d16cb91b9a14aafd5c0ce9b5be384 /source/ap
parent8446f91bdd7a3df8a427a78e711f8e5bc4da1724 (diff)
downloadcurrent-2abf246183b4597599225d481bfb184e2f27ada1.tar.gz
Fri May 14 19:59:26 UTC 202120210514195926
a/btrfs-progs-5.12.1-x86_64-1.txz: Upgraded. a/kernel-generic-5.10.37-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.37-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.37-x86_64-1.txz: Upgraded. ap/lxc-2.0.11_fad08f383-x86_64-8.txz: Rebuilt. Add some additional required packages, run ldconfig inside the rootfs, update the slackpkg.conf, and account for changed hostname handling. Thanks to PiterPunk. d/kernel-headers-5.10.37-x86-1.txz: Upgraded. k/kernel-source-5.10.37-noarch-1.txz: Upgraded. n/getmail-6.16-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/linux-5.12.x/kernel-generic-5.12.4-x86_64-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-headers-5.12.4-x86-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-huge-5.12.4-x86_64-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-modules-5.12.4-x86_64-1.txz: Upgraded. testing/packages/linux-5.12.x/kernel-source-5.12.4-noarch-1.txz: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap')
-rw-r--r--source/ap/lxc/lxc-slackware.in20
-rwxr-xr-xsource/ap/lxc/lxc.SlackBuild2
2 files changed, 18 insertions, 4 deletions
diff --git a/source/ap/lxc/lxc-slackware.in b/source/ap/lxc/lxc-slackware.in
index c362e95d..545ea734 100644
--- a/source/ap/lxc/lxc-slackware.in
+++ b/source/ap/lxc/lxc-slackware.in
@@ -152,8 +152,11 @@ sed -i '/^c3\|^c4\|^c5\|^c6/s/^/# /' $rootfs/etc/inittab
sed -i "s,pf::powerfail:/sbin/genpowerfail start,pf::powerfail:/sbin/shutdown -h now,g" $rootfs/etc/inittab
sed -i "s,pg::powerokwait:/sbin/genpowerfail stop,pg::powerokwait:/sbin/shutdown -c,g" $rootfs/etc/inittab
+# create the library symlinks
+chroot $rootfs ldconfig
+
# set a default combination for the luggage
-echo "root:root" | chroot $rootfs chpasswd
+echo "root:root" | chroot $rootfs chpasswd 2> /dev/null
echo "Root default password is 'root', please change it!"
# borrow the time configuration from the local machine
@@ -206,10 +209,11 @@ echo "$MIRROR/$PKGMAIN-$release/" > $CONF/mirrors
touch $CONF/blacklist
cat <<EOF > $CONF/slackpkg.conf
-# v2.8
+# v15.0
ARCH=$arch
TEMP=$cache/cache-$release-$arch
WORKDIR=$cache/slackpkg-$release-$arch
+WGETFLAGS="--passive-ftp"
DELALL=off
CHECKMD5=on
CHECKGPG=on
@@ -217,6 +221,7 @@ CHECKSIZE=off
PRIORITY=( patches %PKGMAIN extra pasture testing )
POSTINST=on
ONLY_NEW_DOTNEW=off
+ORIG_BACKUPS=on
ONOFF=on
DOWNLOAD_ALL=on
DIALOG=off
@@ -224,6 +229,7 @@ BATCH=on
DEFAULT_ANSWER=y
USE_INCLUDES=on
SPINNING=off
+DIALOG_MAXARGS=139000
EOF
# thanks to Vincent Batts for this list of packages
@@ -232,11 +238,14 @@ EOF
cat <<EOF > $CONF/templates/minimal-lxc.template
aaa_base
aaa_elflibs
+aaa_glibc-solibs
+aaa_libraries
aaa_terminfo
bash
bin
bzip2
coreutils
+cracklib
cyrus-sasl
db48
dcron
@@ -245,23 +254,27 @@ dialog
diffutils
e2fsprogs
elfutils
+elogind
elvis
etc
eudev
findutils
gawk
-glibc-solibs
gnupg
gnutls
grep
gzip
+hostname
iproute2
iputils
kmod
+less
libcap-ng
libffi
libmnl
+libpwquality
libtasn1
+libtirpc
libunistring
logrotate
mpfr
@@ -269,6 +282,7 @@ net-tools
nettle
network-scripts
ncurses
+pam
openssh
openssl-solibs
p11-kit
diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild
index c16d5b2f..e674fe36 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:-7}
+BUILD=${BUILD:-8}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then