summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-10-08 17:36:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-10-08 17:36:57 +0000
commit3b876befb096bfa5605c3d39adf5f2000bd3ac46 (patch)
tree26b0559002a77f4bda73abbd844f248708cc9c50
parentAdding foxyproxy to progress-linux-desktop depends. (diff)
downloadprogress-linux-metapackages-3b876befb096bfa5605c3d39adf5f2000bd3ac46.tar.xz
progress-linux-metapackages-3b876befb096bfa5605c3d39adf5f2000bd3ac46.zip
Updating shutdown handling for newer compute-tools.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rwxr-xr-xdebian/local/shutdown8
-rwxr-xr-xdebian/progress-linux-container.postrm4
-rwxr-xr-xdebian/progress-linux-container.preinst6
-rwxr-xr-xdebian/rules4
4 files changed, 11 insertions, 11 deletions
diff --git a/debian/local/shutdown b/debian/local/shutdown
index 16ee5ed..30e959d 100755
--- a/debian/local/shutdown
+++ b/debian/local/shutdown
@@ -2,12 +2,12 @@
echo "${0}: disabled in systemd-nspawn container"
-if [ -e /etc/open-infrastructure/container/shutdown.txt ]
+if [ -e /etc/compute-tools/shutdown.txt ]
then
- cat /etc/open-infrastructure/container/shutdown.txt
-elif [ -e /usr/share/open-infrastructure/container/shutdown.txt ]
+ cat /etc/compute-tools/shutdown.txt
+elif [ -e /usr/share/container/shutdown.txt ]
then
- cat /usr/share/open-infrastructure/container/shutdown.txt
+ cat /usr/share/container/shutdown.txt
fi
exit 1
diff --git a/debian/progress-linux-container.postrm b/debian/progress-linux-container.postrm
index e927124..28fccd2 100755
--- a/debian/progress-linux-container.postrm
+++ b/debian/progress-linux-container.postrm
@@ -6,12 +6,12 @@ case "${1}" in
remove)
for FILE in halt poweroff reboot shutdown coldreboot
do
- dpkg-divert --package progress-linux-container --quiet --remove --rename --divert /lib/open-infrastructure/container/divert/${FILE}.orig /sbin/${FILE}
+ dpkg-divert --package progress-linux-container --quiet --remove --rename --divert /lib/container/divert/${FILE}.orig /sbin/${FILE}
done
for FILE in pm-hibernate pm-suspend pm-suspend-hybrid
do
- dpkg-divert --package progress-linux-container --quiet --remove --rename --divert /lib/open-infrastructure/container/divert/${FILE}.orig /usr/sbin/${FILE}
+ dpkg-divert --package progress-linux-container --quiet --remove --rename --divert /lib/container/divert/${FILE}.orig /usr/sbin/${FILE}
done
;;
diff --git a/debian/progress-linux-container.preinst b/debian/progress-linux-container.preinst
index 3c99de5..5badcca 100755
--- a/debian/progress-linux-container.preinst
+++ b/debian/progress-linux-container.preinst
@@ -4,16 +4,16 @@ set -e
case "${1}" in
install|upgrade)
- mkdir -p /lib/open-infrastructure/container/divert
+ mkdir -p /lib/container/divert
for FILE in halt poweroff reboot shutdown coldreboot
do
- dpkg-divert --package progress-linux-container --quiet --add --rename --divert /lib/open-infrastructure/container/divert/${FILE}.orig /sbin/${FILE}
+ dpkg-divert --package progress-linux-container --quiet --add --rename --divert /lib/container/divert/${FILE}.orig /sbin/${FILE}
done
for FILE in pm-hibernate pm-suspend pm-suspend-hybrid
do
- dpkg-divert --package progress-linux-container --quiet --add --rename --divert /lib/open-infrastructure/container/divert/${FILE}.orig /usr/sbin/${FILE}
+ dpkg-divert --package progress-linux-container --quiet --add --rename --divert /lib/container/divert/${FILE}.orig /usr/sbin/${FILE}
done
;;
diff --git a/debian/rules b/debian/rules
index c25ff0b..6ec1ace 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,8 @@ execute_after_dh_auto_install:
cp debian/local/shutdown debian/progress-linux-container/usr/sbin/$${FILE}; \
done
- mkdir -p debian/progress-linux-container/usr/share/open-infrastructure/container
- cp debian/local/shutdown.txt debian/progress-linux-container/usr/share/open-infrastructure/container
+ mkdir -p debian/progress-linux-container/usr/share/container
+ cp debian/local/shutdown.txt debian/progress-linux-container/usr/share/container
# removing useless files
rm -f debian/tmp/usr/share/doc/*/CHANGELOG.txt