This is the mail archive of the
cygwin
mailing list for the Cygwin project.
Re: [ANNOUNCEMENT] Updated: csih-0.1.7-1
On Aug 16 22:26, Charles Wilson wrote:
> Corinna --
>
> Attached see
>
> (1) bugfix for ssh-user-config -- self-explanatory.
>
> (2) behavior enhancement for ssh-host-config
>
> Takes advantage of new functions and cleans up behavior under 1.7
> -- esp. 'mount' doesn't have a -t option anymore, so we need
> another mechanism to deal with the dos-format
> WINDOWS/system32/drivers/etc/services file
Thanks for the patch. Just two nits:
> --- /usr/bin/ssh-host-config.old 2008-08-16 18:26:23.560432000 -0400
> +++ /usr/bin/ssh-host-config 2008-08-16 21:39:42.719203200 -0400
> @@ -21,11 +21,28 @@
> LOCALSTATEDIR=/var
>
> source ${CSIH_SCRIPT}
> +if ! csih_version_ge $csih_VERSION 0.1.7
> +then
> + #work around cygcheck 1.7 bug...
> + #sshVER=$(cygcheck -cd openssh | sed -n -e '/openssh/p' | awk '{print $2}')
> + sshVER=$(cat /etc/setup/installed.db |\
> + sed -n -e '/^openssh/s/openssh[ ]//gp' |\
> + awk -F- '{print $2}')
> + csih_error_multi "ssh-host-config version $sshVER requires csih-0.1.7" \
> + "or above. You have csih-${csih_VERSION}. Please update the csih package."
> +fi
> +
If this is really a cygcheck bug, we should fix the bug, rather than to
workaround it here. Consider that Cygwin 1.7 hasn't been released yet.
> - _serv_tmp="${_my_etcdir}/srv.out.$$"
> -
> - mount -t -f "${_win_etcdir}" "${_my_etcdir}"
> -
> - # Depends on the above mount
> - _wservices=`cygpath -w "${_services}"`
> -
> + _serv_tmp1="${_my_etcdir}/srv.out1.$$"
> + _serv_tmp2="${_my_etcdir}/srv.out2.$$"
> +
> + if csih_cygver_is_oneseven
> + then
> + mount -f "${_win_etcdir}" "${_my_etcdir}"
> + cp "${_services}" "${_serv_tmp1}"
> +
> + # Depends on the above mount
> + _wservices=`cygpath -w "${_services}"`
> + dos2unix "${_serv_tmp1}" 2>/dev/null
> + else
> + mount -t -f "${_win_etcdir}" "${_my_etcdir}"
> + cp ${_services} ${_serv_tmp1}
> + [...]
Isn't that workaround for textmode a bit complicated? Wouldn't it be
sufficient to replace
mount -t -f ...
with
mount -o text -f ...
for 1.5 as well as for 1.7?
Thanks,
Corinna
--
Corinna Vinschen Please, send mails regarding Cygwin to
Cygwin Project Co-Leader cygwin AT cygwin DOT com
Red Hat
--
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
Problem reports: http://cygwin.com/problems.html
Documentation: http://cygwin.com/docs.html
FAQ: http://cygwin.com/faq/