summaryrefslogtreecommitdiffstats
path: root/source/ap/slackpkg/files
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/slackpkg/files')
-rw-r--r--source/ap/slackpkg/files/ChangeLog9
-rw-r--r--source/ap/slackpkg/files/core-functions.sh23
-rw-r--r--source/ap/slackpkg/files/mirrors-x86.sample20
-rw-r--r--source/ap/slackpkg/files/mirrors-x86_64.sample20
-rw-r--r--source/ap/slackpkg/files/post-functions.conf-sample7
-rw-r--r--source/ap/slackpkg/files/post-functions.sh13
6 files changed, 56 insertions, 36 deletions
diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index 0dffa771c..d97918fac 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan 17 06:40:41 UTC 2022
+---------------
+ - Release 15.0.10
+ - Fix mirrors.ucr.ac.cr link address (Emmet Ford)
+ - Remove wroc.pl mirrors (Emmet Ford)
+ - Remove kddilabs.jp from mirrors (Emmet Ford)
+ - Unattended usage improvements (PiterPUNK)
+ - Create file to flag if the system needs restart (PiterPUNK)
+
Mon Dec 13 00:27:34 UTC 2021
---------------
- Release 15.0.9
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 463a1905d..56314e990 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -1318,6 +1318,28 @@ for slackpkg to work properly.
fi
}
+# Checks if a critical package were upgraded by Slackpkg.
+# The /var/run/needs_restarting file contains the list of upgraded
+# packages.
+#
+# The file only is created if /var/run filesystem type is tmpfs so
+# the reboot will clean it
+function needs_restarting() {
+ if [ "$(stat -f -c %T /var/run/)" = "tmpfs" ]; then
+ find $ROOT/var/log/packages/ -cnewer $TMPDIR/timestamp -type f \( \
+ -name "kernel-generic-[0-9]*" -o \
+ -name "kernel-huge-[0-9]*" -o \
+ -name "openssl-solibs-[0-9]*" -o \
+ -name "openssl-[0-9]*" -o \
+ -name "glibc-[0-9]*" -o \
+ -name "aaa_glibc-solibs-[0-9]*" -o \
+ -name "eudev-[0-9]*" -o \
+ -name "elogind-[0-9]*" -o \
+ -name "dbus-[0-9]*" \) | \
+ awk -F/ '{ print $NF }' >> $ROOT/var/run/needs_restarting
+ fi
+}
+
function remove_pkg() {
local i
@@ -1342,6 +1364,7 @@ function upgrade_pkg() {
for i in $SHOWLIST; do
getpkg $i upgradepkg Upgrading
done
+ needs_restarting
}
function install_pkg() {
diff --git a/source/ap/slackpkg/files/mirrors-x86.sample b/source/ap/slackpkg/files/mirrors-x86.sample
index 0d14b201b..81f133d99 100644
--- a/source/ap/slackpkg/files/mirrors-x86.sample
+++ b/source/ap/slackpkg/files/mirrors-x86.sample
@@ -85,8 +85,8 @@
# http://mirrors.163.com/slackware/slackware-15.0/
# http://mirrors.ustc.edu.cn/slackware/slackware-15.0/
# COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware-15.0/
+# http://mirrors.ucr.ac.cr/slackware/slackware-15.0/
# CZECH REPUBLIC (CZ)
# ftp://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/
# http://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/
@@ -126,8 +126,6 @@
# JAPAN (JP)
# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/
# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/
# ftp://riksun.riken.go.jp/Linux/slackware/slackware-15.0/
# http://riksun.riken.go.jp/Linux/slackware/slackware-15.0/
# LITHUANIA (LT)
@@ -142,14 +140,10 @@
# ftp://ftp.slackware.no/slackware/slackware-15.0/
# http://ftp.slackware.no/slackware/slackware-15.0/
# POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/
# ftp://ftp.slackware.pl/pub/slackware/slackware-15.0/
# http://ftp.slackware.pl/pub/slackware/slackware-15.0/
# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-15.0/
# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-15.0/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/
# RUSSIA (RU)
# http://mirror.rol.ru/slackware/slackware-15.0/
# ftp://mirror.yandex.ru/slackware/slackware-15.0/
@@ -241,8 +235,8 @@
# http://mirrors.163.com/slackware/slackware-current/
# http://mirrors.ustc.edu.cn/slackware/slackware-current/
# COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-current/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-current/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware-current/
+# http://mirrors.ucr.ac.cr/slackware/slackware-current/
# CZECH REPUBLIC (CZ)
# ftp://odysseus.linux.cz/pub/linux/slackware/slackware-current/
# http://odysseus.linux.cz/pub/linux/slackware/slackware-current/
@@ -287,8 +281,6 @@
# JAPAN (JP)
# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-current/
# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-current/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-current/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-current/
# ftp://riksun.riken.go.jp/Linux/slackware/slackware-current/
# http://riksun.riken.go.jp/Linux/slackware/slackware-current/
# LITHUANIA (LT)
@@ -303,14 +295,10 @@
# ftp://ftp.slackware.no/slackware/slackware-current/
# http://ftp.slackware.no/slackware/slackware-current/
# POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-current/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-current/
# ftp://ftp.slackware.pl/pub/slackware/slackware-current/
# http://ftp.slackware.pl/pub/slackware/slackware-current/
# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-current/
# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-current/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-current/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-current/
# RUSSIA (RU)
# http://mirror.rol.ru/slackware/slackware-current/
# ftp://mirror.yandex.ru/slackware/slackware-current/
diff --git a/source/ap/slackpkg/files/mirrors-x86_64.sample b/source/ap/slackpkg/files/mirrors-x86_64.sample
index 21d3c4b7a..08731e0b8 100644
--- a/source/ap/slackpkg/files/mirrors-x86_64.sample
+++ b/source/ap/slackpkg/files/mirrors-x86_64.sample
@@ -85,8 +85,8 @@
# http://mirrors.163.com/slackware/slackware64-15.0/
# http://mirrors.ustc.edu.cn/slackware/slackware64-15.0/
# COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware64-15.0/
+# http://mirrors.ucr.ac.cr/slackware/slackware64-15.0/
# CZECH REPUBLIC (CZ)
# ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/
# http://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/
@@ -124,8 +124,6 @@
# JAPAN (JP)
# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/
# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/
# ftp://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/
# http://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/
# LITHUANIA (LT)
@@ -140,14 +138,10 @@
# ftp://ftp.slackware.no/slackware/slackware64-15.0/
# http://ftp.slackware.no/slackware/slackware64-15.0/
# POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/
# ftp://ftp.slackware.pl/pub/slackware/slackware64-15.0/
# http://ftp.slackware.pl/pub/slackware/slackware64-15.0/
# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-15.0/
# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-15.0/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/
# RUSSIA (RU)
# http://mirror.rol.ru/slackware/slackware64-15.0/
# ftp://mirror.yandex.ru/slackware/slackware64-15.0/
@@ -238,8 +232,8 @@
# http://mirrors.163.com/slackware/slackware64-current/
# http://mirrors.ustc.edu.cn/slackware/slackware64-current/
# COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-current/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-current/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware64-current/
+# http://mirrors.ucr.ac.cr/slackware/slackware64-current/
# CZECH REPUBLIC (CZ)
# ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-current/
# http://odysseus.linux.cz/pub/linux/slackware/slackware64-current/
@@ -282,8 +276,6 @@
# JAPAN (JP)
# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-current/
# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-current/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-current/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-current/
# ftp://riksun.riken.go.jp/Linux/slackware/slackware64-current/
# http://riksun.riken.go.jp/Linux/slackware/slackware64-current/
# LITHUANIA (LT)
@@ -298,14 +290,10 @@
# ftp://ftp.slackware.no/slackware/slackware64-current/
# http://ftp.slackware.no/slackware/slackware64-current/
# POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-current/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-current/
# ftp://ftp.slackware.pl/pub/slackware/slackware64-current/
# http://ftp.slackware.pl/pub/slackware/slackware64-current/
# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-current/
# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-current/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-current/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-current/
# RUSSIA (RU)
# http://mirror.rol.ru/slackware/slackware64-current/
# ftp://mirror.yandex.ru/slackware/slackware64-current/
diff --git a/source/ap/slackpkg/files/post-functions.conf-sample b/source/ap/slackpkg/files/post-functions.conf-sample
index 1cbe04ad0..79b5b1b1d 100644
--- a/source/ap/slackpkg/files/post-functions.conf-sample
+++ b/source/ap/slackpkg/files/post-functions.conf-sample
@@ -1,4 +1,4 @@
-# You can list here the .new files and the default action
+# You can list here the .new files and the default action
# to do for each file. The list format is:
#
# /full/path/of/dot/new/file.new:action
@@ -9,6 +9,11 @@
# R to Remove the new file
# K to Keep the current and the .new files
#
+# Using "default" as file name, you'll set the action for
+# the .new files in batch mode. The action for each file
+# takes precedence over the "default" one.
+#
# E.g:
#/etc/slackpkg/mirrors.new:K
#/etc/ntp.conf.new:R
+#default:O
diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index e0036430f..0339e0052 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -152,6 +152,7 @@ looknew() {
-name "*.new" \
${ONLY_NEW_DOTNEW} \
-not -name "rc.inet1.conf.new" \
+ -not -name "rc.wireless.conf.new" \
-not -name "group.new" \
-not -name "passwd.new" \
-not -name "shadow.new" \
@@ -248,6 +249,9 @@ EOF
answer
if [ "${BATCH}" = "on" ] && [ -n "${NEWCONFIG}" ]; then
ANSWER=P
+
+ # This allows to have a default behaviour for all .new files in batch mode.
+ DEF_AUTOANSWER="$(sed -ne 's#^default:\([ORK]\)#\1#p' $NEWCONFIG 2>/dev/null)"
fi
case $ANSWER in
K|k)
@@ -277,7 +281,7 @@ EOF
echo $ANSWER
else
if [ "${BATCH}" = "on" ]; then
- ANSWER=K
+ ANSWER=${DEF_AUTOANSWER:-K}
echo $ANSWER
else
read ANSWER
@@ -340,7 +344,10 @@ Your kernel image was updated, and lilo does not appear to be used on
your system. You may need to adjust your boot manager (like GRUB) to
boot the appropriate kernel (after generating an initrd if required)."
fi
- echo -e "Press the \"Enter\" key to continue...\n "
- read _junk
+
+ if [ "${BATCH}" != "on" ]; then
+ echo -e "Press the \"Enter\" key to continue...\n "
+ read _junk
+ fi
fi
}
generated by cgit v1.2.3-80-g2a13 (git 2.46.2) at 2024-11-01 15:31:10 +0000