diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-03-09 01:26:09 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-03-09 01:26:09 +0100 |
| commit | 83cc3b9039964441828c899bee63ae41955b8ada (patch) | |
| tree | 7f483b440818fca373938fa4bd8a95892e6e4676 | |
| parent | cac0677749f273ee0055a7c7943a85398e637598 (diff) | |
Fix -K option into not starting existing translators.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/local/setup-translators | 2 | ||||
| -rw-r--r-- | debian/patches/makedev_keep_options.patch | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 80e1e171..05ee2c10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ hurd (20110303-1) UNRELEASED; urgency=low * debian/local/finish-install.d/51hurd_config-target-network: Record active network configuration, not only passive. Create /servers/socket/26 node if it doesn't exist yet. + * debian/local/setup-translators, debian/patches/makedev_keep_options.patch: + Fix -K option into not starting existing translators. [ Justus Winter ] * debian/hurd.{postinst,postrm}: Add/remove loginpr shell and login user with diff --git a/debian/local/setup-translators b/debian/local/setup-translators index 96e6bb94..348090ac 100755 --- a/debian/local/setup-translators +++ b/debian/local/setup-translators @@ -75,7 +75,7 @@ st () { name=${3:-$cmdl} echo -n " $name" - if [ "$REPLACE" = y ] || [ ! -e $1 ]; then + if [ "$REPLACE" = y ] || ! showtrans $1 > /dev/null 2>&1 ; then # Work around a bug in ext2fs, which crashes if a non-empty # file is turned into a symlink through settrans, by clearing # the passive translator first. diff --git a/debian/patches/makedev_keep_options.patch b/debian/patches/makedev_keep_options.patch index 90a6c6e9..353bb210 100644 --- a/debian/patches/makedev_keep_options.patch +++ b/debian/patches/makedev_keep_options.patch @@ -43,7 +43,7 @@ Index: hurd/sutils/MAKEDEV.sh local PERM="$3" shift 3 - if cmd settrans -cg "$NODE"; then -+ if [ "$KEEP" ] && [ -e "$NODE" ]; then ++ if [ "$KEEP" ] && showtrans "$NODE" > /dev/null 2>&1 ; then + return; + fi + if cmd settrans $STFLAGS -c "$NODE"; then |