summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autoscripts/postinst-udev10
-rw-r--r--autoscripts/preinst-udev12
-rwxr-xr-xdh_installudev6
3 files changed, 15 insertions, 13 deletions
diff --git a/autoscripts/postinst-udev b/autoscripts/postinst-udev
index cbf8dbe..20cf4dc 100644
--- a/autoscripts/postinst-udev
+++ b/autoscripts/postinst-udev
@@ -1,9 +1,9 @@
if [ "$1" = configure ]; then
- if [ -e /etc/udev/#FILE# ]; then
- echo "Preserving user changes to /etc/udev/rules.d/#PRIO##FILE# ..."
- if [ -e /etc/udev/rules.d/#PRIO##FILE# ]; then
- mv -f /etc/udev/rules.d/#PRIO##FILE# /etc/udev/rules.d/#PRIO##FILE#.dpkg-new
+ if [ -e "#OLD#" ]; then
+ echo "Preserving user changes to #RULE# ..."
+ if [ -e "#RULE" ]; then
+ mv -f "#RULE#" "#RULE#.dpkg-new"
fi
- mv -f /etc/udev/#FILE# /etc/udev/rules.d/#PRIO##FILE#
+ mv -f "#OLD#" "#RULE#"
fi
fi
diff --git a/autoscripts/preinst-udev b/autoscripts/preinst-udev
index 9c63d19..9d90a35 100644
--- a/autoscripts/preinst-udev
+++ b/autoscripts/preinst-udev
@@ -1,12 +1,12 @@
if [ "$1" = install ] || [ "$1" = upgrade ]; then
- if [ -e /etc/udev/#FILE# ]; then
- if [ "`md5sum \"/etc/udev/#FILE#\" | sed -e \"s/ .*//\"`" = \
- "`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' /etc/udev/#FILE#'{s/.* //;p}}\" /var/lib/dpkg/status`" ]
+ if [ -e "#OLD#" ]; then
+ if [ "`md5sum \"#OLD#\" | sed -e \"s/ .*//\"`" = \
+ "`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' #OLD#'{s/.* //;p}}\" /var/lib/dpkg/status`" ]
then
- rm -f /etc/udev/#FILE#
+ rm -f "#OLD#"
fi
fi
- if [ -L /etc/udev/rules.d/#PRIO##FILE# ]; then
- rm -f /etc/udev/rules.d/#PRIO##FILE#
+ if [ -L "#RULE#" ]; then
+ rm -f "#RULE#"
fi
fi
diff --git a/dh_installudev b/dh_installudev
index 859efc8..912fecd 100755
--- a/dh_installudev
+++ b/dh_installudev
@@ -77,8 +77,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
doit("install","-m","0644",$rules_file,"$tmp/etc/udev/rules.d/$dh{PRIORITY}$filename");
if (! $dh{NOSCRIPTS}) {
- autoscript($package,"preinst","preinst-udev","s/#FILE#/$filename/g;s/#PRIO#/$dh{PRIORITY}/g");
- autoscript($package,"postinst","postinst-udev","s/#FILE#/$filename/g;s/#PRIO#/$dh{PRIORITY}/g");
+ my $old="/etc/udev/$filename";
+ my $rule="/etc/udev/rules.d/$dh{PRIORITY}$filename";
+ autoscript($package,"preinst","preinst-udev","s!#OLD#!$old!/g;s!#RULE#!$rule!g");
+ autoscript($package,"postinst","postinst-udev","s!#OLD#!$old!/g;s!#RULE#!$rule!g");
}
}
}