[Glibc-bsd-commits] r3142 - trunk/kfreebsd-7/debian
Guillem Jover
guillem at alioth.debian.org
Fri Aug 6 06:11:25 UTC 2010
Author: guillem
Date: 2010-08-06 06:11:18 +0000 (Fri, 06 Aug 2010)
New Revision: 3142
Modified:
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in
trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in
trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in
trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in
Log:
Polish hooks support
Sanitize and single quote maintainer script parameters exported
as DEB_MAINT_PARAMS environment variable
Call preinst and prerm hooks too.
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2010-08-06 06:10:34 UTC (rev 3141)
+++ trunk/kfreebsd-7/debian/changelog 2010-08-06 06:11:18 UTC (rev 3142)
@@ -1,8 +1,15 @@
kfreebsd-7 (7.3-7) unstable; urgency=high
+ [ Aurelien Jarno ]
* Call postinst/postrm hooks as defined by the "Policy for Linux kernel,
initramfs, boot loader update process".
+ [ Guillem Jover ]
+ * Polish hooks support:
+ - Sanitize and single quote maintainer script parameters exported
+ as DEB_MAINT_PARAMS environment variable.
+ - Call preinst and prerm hooks too.
+
-- Aurelien Jarno <aurel32 at debian.org> Fri, 06 Aug 2010 07:04:00 +0200
kfreebsd-7 (7.3-6) unstable; urgency=medium
Modified: trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in 2010-08-06 06:10:34 UTC (rev 3141)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.postinst.in 2010-08-06 06:11:18 UTC (rev 3142)
@@ -54,7 +54,14 @@
fi
fi
fi
-
+
+ # Sanitize and quote maintaner script parameters
+ for p in "$@"; do
+ q="$(echo "$p" | sed -e "s/'/'\\''/g")"
+ DEB_MAINT_PARAMS="$DEB_MAINT_PARAMS '$q'"
+ done
+ export DEB_MAINT_PARAMS
+
# Run /etc/kernel-img.cnf postinst hook if defined
postinst_hook=$(sed '/^\s*postinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
if [ -n "$postinst_hook" ] ; then
@@ -62,12 +69,13 @@
$postinst_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
fi
- # Run /etc/kernel/postinst.d/ hooks if they exists
+ # Run /etc/kernel/postinst.d/ hooks if they exist
if [ -d "/etc/kernel/postinst.d" ] ; then
- DEB_MAINT_PARAMS=$@ \
- run-parts --verbose --exit-on-error \
- --arg=$RELEASE \
- --arg=/boot/kfreebsd-$RELEASE.gz /etc/kernel/postinst.d
+ echo "Running /etc/kernel/postinst.d hooks..." 1>&2
+ run-parts --verbose --exit-on-error \
+ --arg=$RELEASE \
+ --arg=/boot/kfreebsd-$RELEASE.gz \
+ /etc/kernel/postinst.d
fi
;;
Modified: trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in 2010-08-06 06:10:34 UTC (rev 3141)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.postrm.in 2010-08-06 06:11:18 UTC (rev 3142)
@@ -25,6 +25,13 @@
case "$1" in
remove)
+ # Sanitize and quote maintaner script parameters
+ for p in "$@"; do
+ q="$(echo "$p" | sed -e "s/'/'\\''/g")"
+ DEB_MAINT_PARAMS="$DEB_MAINT_PARAMS '$q'"
+ done
+ export DEB_MAINT_PARAMS
+
# Run /etc/kernel-img.conf postrm hook if defined
postrm_hook=$(sed '/^\s*postrm_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
if [ -n "$postrm_hook" ] ; then
@@ -32,12 +39,13 @@
$postrm_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
fi
- # Run /etc/kernel/postrm.d/ hooks if they exists
- if [ -d "/etc/kernel/postrm.d" ] ; then
- DEB_MAINT_PARAMS=$@ \
- run-parts --verbose --exit-on-error \
- --arg=$RELEASE \
- --arg=/boot/kfreebsd-$RELEASE.gz /etc/kernel/postrm.d
+ # Run /etc/kernel/postrm.d/ hooks if they exist
+ if [ -d "/etc/kernel/postrm.d" ]; then
+ echo "Running /etc/kernel/postrm.d hooks..." 1>&2
+ run-parts --verbose --exit-on-error \
+ --arg=$RELEASE \
+ --arg=/boot/kfreebsd-$RELEASE.gz \
+ /etc/kernel/postrm.d
fi
;;
Modified: trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in 2010-08-06 06:10:34 UTC (rev 3141)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.preinst.in 2010-08-06 06:11:18 UTC (rev 3142)
@@ -20,12 +20,28 @@
case "$1" in
install|upgrade)
+ # Sanitize and quote maintaner script parameters
+ for p in "$@"; do
+ q="$(echo "$p" | sed -e "s/'/'\\''/g")"
+ DEB_MAINT_PARAMS="$DEB_MAINT_PARAMS '$q'"
+ done
+ export DEB_MAINT_PARAMS
+
# Run preinst hook if defined
preinst_hook=$(sed '/^\s*preinst_hook/!d;s/.*=\s*//' $KERNEL_IMG_CONF 2>/dev/null || true)
if [ -n "$preinst_hook" ] ; then
echo "Running preinst hook script $preinst_hook." 1>&2
$preinst_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
fi
+
+ # Run /etc/kernel/preinst.d/ hooks if they exist
+ if [ -d "/etc/kernel/preinst.d" ]; then
+ echo "Running /etc/kernel/preinst.d hooks..." 1>&2
+ run-parts --verbose --exit-on-error \
+ --arg=$RELEASE \
+ --arg=/boot/kfreebsd-$RELEASE.gz \
+ /etc/kernel/preinst.d
+ fi
;;
abort-upgrade)
Modified: trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in
===================================================================
--- trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in 2010-08-06 06:10:34 UTC (rev 3141)
+++ trunk/kfreebsd-7/debian/kfreebsd-image.prerm.in 2010-08-06 06:11:18 UTC (rev 3142)
@@ -23,12 +23,28 @@
case "$1" in
remove)
+ # Sanitize and quote maintaner script parameters
+ for p in "$@"; do
+ q="$(echo "$p" | sed -e "s/'/'\\''/g")"
+ DEB_MAINT_PARAMS="$DEB_MAINT_PARAMS '$q'"
+ done
+ export DEB_MAINT_PARAMS
+
# Run prerm hook if defined
prerm_hook=$(sed '/^\s*prerm_hook/!d;s/.*=\s*//g' $KERNEL_IMG_CONF 2>/dev/null || true)
if [ -n "$prerm_hook" ] ; then
echo "Running prerm hook script $prerm_hook." 1>&2
$prerm_hook "$VERSION" "/boot/kfreebsd-$RELEASE.gz"
fi
+
+ # Run /etc/kernel/prerm.d/ hooks if they exist
+ if [ -d "/etc/kernel/prerm.d" ]; then
+ echo "Running /etc/kernel/prerm.d hooks..." 1>&2
+ run-parts --verbose --exit-on-error \
+ --arg=$RELEASE \
+ --arg=/boot/kfreebsd-$RELEASE.gz \
+ /etc/kernel/prerm.d
+ fi
;;
failed-upgrade|upgrade|deconfigure)
More information about the Glibc-bsd-commits
mailing list