From: Karel Zak Date: Wed, 6 Dec 2006 23:27:03 +0000 (+0100) Subject: Imported from util-linux-2.13-pre3 tarball. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cb689775c56f308cd2128747b3bb6d5a37be213;p=util-linux Imported from util-linux-2.13-pre3 tarball. --- diff --git a/Makefile.in b/Makefile.in index aa996561..1e896d17 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,9 +39,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/config/include-Makefile.am \ $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING INSTALL NEWS \ - config/compile config/config.guess config/config.sub \ - config/depcomp config/install-sh config/missing \ - config/mkinstalldirs config/texinfo.tex + config/compile config/config.guess config/config.rpath \ + config/config.sub config/depcomp config/install-sh \ + config/missing config/mkinstalldirs config/texinfo.tex subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ @@ -88,6 +88,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -148,8 +150,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/NEWS b/NEWS index 7ef1e83a..0b9a0ac2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +util-linux 2.13-pre3 + +* misc buld system fixes +* cfdisk: fix a segfault with ReiserFS partitions +* umount: disallow -r option for non-root users +* updated translations: da, fr, it, nl, ru, sl, tr + util-linux 2.13-pre2 * flock: replaced with flock-2.0.2 by H. Peter Anvin diff --git a/configure b/configure index e3d78066..d80fc54c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for util-linux 2.13-pre2. +# Generated by GNU Autoconf 2.59 for util-linux 2.13-pre3. # # Report bugs to . # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='util-linux' PACKAGE_TARNAME='util-linux' -PACKAGE_VERSION='2.13-pre2' -PACKAGE_STRING='util-linux 2.13-pre2' +PACKAGE_VERSION='2.13-pre3' +PACKAGE_STRING='util-linux 2.13-pre3' PACKAGE_BUGREPORT='bunk@stusta.de' ac_unique_file="mount/mount.c" @@ -312,7 +312,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RANLIB ac_ct_RANLIB PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_RAW_TRUE HAVE_RAW_FALSE HAVE_PAM_TRUE HAVE_PAM_FALSE HAVE_UUID_TRUE HAVE_UUID_FALSE HAVE_LIBUTIL_TRUE HAVE_LIBUTIL_FALSE HAVE_TERMCAP_TRUE HAVE_TERMCAP_FALSE HAVE_ZLIB_TRUE HAVE_ZLIB_FALSE HAVE_BLKID_TRUE HAVE_BLKID_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB HAVE_NCURSES_TRUE HAVE_NCURSES_FALSE USE_SLANG_TRUE USE_SLANG_FALSE NEED_LIBCRYPT_TRUE NEED_LIBCRYPT_FALSE HAVE_PIVOT_ROOT_TRUE HAVE_PIVOT_ROOT_FALSE INTEL_TRUE INTEL_FALSE SPARC_TRUE SPARC_FALSE BUILD_AGETTY_TRUE BUILD_AGETTY_FALSE BUILD_ELVTUNE_TRUE BUILD_ELVTUNE_FALSE BUILD_INIT_TRUE BUILD_INIT_FALSE BUILD_KILL_TRUE BUILD_KILL_FALSE BUILD_LAST_TRUE BUILD_LAST_FALSE BUILD_MESG_TRUE BUILD_MESG_FALSE BUILD_PARTX_TRUE BUILD_PARTX_FALSE BUILD_RAW_TRUE BUILD_RAW_FALSE BUILD_RDEV_TRUE BUILD_RDEV_FALSE BUILD_RENAME_TRUE BUILD_RENAME_FALSE BUILD_RESET_TRUE BUILD_RESET_FALSE BUILD_LOGIN_UTILS_TRUE BUILD_LOGIN_UTILS_FALSE BUILD_SCHEDUTILS_TRUE BUILD_SCHEDUTILS_FALSE BUILD_WALL_TRUE BUILD_WALL_FALSE BUILD_WRITE_TRUE BUILD_WRITE_FALSE USE_TTY_GROUP_TRUE USE_TTY_GROUP_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RANLIB ac_ct_RANLIB PERL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_RAW_TRUE HAVE_RAW_FALSE HAVE_UUID_TRUE HAVE_UUID_FALSE HAVE_LIBUTIL_TRUE HAVE_LIBUTIL_FALSE HAVE_TERMCAP_TRUE HAVE_TERMCAP_FALSE HAVE_BLKID_TRUE HAVE_BLKID_FALSE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB HAVE_NCURSES_TRUE HAVE_NCURSES_FALSE USE_SLANG_TRUE USE_SLANG_FALSE NEED_LIBCRYPT_TRUE NEED_LIBCRYPT_FALSE HAVE_PIVOT_ROOT_TRUE HAVE_PIVOT_ROOT_FALSE INTEL_TRUE INTEL_FALSE SPARC_TRUE SPARC_FALSE BUILD_AGETTY_TRUE BUILD_AGETTY_FALSE BUILD_CRAMFS_TRUE BUILD_CRAMFS_FALSE BUILD_ELVTUNE_TRUE BUILD_ELVTUNE_FALSE BUILD_INIT_TRUE BUILD_INIT_FALSE BUILD_KILL_TRUE BUILD_KILL_FALSE BUILD_LAST_TRUE BUILD_LAST_FALSE BUILD_MESG_TRUE BUILD_MESG_FALSE BUILD_PARTX_TRUE BUILD_PARTX_FALSE BUILD_RAW_TRUE BUILD_RAW_FALSE BUILD_RDEV_TRUE BUILD_RDEV_FALSE BUILD_RENAME_TRUE BUILD_RENAME_FALSE BUILD_RESET_TRUE BUILD_RESET_FALSE BUILD_LOGIN_UTILS_TRUE BUILD_LOGIN_UTILS_FALSE HAVE_PAM_TRUE HAVE_PAM_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE BUILD_SCHEDUTILS_TRUE BUILD_SCHEDUTILS_FALSE BUILD_WALL_TRUE BUILD_WALL_FALSE BUILD_WRITE_TRUE BUILD_WRITE_FALSE USE_TTY_GROUP_TRUE USE_TTY_GROUP_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -781,7 +781,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures util-linux 2.13-pre2 to adapt to many kinds of systems. +\`configure' configures util-linux 2.13-pre3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -847,7 +847,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-linux 2.13-pre2:";; + short | recursive ) echo "Configuration of util-linux 2.13-pre3:";; esac cat <<\_ACEOF @@ -860,6 +860,7 @@ Optional Features: --disable-nls do not use Native Language Support --disable-rpath do not hardcode runtime library paths --disable-agetty do not build agetty + --disable-cramfs do not build fsck.cramfs, mkfs.cramfs --enable-elvtune build elvtune (only works with 2.2 and 2.4 kernels) --enable-init build simpleinit, shutdown, initctl --enable-kill build kill @@ -895,6 +896,8 @@ Optional Packages: --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir --with-slang compile cfdisk with slang + --without-pam compile login-utils without PAM support + --without-selinux compile login-utils without SELinux support Some influential environment variables: CC C compiler command @@ -1004,7 +1007,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -util-linux configure 2.13-pre2 +util-linux configure 2.13-pre3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1018,7 +1021,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by util-linux $as_me 2.13-pre2, which was +It was created by util-linux $as_me 2.13-pre3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1665,7 +1668,7 @@ fi # Define the identity of the package. PACKAGE='util-linux' - VERSION='2.13-pre2' + VERSION='2.13-pre3' cat >>confdefs.h <<_ACEOF @@ -5284,166 +5287,6 @@ fi -for ac_header in security/pam_misc.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ----------------------------- ## -## Report this to bunk@stusta.de ## -## ----------------------------- ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -if test x$ac_cv_header_security_pam_misc_h = xyes; then - HAVE_PAM_TRUE= - HAVE_PAM_FALSE='#' -else - HAVE_PAM_TRUE='#' - HAVE_PAM_FALSE= -fi - - - for ac_func in inet_aton @@ -6680,90 +6523,6 @@ fi -echo "$as_me:$LINENO: checking for crc32 in -lz" >&5 -echo $ECHO_N "checking for crc32 in -lz... $ECHO_C" >&6 -if test "${ac_cv_lib_z_crc32+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char crc32 (); -int -main () -{ -crc32 (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_z_crc32=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_z_crc32=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_z_crc32" >&5 -echo "${ECHO_T}$ac_cv_lib_z_crc32" >&6 -if test $ac_cv_lib_z_crc32 = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBZ 1 -_ACEOF - - LIBS="-lz $LIBS" - -fi - - - -if test x$ac_cv_lib_z_crc32 = xyes; then - HAVE_ZLIB_TRUE= - HAVE_ZLIB_FALSE='#' -else - HAVE_ZLIB_TRUE='#' - HAVE_ZLIB_FALSE= -fi - - - echo "$as_me:$LINENO: checking for blkid_known_fstype in -lblkid" >&5 echo $ECHO_N "checking for blkid_known_fstype in -lblkid... $ECHO_C" >&6 if test "${ac_cv_lib_blkid_blkid_known_fstype+set}" = set; then @@ -6848,92 +6607,6 @@ fi -echo "$as_me:$LINENO: checking for getprevcon in -lselinux" >&5 -echo $ECHO_N "checking for getprevcon in -lselinux... $ECHO_C" >&6 -if test "${ac_cv_lib_selinux_getprevcon+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lselinux $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getprevcon (); -int -main () -{ -getprevcon (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_selinux_getprevcon=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_selinux_getprevcon=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getprevcon" >&5 -echo "${ECHO_T}$ac_cv_lib_selinux_getprevcon" >&6 -if test $ac_cv_lib_selinux_getprevcon = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSELINUX 1 -_ACEOF - - LIBS="-lselinux $LIBS" - -fi - - - -if test x$ac_cv_lib_selinux_getprevcon = xyes; then - HAVE_SELINUX_TRUE= - HAVE_SELINUX_FALSE='#' -else - HAVE_SELINUX_TRUE='#' - HAVE_SELINUX_FALSE= -fi - - -LIBS="" - - MKINSTALLDIRS= @@ -9164,7 +8837,7 @@ done -if test x$ac_cv_header_ncurses_h = xyes -o x$ac_cv_header_ncurses_ncurses_h = xyes; then +if test x$ac_cv_header_ncurses_h = xyes || x$ac_cv_header_ncurses_ncurses_h = xyes; then have_ncurses=yes { echo "$as_me:$LINENO: you have ncurses" >&5 echo "$as_me: you have ncurses" >&6;} @@ -9494,7 +9167,7 @@ fi done - if test x$ac_cv_header_slcurses_h = xyes -o x$ac_cv_header_slang_slcurses_h = xyes; then + if test x$ac_cv_header_slcurses_h = xyes || x$ac_cv_header_slang_slcurses_h = xyes; then use_slang=yes else { { echo "$as_me:$LINENO: error: slang selected but slcurses.h not found" >&5 @@ -9562,7 +9235,6 @@ else sed 's/^/| /' conftest.$ac_ext >&5 - my_LIBS="$LIBS" LIBS="$LIBS -lcrypt" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -9624,7 +9296,6 @@ echo "$as_me: error: crypt() is not available" >&2;} fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - LIBS="$my_LIBS" fi rm -f conftest.err conftest.$ac_objext \ @@ -9920,6 +9591,109 @@ fi +# Check whether --enable-cramfs or --disable-cramfs was given. +if test "${enable_cramfs+set}" = set; then + enableval="$enable_cramfs" + enable_cramfs=$enableval +else + enable_cramfs=check + +fi; + +if test x$enable_cramfs != xno; then + +echo "$as_me:$LINENO: checking for crc32 in -lz" >&5 +echo $ECHO_N "checking for crc32 in -lz... $ECHO_C" >&6 +if test "${ac_cv_lib_z_crc32+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char crc32 (); +int +main () +{ +crc32 (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_z_crc32=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_z_crc32=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_z_crc32" >&5 +echo "${ECHO_T}$ac_cv_lib_z_crc32" >&6 +if test $ac_cv_lib_z_crc32 = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZ 1 +_ACEOF + + LIBS="-lz $LIBS" + +fi + + build_cramfs=$ac_cv_lib_z_crc32 + if test x$enable_cramfs = xyes && test x$ac_cv_lib_z_crc32 = xno; then + { { echo "$as_me:$LINENO: error: cramfs selected but libz not found" >&5 +echo "$as_me: error: cramfs selected but libz not found" >&2;} + { (exit 1); exit 1; }; } + fi +fi + + + +if test x$build_cramfs = xyes; then + BUILD_CRAMFS_TRUE= + BUILD_CRAMFS_FALSE='#' +else + BUILD_CRAMFS_TRUE='#' + BUILD_CRAMFS_FALSE= +fi + + + # Check whether --enable-elvtune or --disable-elvtune was given. if test "${enable_elvtune+set}" = set; then enableval="$enable_elvtune" @@ -10140,6 +9914,285 @@ fi +# Check whether --with-pam or --without-pam was given. +if test "${with_pam+set}" = set; then + withval="$with_pam" + with_pam=$withval +else + with_pam=not_checked + +fi; + +if test x$enable_login_utils = xyes && test x$with_pam != xno; then + +for ac_header in security/pam_misc.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ----------------------------- ## +## Report this to bunk@stusta.de ## +## ----------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test x$with_pam = xyes && test x$ac_cv_header_security_pam_misc_h = xno; then + { { echo "$as_me:$LINENO: error: PAM selected but security/pam_misc.h not found" >&5 +echo "$as_me: error: PAM selected but security/pam_misc.h not found" >&2;} + { (exit 1); exit 1; }; } + fi +fi + + +if test x$ac_cv_header_security_pam_misc_h = xyes; then + HAVE_PAM_TRUE= + HAVE_PAM_FALSE='#' +else + HAVE_PAM_TRUE='#' + HAVE_PAM_FALSE= +fi + + + +# Check whether --with-selinux or --without-selinux was given. +if test "${with_selinux+set}" = set; then + withval="$with_selinux" + with_selinux=$withval +else + with_selinux=not_checked + +fi; + +if test x$enable_login_utils = xyes && test x$with_selinux != xno; then + +echo "$as_me:$LINENO: checking for getprevcon in -lselinux" >&5 +echo $ECHO_N "checking for getprevcon in -lselinux... $ECHO_C" >&6 +if test "${ac_cv_lib_selinux_getprevcon+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lselinux $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getprevcon (); +int +main () +{ +getprevcon (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_selinux_getprevcon=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_selinux_getprevcon=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_getprevcon" >&5 +echo "${ECHO_T}$ac_cv_lib_selinux_getprevcon" >&6 +if test $ac_cv_lib_selinux_getprevcon = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBSELINUX 1 +_ACEOF + + LIBS="-lselinux $LIBS" + +fi + + if test x$with_selinux = xyes && test x$ac_cv_lib_selinux_getprevcon = xno; then + { { echo "$as_me:$LINENO: error: SELinux selected but libselinux not found" >&5 +echo "$as_me: error: SELinux selected but libselinux not found" >&2;} + { (exit 1); exit 1; }; } + fi +fi + + +if test x$ac_cv_lib_selinux_getprevcon = xyes; then + HAVE_SELINUX_TRUE= + HAVE_SELINUX_FALSE='#' +else + HAVE_SELINUX_TRUE='#' + HAVE_SELINUX_FALSE= +fi + + + + # Check whether --enable-schedutils or --disable-schedutils was given. if test "${enable_schedutils+set}" = set; then enableval="$enable_schedutils" @@ -10318,6 +10371,7 @@ _ACEOF fi +LIBS="" CPPFLAGS="-fsigned-char -Wall -Wmissing-prototypes -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration -fomit-frame-pointer $CPPFLAGS" @@ -10440,13 +10494,6 @@ echo "$as_me: error: conditional \"HAVE_RAW\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_PAM\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_PAM\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${HAVE_UUID_TRUE}" && test -z "${HAVE_UUID_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_UUID\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -10468,13 +10515,6 @@ echo "$as_me: error: conditional \"HAVE_TERMCAP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_ZLIB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${HAVE_BLKID_TRUE}" && test -z "${HAVE_BLKID_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_BLKID\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -10482,13 +10522,6 @@ echo "$as_me: error: conditional \"HAVE_BLKID\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_SELINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_SELINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${HAVE_NCURSES_TRUE}" && test -z "${HAVE_NCURSES_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_NCURSES\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -10538,6 +10571,13 @@ echo "$as_me: error: conditional \"BUILD_AGETTY\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${BUILD_CRAMFS_TRUE}" && test -z "${BUILD_CRAMFS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_CRAMFS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUILD_CRAMFS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${BUILD_ELVTUNE_TRUE}" && test -z "${BUILD_ELVTUNE_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"BUILD_ELVTUNE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -10615,6 +10655,20 @@ echo "$as_me: error: conditional \"BUILD_LOGIN_UTILS\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_PAM\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_PAM\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_SELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_SELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${BUILD_SCHEDUTILS_TRUE}" && test -z "${BUILD_SCHEDUTILS_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"BUILD_SCHEDUTILS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -10914,7 +10968,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by util-linux $as_me 2.13-pre2, which was +This file was extended by util-linux $as_me 2.13-pre3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10977,7 +11031,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -util-linux config.status 2.13-pre2 +util-linux config.status 2.13-pre3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -11241,20 +11295,14 @@ s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@HAVE_RAW_TRUE@,$HAVE_RAW_TRUE,;t t s,@HAVE_RAW_FALSE@,$HAVE_RAW_FALSE,;t t -s,@HAVE_PAM_TRUE@,$HAVE_PAM_TRUE,;t t -s,@HAVE_PAM_FALSE@,$HAVE_PAM_FALSE,;t t s,@HAVE_UUID_TRUE@,$HAVE_UUID_TRUE,;t t s,@HAVE_UUID_FALSE@,$HAVE_UUID_FALSE,;t t s,@HAVE_LIBUTIL_TRUE@,$HAVE_LIBUTIL_TRUE,;t t s,@HAVE_LIBUTIL_FALSE@,$HAVE_LIBUTIL_FALSE,;t t s,@HAVE_TERMCAP_TRUE@,$HAVE_TERMCAP_TRUE,;t t s,@HAVE_TERMCAP_FALSE@,$HAVE_TERMCAP_FALSE,;t t -s,@HAVE_ZLIB_TRUE@,$HAVE_ZLIB_TRUE,;t t -s,@HAVE_ZLIB_FALSE@,$HAVE_ZLIB_FALSE,;t t s,@HAVE_BLKID_TRUE@,$HAVE_BLKID_TRUE,;t t s,@HAVE_BLKID_FALSE@,$HAVE_BLKID_FALSE,;t t -s,@HAVE_SELINUX_TRUE@,$HAVE_SELINUX_TRUE,;t t -s,@HAVE_SELINUX_FALSE@,$HAVE_SELINUX_FALSE,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@USE_NLS@,$USE_NLS,;t t s,@MSGFMT@,$MSGFMT,;t t @@ -11290,6 +11338,8 @@ s,@SPARC_TRUE@,$SPARC_TRUE,;t t s,@SPARC_FALSE@,$SPARC_FALSE,;t t s,@BUILD_AGETTY_TRUE@,$BUILD_AGETTY_TRUE,;t t s,@BUILD_AGETTY_FALSE@,$BUILD_AGETTY_FALSE,;t t +s,@BUILD_CRAMFS_TRUE@,$BUILD_CRAMFS_TRUE,;t t +s,@BUILD_CRAMFS_FALSE@,$BUILD_CRAMFS_FALSE,;t t s,@BUILD_ELVTUNE_TRUE@,$BUILD_ELVTUNE_TRUE,;t t s,@BUILD_ELVTUNE_FALSE@,$BUILD_ELVTUNE_FALSE,;t t s,@BUILD_INIT_TRUE@,$BUILD_INIT_TRUE,;t t @@ -11312,6 +11362,10 @@ s,@BUILD_RESET_TRUE@,$BUILD_RESET_TRUE,;t t s,@BUILD_RESET_FALSE@,$BUILD_RESET_FALSE,;t t s,@BUILD_LOGIN_UTILS_TRUE@,$BUILD_LOGIN_UTILS_TRUE,;t t s,@BUILD_LOGIN_UTILS_FALSE@,$BUILD_LOGIN_UTILS_FALSE,;t t +s,@HAVE_PAM_TRUE@,$HAVE_PAM_TRUE,;t t +s,@HAVE_PAM_FALSE@,$HAVE_PAM_FALSE,;t t +s,@HAVE_SELINUX_TRUE@,$HAVE_SELINUX_TRUE,;t t +s,@HAVE_SELINUX_FALSE@,$HAVE_SELINUX_FALSE,;t t s,@BUILD_SCHEDUTILS_TRUE@,$BUILD_SCHEDUTILS_TRUE,;t t s,@BUILD_SCHEDUTILS_FALSE@,$BUILD_SCHEDUTILS_FALSE,;t t s,@BUILD_WALL_TRUE@,$BUILD_WALL_TRUE,;t t diff --git a/configure.ac b/configure.ac index 7d5860e1..635631ad 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(util-linux, 2.13-pre2, bunk@stusta.de) +AC_INIT(util-linux, 2.13-pre3, bunk@stusta.de) AC_PREREQ(2.59) @@ -34,9 +34,6 @@ AC_CHECK_HEADERS(pty.h) AC_CHECK_HEADERS(linux/raw.h) AM_CONDITIONAL(HAVE_RAW, test x$ac_cv_header_linux_raw_h = xyes) -AC_CHECK_HEADERS(security/pam_misc.h) -AM_CONDITIONAL(HAVE_PAM, test x$ac_cv_header_security_pam_misc_h = xyes) - AC_CHECK_FUNCS(inet_aton) @@ -59,17 +56,9 @@ AM_CONDITIONAL(HAVE_LIBUTIL, test x$ac_cv_lib_util_openpty = xyes) AC_CHECK_LIB(termcap, tgetnum) AM_CONDITIONAL(HAVE_TERMCAP, test x$ac_cv_lib_termcap_tgetnum = xyes) -AC_CHECK_LIB(z, crc32) -AM_CONDITIONAL(HAVE_ZLIB, test x$ac_cv_lib_z_crc32 = xyes) - AC_CHECK_LIB(blkid, blkid_known_fstype) AM_CONDITIONAL(HAVE_BLKID, test x$ac_cv_lib_blkid_blkid_known_fstype = xyes) -AC_CHECK_LIB(selinux, getprevcon) -AM_CONDITIONAL(HAVE_SELINUX, test x$ac_cv_lib_selinux_getprevcon = xyes) - -LIBS="" - AM_GNU_GETTEXT([external]) @@ -78,7 +67,7 @@ AC_CHECK_HEADERS(ncurses.h) AC_CHECK_HEADERS(ncurses/ncurses.h) -if test x$ac_cv_header_ncurses_h = xyes -o x$ac_cv_header_ncurses_ncurses_h = xyes; then +if test x$ac_cv_header_ncurses_h = xyes || x$ac_cv_header_ncurses_ncurses_h = xyes; then have_ncurses=yes AC_MSG_NOTICE([you have ncurses]) else @@ -96,7 +85,7 @@ AC_ARG_WITH([slang], if test x$with_slang = xyes; then AC_CHECK_HEADERS(slcurses.h) AC_CHECK_HEADERS(slang/slcurses.h) - if test x$ac_cv_header_slcurses_h = xyes -o x$ac_cv_header_slang_slcurses_h = xyes; then + if test x$ac_cv_header_slcurses_h = xyes || x$ac_cv_header_slang_slcurses_h = xyes; then use_slang=yes else AC_MSG_ERROR([slang selected but slcurses.h not found]) @@ -112,7 +101,6 @@ AC_TRY_LINK([ ],[ char *c = crypt("abc","pw"); ],,[ - my_LIBS="$LIBS" LIBS="$LIBS -lcrypt" AC_TRY_COMPILE([ #define _XOPEN_SOURCE @@ -125,7 +113,6 @@ char *c = crypt("abc","pw"); ],[ AC_MSG_ERROR([crypt() is not available]) ]) - LIBS="$my_LIBS" ]) AM_CONDITIONAL(NEED_LIBCRYPT, test x$need_libcrypt = xyes) @@ -189,6 +176,22 @@ AC_ARG_ENABLE([agetty], AM_CONDITIONAL(BUILD_AGETTY, test x$enable_agetty = xyes) +AC_ARG_ENABLE([cramfs], + AC_HELP_STRING([--disable-cramfs], [do not build fsck.cramfs, mkfs.cramfs]), + enable_cramfs=$enableval, enable_cramfs=check +) + +if test x$enable_cramfs != xno; then + AC_CHECK_LIB(z, crc32) + build_cramfs=$ac_cv_lib_z_crc32 + if test x$enable_cramfs = xyes && test x$ac_cv_lib_z_crc32 = xno; then + AC_MSG_ERROR([cramfs selected but libz not found]) + fi +fi + +AM_CONDITIONAL(BUILD_CRAMFS, test x$build_cramfs = xyes) + + AC_ARG_ENABLE([elvtune], AC_HELP_STRING([--enable-elvtune], [build elvtune (only works with 2.2 and 2.4 kernels)]), enable_elvtune=$enableval, enable_elvtune=no @@ -265,6 +268,33 @@ AC_ARG_ENABLE([login-utils], ) AM_CONDITIONAL(BUILD_LOGIN_UTILS, test x$enable_login_utils = xyes) +AC_ARG_WITH([pam], + AC_HELP_STRING([--without-pam], [compile login-utils without PAM support]), + with_pam=$withval, with_pam=not_checked +) + +if test x$enable_login_utils = xyes && test x$with_pam != xno; then + AC_CHECK_HEADERS(security/pam_misc.h) + if test x$with_pam = xyes && test x$ac_cv_header_security_pam_misc_h = xno; then + AC_MSG_ERROR([PAM selected but security/pam_misc.h not found]) + fi +fi +AM_CONDITIONAL(HAVE_PAM, test x$ac_cv_header_security_pam_misc_h = xyes) + +AC_ARG_WITH([selinux], + AC_HELP_STRING([--without-selinux], [compile login-utils without SELinux support]), + with_selinux=$withval, with_selinux=not_checked +) + +if test x$enable_login_utils = xyes && test x$with_selinux != xno; then + AC_CHECK_LIB(selinux, getprevcon) + if test x$with_selinux = xyes && test x$ac_cv_lib_selinux_getprevcon = xno; then + AC_MSG_ERROR([SELinux selected but libselinux not found]) + fi +fi +AM_CONDITIONAL(HAVE_SELINUX, test x$ac_cv_lib_selinux_getprevcon = xyes) + + AC_ARG_ENABLE([schedutils], AC_HELP_STRING([--disable-schedutils], [do not build chrt, ionice, teskset]), @@ -348,6 +378,7 @@ if test x$enable_use_tty_group = xyes; then fi +LIBS="" CPPFLAGS="-fsigned-char -Wall -Wmissing-prototypes -Wstrict-prototypes -Wundef -Werror-implicit-function-declaration -fomit-frame-pointer $CPPFLAGS" diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am index 0e320821..b94f155a 100644 --- a/disk-utils/Makefile.am +++ b/disk-utils/Makefile.am @@ -22,7 +22,7 @@ man_MANS += raw.8 endif endif -if HAVE_ZLIB +if BUILD_CRAMFS sbin_PROGRAMS += fsck.cramfs mkfs.cramfs fsck_cramfs_SOURCES = fsck.cramfs.c mkfs_cramfs_SOURCES = mkfs.cramfs.c diff --git a/disk-utils/Makefile.in b/disk-utils/Makefile.in index 11601b2d..102f3e5a 100644 --- a/disk-utils/Makefile.in +++ b/disk-utils/Makefile.in @@ -47,7 +47,7 @@ usrbinexec_PROGRAMS = fdformat$(EXEEXT) isosize$(EXEEXT) \ @BUILD_ELVTUNE_TRUE@am__append_2 = elvtune.8 @BUILD_RAW_TRUE@@HAVE_RAW_TRUE@am__append_3 = raw @BUILD_RAW_TRUE@@HAVE_RAW_TRUE@am__append_4 = raw.8 -@HAVE_ZLIB_TRUE@am__append_5 = fsck.cramfs mkfs.cramfs +@BUILD_CRAMFS_TRUE@am__append_5 = fsck.cramfs mkfs.cramfs subdir = disk-utils ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ @@ -61,8 +61,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @BUILD_ELVTUNE_TRUE@am__EXEEXT_1 = elvtune$(EXEEXT) -@HAVE_ZLIB_TRUE@am__EXEEXT_2 = fsck.cramfs$(EXEEXT) \ -@HAVE_ZLIB_TRUE@ mkfs.cramfs$(EXEEXT) +@BUILD_CRAMFS_TRUE@am__EXEEXT_2 = fsck.cramfs$(EXEEXT) \ +@BUILD_CRAMFS_TRUE@ mkfs.cramfs$(EXEEXT) am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(usrbinexecdir)" \ "$(DESTDIR)$(man8dir)" sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -79,7 +79,7 @@ fdformat_SOURCES = fdformat.c fdformat_OBJECTS = fdformat.$(OBJEXT) fdformat_LDADD = $(LDADD) am__fsck_cramfs_SOURCES_DIST = fsck.cramfs.c -@HAVE_ZLIB_TRUE@am_fsck_cramfs_OBJECTS = fsck.cramfs.$(OBJEXT) +@BUILD_CRAMFS_TRUE@am_fsck_cramfs_OBJECTS = fsck.cramfs.$(OBJEXT) fsck_cramfs_OBJECTS = $(am_fsck_cramfs_OBJECTS) fsck_cramfs_DEPENDENCIES = am_fsck_minix_OBJECTS = fsck.minix.$(OBJEXT) @@ -95,9 +95,10 @@ am_mkfs_bfs_OBJECTS = mkfs.bfs.$(OBJEXT) mkfs_bfs_OBJECTS = $(am_mkfs_bfs_OBJECTS) mkfs_bfs_LDADD = $(LDADD) am__mkfs_cramfs_SOURCES_DIST = mkfs.cramfs.c -@HAVE_ZLIB_TRUE@am_mkfs_cramfs_OBJECTS = mkfs.cramfs.$(OBJEXT) +@BUILD_CRAMFS_TRUE@am_mkfs_cramfs_OBJECTS = mkfs.cramfs.$(OBJEXT) mkfs_cramfs_OBJECTS = $(am_mkfs_cramfs_OBJECTS) -@HAVE_ZLIB_TRUE@mkfs_cramfs_DEPENDENCIES = $(top_srcdir)/lib/libmd5.a +@BUILD_CRAMFS_TRUE@mkfs_cramfs_DEPENDENCIES = \ +@BUILD_CRAMFS_TRUE@ $(top_srcdir)/lib/libmd5.a am_mkfs_minix_OBJECTS = mkfs.minix.$(OBJEXT) mkfs_minix_OBJECTS = $(am_mkfs_minix_OBJECTS) mkfs_minix_LDADD = $(LDADD) @@ -137,6 +138,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -197,8 +200,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -292,10 +293,10 @@ man_MANS = blockdev.8 fdformat.8 isosize.8 mkfs.8 mkswap.8 \ fsck_minix_SOURCES = fsck.minix.c mkfs_minix_SOURCES = mkfs.minix.c mkfs_bfs_SOURCES = mkfs.bfs.c -@HAVE_ZLIB_TRUE@fsck_cramfs_SOURCES = fsck.cramfs.c -@HAVE_ZLIB_TRUE@mkfs_cramfs_SOURCES = mkfs.cramfs.c -@HAVE_ZLIB_TRUE@fsck_cramfs_LDADD = -lz -@HAVE_ZLIB_TRUE@mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.a +@BUILD_CRAMFS_TRUE@fsck_cramfs_SOURCES = fsck.cramfs.c +@BUILD_CRAMFS_TRUE@mkfs_cramfs_SOURCES = mkfs.cramfs.c +@BUILD_CRAMFS_TRUE@fsck_cramfs_LDADD = -lz +@BUILD_CRAMFS_TRUE@mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.a @HAVE_UUID_TRUE@mkswap_LDADD = -luuid all: all-am diff --git a/fdisk/Makefile.in b/fdisk/Makefile.in index bd57a075..eef3b5ef 100644 --- a/fdisk/Makefile.in +++ b/fdisk/Makefile.in @@ -113,6 +113,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -173,8 +175,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 8edb2f4a..e3616774 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -715,7 +715,7 @@ get_linux_label(int i) { offset = (p_info[i].first_sector + p_info[i].offset) * SECTOR_SIZE + REISERFS_DISK_OFFSET_IN_BYTES; if (ext2_llseek(fd, offset, SEEK_SET) == offset - && read(fd, &reiserfsb, 1024) == 1024 + && read(fd, &reiserfsb, sizeof(reiserfsb)) == sizeof(reiserfsb) && has_reiserfs_magic_string(&reiserfsb, &reiserfs_is_3_6)) { if (reiserfs_is_3_6) { /* label only on version 3.6 onward */ diff --git a/getopt/Makefile.in b/getopt/Makefile.in index bbc2f2e4..d9d30b8f 100644 --- a/getopt/Makefile.in +++ b/getopt/Makefile.in @@ -91,6 +91,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -151,8 +153,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/hwclock/Makefile.in b/hwclock/Makefile.in index dee47550..653bbc36 100644 --- a/hwclock/Makefile.in +++ b/hwclock/Makefile.in @@ -82,6 +82,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -142,8 +144,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/lib/Makefile.in b/lib/Makefile.in index b70314eb..318749c3 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -88,6 +88,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -148,8 +150,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am index 4a6b1ec0..01b1d65c 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -8,7 +8,7 @@ man_MANS = if BUILD_AGETTY sbin_PROGRAMS += agetty -man_MANS += agetty +man_MANS += agetty.8 endif if BUILD_INIT diff --git a/login-utils/Makefile.in b/login-utils/Makefile.in index e3677670..f883675e 100644 --- a/login-utils/Makefile.in +++ b/login-utils/Makefile.in @@ -44,7 +44,7 @@ usrbinexec_PROGRAMS = $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ sbin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) usrsbinexec_PROGRAMS = $(am__EXEEXT_9) @BUILD_AGETTY_TRUE@am__append_1 = agetty -@BUILD_AGETTY_TRUE@am__append_2 = agetty +@BUILD_AGETTY_TRUE@am__append_2 = agetty.8 @BUILD_INIT_TRUE@am__append_3 = simpleinit shutdown initctl @BUILD_INIT_TRUE@am__append_4 = fastboot.8 fasthalt.8 halt.8 reboot.8 simpleinit.8 shutdown.8 \ @BUILD_INIT_TRUE@ initctl.8 @@ -193,6 +193,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -253,8 +255,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/misc-utils/Makefile.in b/misc-utils/Makefile.in index dc898d70..1fd78fc8 100644 --- a/misc-utils/Makefile.in +++ b/misc-utils/Makefile.in @@ -141,6 +141,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -201,8 +203,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/mount/Makefile.in b/mount/Makefile.in index e448e630..4bd27d09 100644 --- a/mount/Makefile.in +++ b/mount/Makefile.in @@ -117,6 +117,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -177,8 +179,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/mount/README.mount b/mount/README.mount index f010a1bd..3c256415 100644 --- a/mount/README.mount +++ b/mount/README.mount @@ -4,7 +4,7 @@ Doug Quale , H.J. Lu , Rick Sladkey , Stephen Tweedie . +Andries Brouwer -Presently maintained by Andries Brouwer . -Ftp site: ftp.win.tue.nl:/pub/linux/utils/util-linux +Presently maintained by Adrian Bunk . diff --git a/mount/umount.c b/mount/umount.c index 0eab348f..80030c9e 100644 --- a/mount/umount.c +++ b/mount/umount.c @@ -707,7 +707,7 @@ main (int argc, char *argv[]) { if (getuid () != geteuid ()) { suid = 1; - if (all || types || nomtab || force) + if (all || types || nomtab || force || remount) die (2, _("umount: only root can do that")); } diff --git a/partx/Makefile.in b/partx/Makefile.in index 6fa9a0ad..d74f7873 100644 --- a/partx/Makefile.in +++ b/partx/Makefile.in @@ -90,6 +90,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -150,8 +152,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/po/da.gmo b/po/da.gmo index 3627d808..b25e2981 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 03048aef..462dfa99 100644 --- a/po/da.po +++ b/po/da.po @@ -1,11 +1,11 @@ # Danske beskeder for util-linux. -# Copyright (C) 2002, 2004 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. # # Permission is granted to freely copy and distribute # this file and modified versions, provided that this # header is not removed and modified versions are marked # as such. -# Claus Hindsgaul , 2001-2002, 2004. +# Claus Hindsgaul , 2001-2002, 2004, 2005. # Claus Sørensen , 2000. # Keld Jørn Simonsen , 2000. # @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: util-linux 2.11y\n" "Report-Msgid-Bugs-To: Adrian Bunk \n" "POT-Creation-Date: 2005-08-14 18:14+0200\n" -"PO-Revision-Date: 2004-12-04 01:16+0100\n" +"PO-Revision-Date: 2005-08-15 21:00+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -168,9 +168,9 @@ msgstr "brug: %s [ -n ] enhed\n" #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626 #: disk-utils/mkswap.c:522 misc-utils/ddate.c:179 misc-utils/rename.c:79 #: misc-utils/script.c:142 sys-utils/readprofile.c:197 -#, fuzzy, c-format +#, c-format msgid "%s (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "%s (%s)\n" #: disk-utils/fdformat.c:130 #, c-format @@ -456,22 +456,22 @@ msgstr "%ld blokke\n" #: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510 #, c-format msgid "Firstdatazone=%ld (%ld)\n" -msgstr "Firstdatazone=%ld (%ld)\n" +msgstr "Førstedatazone=%ld (%ld)\n" #: disk-utils/fsck.minix.c:620 disk-utils/mkfs.minix.c:511 #, c-format msgid "Zonesize=%d\n" -msgstr "Zonesize=%d\n" +msgstr "Zonestørrelse=%d\n" #: disk-utils/fsck.minix.c:621 #, c-format msgid "Maxsize=%ld\n" -msgstr "Maxsize=%ld\n" +msgstr "Maksstørrelse=%ld\n" #: disk-utils/fsck.minix.c:622 #, c-format msgid "Filesystem state=%d\n" -msgstr "Filesystem state=%d\n" +msgstr "Filsystem-tilstand=%d\n" #: disk-utils/fsck.minix.c:623 #, c-format @@ -479,7 +479,7 @@ msgid "" "namelen=%d\n" "\n" msgstr "" -"namelen=%d\n" +"navnelængde=%d\n" "\n" #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689 @@ -494,7 +494,7 @@ msgstr "Mark #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713 #, c-format msgid "The file `%s' has mode %05o\n" -msgstr "Filen '%s' har modus %05o\n" +msgstr "Filen '%s' har tilstand %05o\n" #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719 #, c-format @@ -570,7 +570,7 @@ msgstr "mislykket s #: disk-utils/fsck.minix.c:1110 disk-utils/fsck.minix.c:1165 #, c-format msgid "Inode %d mode not cleared." -msgstr "Inode %d modus ikke slettet." +msgstr "Inode %d-tilstand ikke slettet." #: disk-utils/fsck.minix.c:1119 disk-utils/fsck.minix.c:1174 #, c-format @@ -585,7 +585,7 @@ msgstr "Inode %d i brug, markeret som ubrugt i bitoversigten." #: disk-utils/fsck.minix.c:1131 disk-utils/fsck.minix.c:1185 #, c-format msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d." -msgstr "Inode %d (modus = %07o), i_nlinks=%d, optalt=%d." +msgstr "Inode %d (tilstand = %07o), i_nlinks=%d, optalt=%d." #: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1187 msgid "Set i_nlinks to count" @@ -857,12 +857,12 @@ msgid "%s: Out of memory!\n" msgstr "%s: Hukommelse opbrugt!\n" #: disk-utils/mkfs.c:103 -#, fuzzy, c-format +#, c-format msgid "mkfs (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "mkfs (%s)\n" #: disk-utils/mkfs.cramfs.c:124 -#, fuzzy, c-format +#, c-format msgid "" "usage: %s [-h] [-v] [-b blksz] [-e edition] [-i file] [-n name] dirname " "outfile\n" @@ -887,10 +887,10 @@ msgstr "" " -e udgave angiv udgavenummer (en del af fsid)\n" " -i fil indsæt filaftryk i filsystemet (kræver >= 2.4.0)\n" " -n navn angiv navnet på cramfs-filsystemet\n" -" -p foranstil %d byte forud for opstartskoden\n" -" -s sortér mappeindgange (gammelt tilvalt, ignoreres)\n" +" -p indsæt %d byte foran opstartskoden\n" +" -s sortér mappeindgange (gammelt tilvalg, ignoreres)\n" " -z lav eksplicitte huller (kræver >= 2.3.39)\n" -" mappenavn roden af det filsystem, der skal komprimeres\n" +" mappenavn roden af det filsystem, der skal komprimeres\n" " udfil uddatafil\n" #: disk-utils/mkfs.cramfs.c:335 @@ -1071,7 +1071,7 @@ msgid "" "Maxsize=%ld\n" "\n" msgstr "" -"Maxsize=%ld\n" +"Maksstørrelse=%ld\n" "\n" #: disk-utils/mkfs.minix.c:526 @@ -1144,27 +1144,27 @@ msgstr "Antager sider med st #: disk-utils/mkswap.c:233 #, c-format msgid "Bad swap header size, no label written.\n" -msgstr "" +msgstr "Ugyldig størelse på swap-hovede, skrev ikke noget mærke.\n" #: disk-utils/mkswap.c:243 #, c-format msgid "Label was truncated.\n" -msgstr "" +msgstr "Mærke afkortet.\n" #: disk-utils/mkswap.c:249 -#, fuzzy, c-format +#, c-format msgid "no label, " -msgstr "mærke" +msgstr "intet mærke, " #: disk-utils/mkswap.c:257 #, c-format msgid "no uuid\n" -msgstr "" +msgstr "ingen uuid\n" #: disk-utils/mkswap.c:381 -#, fuzzy, c-format +#, c-format msgid "Usage: %s [-c] [-v0|-v1] [-pPAGESZ] [-L label] /dev/name [blocks]\n" -msgstr "Brug: %s [-c] [-v0|-v1] [-pPAGESZ] /dev/navn [blokke]\n" +msgstr "Brug: %s [-c] [-v0|-v1] [-pSIDESTR] [-L mærke] /dev/navn [blokke]\n" #: disk-utils/mkswap.c:404 msgid "too many bad pages" @@ -1211,9 +1211,9 @@ msgid "%s: warning: truncating swap area to %ldkB\n" msgstr "%s: fejl: afkorter swap-området til %ldkB\n" #: disk-utils/mkswap.c:644 -#, fuzzy, c-format +#, c-format msgid "%s: error: label only with v1 swap area\n" -msgstr "%s: fejl: Ingen steder at opsætte swap?\n" +msgstr "%s: fejl: mærke med kun v1-swapområde\n" #: disk-utils/mkswap.c:659 #, c-format @@ -1279,9 +1279,8 @@ msgid "Linux XFS" msgstr "Linux XFS" #: fdisk/cfdisk.c:381 -#, fuzzy msgid "Linux JFS" -msgstr "Linux XFS" +msgstr "Linux JFS" #: fdisk/cfdisk.c:383 msgid "Linux ReiserFS" @@ -2745,6 +2744,8 @@ msgid "" "Warning: omitting partitions after #%d.\n" "They will be deleted if you save this partition table.\n" msgstr "" +"Advarsel: udelader partitioner efter #%d.\n" +"De vil blive slettet, hvis du gemmer denne partitionstabel.\n" #: fdisk/fdisk.c:671 #, c-format @@ -3043,6 +3044,9 @@ msgid "" "Probably you selected the wrong device.\n" "\n" msgstr "" +"Dette ligner ikke en partitionstabel\n" +"Du har nok valgt den forkerte enhed.\n" +"\n" #: fdisk/fdisk.c:1723 #, c-format @@ -3243,11 +3247,13 @@ msgstr "" "ændret DOS 6.x partitioner.\n" #: fdisk/fdisk.c:2199 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Error closing file\n" -msgstr "Fejl ved lukning af %s\n" +msgstr "" +"\n" +"Fejl ved lukning af fil\n" #: fdisk/fdisk.c:2203 #, c-format @@ -3442,7 +3448,7 @@ msgid "Detected sgi disklabel with wrong checksum.\n" msgstr "Detekterede SGI diskmærkat med forkert tjeksum.\n" #: fdisk/fdisksgilabel.c:200 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Disk %s (SGI disk label): %d heads, %d sectors\n" @@ -3457,11 +3463,11 @@ msgstr "" "%d cylindre, %d fysiske cylindre\n" "%d ekstra sekt/cyl, interleave %d:1\n" "%s\n" -"Enheder = %s á %d * 512 bytes\n" +"Enheder = %s á %d * %d byte\n" "\n" #: fdisk/fdisksgilabel.c:213 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Disk %s (SGI disk label): %d heads, %d sectors, %d cylinders\n" @@ -3470,7 +3476,7 @@ msgid "" msgstr "" "\n" "Disk %s (SGI disk label): %d hoveder, %d sektorer, %d cylindre\n" -"Enheder = %s á %d * 512 bytes\n" +"Enheder = %s á %d * %d byte\n" "\n" #: fdisk/fdisksgilabel.c:220 @@ -4180,9 +4186,8 @@ msgid "NTFS volume set" msgstr "NTFS bind-sæt" #: fdisk/i386_sys_types.c:62 -#, fuzzy msgid "Linux plaintext" -msgstr "Linux ext3" +msgstr "Linux råtekst" #: fdisk/i386_sys_types.c:64 msgid "Amoeba" @@ -4241,9 +4246,8 @@ msgid "Solaris boot" msgstr "Solaris opstart" #: fdisk/i386_sys_types.c:78 -#, fuzzy msgid "Solaris" -msgstr "Solaris opstart" +msgstr "Solaris" #: fdisk/i386_sys_types.c:79 msgid "DRDOS/sec (FAT-12)" @@ -4971,11 +4975,12 @@ msgid " -g [or --show-geometry]: print the kernel's idea of the geometry" msgstr " -g [eller --show-geometry]: vis kernens bud på den geometri" #: fdisk/sfdisk.c:2326 -#, fuzzy msgid "" " -G [or --show-pt-geometry]: print geometry guessed from the partition " "table" -msgstr " -g [eller --show-geometry]: vis kernens bud på den geometri" +msgstr "" +" -G [eller --show-geometry]: vis kernens bud på den geometri ud fra " +"partitionstabellen" #: fdisk/sfdisk.c:2327 msgid "" @@ -4983,7 +4988,7 @@ msgid "" " or expect descriptors for them on input" msgstr "" " -x [eller --show-extended]: medtag udvidede partitioner i uddata\n" -" eller forvent beskrivelser af dem i inddata" +" eller forvent deskriptorer for dem i inddata" #: fdisk/sfdisk.c:2329 msgid "" @@ -5713,9 +5718,9 @@ msgid "Unable to set the epoch value in the kernel.\n" msgstr "Kunne ikke sætte epokeværdien i kernen.\n" #: hwclock/hwclock.c:1175 -#, fuzzy, c-format +#, c-format msgid "%s from util-linux-%s\n" -msgstr "%s fra %s\n" +msgstr "%s fra util-linux-%s\n" #: hwclock/hwclock.c:1196 #, c-format @@ -7060,7 +7065,7 @@ msgid "%s: can't read temporary file.\n" msgstr "%s: kunne ikke læse midlertidig fil.\n" #: misc-utils/cal.c:313 -#, fuzzy, c-format +#, c-format msgid "%s from %s\n" msgstr "%s fra %s\n" @@ -7092,9 +7097,9 @@ msgid "St. Tib's Day" msgstr "St. Tibs-dag" #: misc-utils/kill.c:189 -#, fuzzy, c-format +#, c-format msgid "%s from %s%s\n" -msgstr "%s fra %s\n" +msgstr "%s fra %s%s\n" #: misc-utils/kill.c:207 #, c-format @@ -7630,7 +7635,7 @@ msgstr "fejl ved skrivning af %s: %s" #: mount/fstab.c:643 #, c-format msgid "error changing mode of %s: %s\n" -msgstr "fejl ved ændring af filmodus for %s: %s\n" +msgstr "fejl ved ændring af filtilstand for %s: %s\n" #: mount/fstab.c:661 #, c-format @@ -7673,28 +7678,28 @@ msgid "loop: can't get info on device %s: %s\n" msgstr "loop: kunne ikke få oplysninger om enheden %s: %s\n" #: mount/lomount.c:179 -#, fuzzy, c-format +#, c-format msgid "%s: could not find any device /dev/loop#" -msgstr "mount: kunne ikke finde nogen /dev/loop# enhed" +msgstr "%s: kunne ikke finde nogen /dev/loop# enhed" #: mount/lomount.c:181 #, c-format msgid "%s: no permission to look at /dev/loop#" -msgstr "" +msgstr "%s: har ikke rettigheder til at kigge i /dev/loop#" #: mount/lomount.c:184 -#, fuzzy, c-format +#, c-format msgid "" "%s: Could not find any loop device. Maybe this kernel does not know\n" " about the loop device? (If so, recompile or `modprobe loop'.)" msgstr "" -"mount: Kunne ikke finde nogen loop-enhed. Måske kender denne kerne ikke til\n" -" loop-enheder? (I så fald, genoversæt eller 'insmod loop.o'.)" +"%s: Kunne ikke finde nogen loop-enhed. Måske kender denne kerne ikke til\n" +" loop-enheder? (I så fald, genoversæt eller 'modprobe loop.o'.)" #: mount/lomount.c:189 -#, fuzzy, c-format +#, c-format msgid "%s: could not find any free loop device" -msgstr "mount: kunne ikke finde nogen ledig loop-enhed" +msgstr "%s: kunne ikke finde nogen ledig loop-enhed" #: mount/lomount.c:287 #, c-format @@ -7723,7 +7728,7 @@ msgstr "" "Denne 'mount' er oversat uden loop-understøttelse. Genoversæt venligst.\n" #: mount/lomount.c:406 -#, fuzzy, c-format +#, c-format msgid "" "usage:\n" " %s loop_device # give info\n" @@ -7734,7 +7739,8 @@ msgstr "" "brug:\n" " %s loop_enhed # vis info\n" " %s -d loop_enhed # slet\n" -" %s [ -e kryptering ] [ -o forskydning ] loop_enhed fil # klargør\n" +" %s -f # find ubenyttet\n" +" %s [ -e kryptering ] [ -o forskydning ] {-f|loop_enhed} fil # klargør\n" #: mount/lomount.c:425 mount/sundries.c:205 mount/xmalloc.c:29 #, c-format @@ -7764,31 +7770,31 @@ msgid "; rest of file ignored" msgstr "; resten af filen blev ignoreret" #: mount/mount_blkid.c:87 -#, fuzzy, c-format +#, c-format msgid "%s: error: the label %s occurs on both %s and %s\n" -msgstr "mount: mærket %s optræder på både %s og %s\n" +msgstr "%s: fejl: mærket %s optræder på både %s og %s\n" #: mount/mount_blkid.c:99 -#, fuzzy, c-format +#, c-format msgid "mount: going to mount %s by UUID\n" -msgstr "mount: vil montere %s som %s\n" +msgstr "mount: vil montere %s efter UUID\n" #: mount/mount_blkid.c:103 -#, fuzzy, c-format +#, c-format msgid "mount: going to mount %s by label\n" -msgstr "mount: vil montere %s som %s\n" +msgstr "mount: vil montere %s efter mærkat\n" #: mount/mount_by_label.c:192 -#, fuzzy, c-format +#, c-format msgid "%s: could not open %s, so UUID and LABEL conversion cannot be done.\n" msgstr "" -"mount: kunne ikke åbne %s, så UUID- og MÆRKE­konvertering kan ikke " +"%s: kunne ikke åbne %s, så UUID- og MÆRKE­-konvertering kan ikke " "gennemføres.\n" #: mount/mount_by_label.c:315 -#, fuzzy, c-format +#, c-format msgid "%s: bad UUID" -msgstr "mount: ugyldig UUID" +msgstr "%s: ugyldig UUID" #: mount/mount.c:382 #, c-format @@ -7813,7 +7819,7 @@ msgstr "mount: fejl ved skrivning til %s: %s" #: mount/mount.c:432 #, c-format msgid "mount: error changing mode of %s: %s" -msgstr "mount: fejl ved ændring af filmodus for %s: %s" +msgstr "mount: fejl ved ændring af filtilstand for %s: %s" #: mount/mount.c:483 #, c-format @@ -7956,31 +7962,37 @@ msgid "mount: %s not mounted already, or bad option" msgstr "mount: %s ikke allerede monteret, eller forkert tilvalg" #: mount/mount.c:959 -#, fuzzy, c-format +#, c-format msgid "" "mount: wrong fs type, bad option, bad superblock on %s,\n" " missing codepage or other error" msgstr "" "mount: forkert filsystemtype, forkert tilvalg, ugyldig superblok på %s,\n" -" eller for mange monterede filsystemer" +" manglende tegnsæt eller anden fejl" #: mount/mount.c:969 msgid "" " (could this be the IDE device where you in fact use\n" " ide-scsi so that sr0 or sda or so is needed?)" msgstr "" +" (kan dette være en IDE-enhed, hvor du i virkeligheden bruger\n" +" ide-scsi, så sr0, sda eller lignende er påkrævet?)" #: mount/mount.c:975 msgid "" " (aren't you trying to mount an extended partition,\n" " instead of some logical partition inside?)" msgstr "" +" (prøver du ikke på at montere en udvidet partition i stedet\n" +" for en logisk partition indeni?)" #: mount/mount.c:992 msgid "" " In some cases useful info is found in syslog - try\n" " dmesg | tail or so\n" msgstr "" +" I nogle tilfælde vil du finde nyttige oplysninger i systemlogggen\n" +" - prøv 'dmesg | tail' eller lignende\n" #: mount/mount.c:998 msgid "mount table full" @@ -8305,7 +8317,7 @@ msgid "bug in xstrndup call" msgstr "programfejl i xstrndup-kald" #: mount/swapon.c:56 -#, fuzzy, c-format +#, c-format msgid "" "usage: %s [-hV]\n" " %s -a [-e] [-v]\n" @@ -8314,7 +8326,7 @@ msgid "" msgstr "" "brug: %s [-hV]\n" " %s -a [-e] [-v]\n" -" %s [-v] [-p prioritet] speciel ...\n" +" %s [-v] [-p prioritet] speciel|LABEL=bindnavn ...\n" " %s [-s]\n" #: mount/swapon.c:66 @@ -8334,24 +8346,24 @@ msgid "%s on %s\n" msgstr "%s på %s\n" #: mount/swapon.c:177 mount/swapon.c:243 -#, fuzzy, c-format +#, c-format msgid "%s: cannot find the device for %s\n" -msgstr "%s: kunne ikke finde \"_stext\" i %s\n" +msgstr "%s: kunne ikke finde enheden for %s\n" #: mount/swapon.c:184 -#, fuzzy, c-format +#, c-format msgid "%s: cannot stat %s: %s\n" -msgstr "swapon: kan ikke finde %s: %s\n" +msgstr "%s: kan ikke finde %s: %s\n" #: mount/swapon.c:195 -#, fuzzy, c-format +#, c-format msgid "%s: warning: %s has insecure permissions %04o, %04o suggested\n" -msgstr "swapon: advarsel: %s har usikre filrettigheder %04o, %04o anbefales\n" +msgstr "%s: advarsel: %s har usikre filrettigheder %04o, %04o anbefales\n" #: mount/swapon.c:207 -#, fuzzy, c-format +#, c-format msgid "%s: Skipping file %s - it appears to have holes.\n" -msgstr "swapon: Dropper filen %s - den lader til at være fragmenteret.\n" +msgstr "%s: Dropper filen %s - den lader til at være fragmenteret.\n" #: mount/swapon.c:275 #, c-format @@ -8369,9 +8381,9 @@ msgid "umount: compiled without support for -f\n" msgstr "umount: oversat uden understøttelse af tilvalget -f\n" #: mount/umount.c:139 -#, fuzzy, c-format +#, c-format msgid "umount: cannot fork: %s" -msgstr "mount: kunne ikke forgrene: %s" +msgstr "umount: kunne ikke forgrene: %s" #: mount/umount.c:171 #, c-format @@ -8470,9 +8482,8 @@ msgstr "" " umount [-f] [-r] [-n] [-v] speciel | knude...\n" #: mount/umount.c:546 -#, fuzzy msgid "Cannot umount \"\"\n" -msgstr "Kunne ikke åbne " +msgstr "Kan ikke afmontere \"\"\n" #: mount/umount.c:552 #, c-format @@ -9209,7 +9220,7 @@ msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n" #: sys-utils/ipcs.c:610 #, c-format msgid "mode=%#o\taccess_perms=%#o\n" -msgstr "modus=%#o\tadgangs_rett=%#o\n" +msgstr "tilstand=%#o\tadgangs_rett=%#o\n" #: sys-utils/ipcs.c:612 #, c-format @@ -9243,7 +9254,7 @@ msgstr "" #: sys-utils/ipcs.c:635 #, c-format msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n" -msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmodus=%#o\n" +msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\ttilstand=%#o\n" #: sys-utils/ipcs.c:637 #, c-format @@ -9277,7 +9288,7 @@ msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n" #: sys-utils/ipcs.c:671 #, c-format msgid "mode=%#o, access_perms=%#o\n" -msgstr "modus=%#o, adgangs_rett=%#o\n" +msgstr "tilstand=%#o, adgangs_rett=%#o\n" #: sys-utils/ipcs.c:673 #, c-format @@ -9602,9 +9613,9 @@ msgid "usage: %s [-dflpcsu] [+linenum | +/pattern] name1 name2 ...\n" msgstr "brug: %s [-dflpcsu] [+linjeantal | +/mønster] navn1 navn2 ...\n" #: text-utils/more.c:439 -#, fuzzy, c-format +#, c-format msgid "%s: unknown option \"-%c\"\n" -msgstr "%s: ukendt signal %s\n" +msgstr "%s: ukendt tilvalg \"-%c\"\n" #: text-utils/more.c:471 #, c-format @@ -9946,14 +9957,14 @@ msgid "usage: rev [file ...]\n" msgstr "brug: rev [fil ...]\n" #: text-utils/tailf.c:53 text-utils/tailf.c:105 -#, fuzzy, c-format +#, c-format msgid "Cannot open \"%s\" for read\n" -msgstr "kunne ikke åbne %s for læsning\n" +msgstr "Kan ikke åbne %s for læsning\n" #: text-utils/tailf.c:93 -#, fuzzy, c-format +#, c-format msgid "Usage: tailf logfile\n" -msgstr "brug: %s [fil]\n" +msgstr "Brug: tailf logfil\n" #: text-utils/ul.c:141 #, c-format diff --git a/po/fr.gmo b/po/fr.gmo index 97b3a939..8ef24455 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 935256c5..491b8247 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,10 +8,10 @@ # msgid "" msgstr "" -"Project-Id-Version: util-linux 2.13-pre1\n" +"Project-Id-Version: util-linux 2.13-pre2\n" "Report-Msgid-Bugs-To: Adrian Bunk \n" "POT-Creation-Date: 2005-08-14 18:14+0200\n" -"PO-Revision-Date: 2005-08-09 08:00-0500\n" +"PO-Revision-Date: 2005-08-22 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -165,9 +165,9 @@ msgstr "usage: %s [ -n ] p #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626 #: disk-utils/mkswap.c:522 misc-utils/ddate.c:179 misc-utils/rename.c:79 #: misc-utils/script.c:142 sys-utils/readprofile.c:197 -#, fuzzy, c-format +#, c-format msgid "%s (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "%s (%s)\n" #: disk-utils/fdformat.c:130 #, c-format @@ -867,9 +867,9 @@ msgid "%s: Out of memory!\n" msgstr "%s: mémoire épuisée!\n" #: disk-utils/mkfs.c:103 -#, fuzzy, c-format +#, c-format msgid "mkfs (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "mkfs (%s)\n" #: disk-utils/mkfs.cramfs.c:124 #, c-format @@ -7256,9 +7256,9 @@ msgid "%s: can't read temporary file.\n" msgstr "%s: ne peut lire du fichier temporaire.\n" #: misc-utils/cal.c:313 -#, fuzzy, c-format +#, c-format msgid "%s from %s\n" -msgstr "%s de %s%s\n" +msgstr "%s de %s\n" #: misc-utils/cal.c:327 msgid "illegal month value: use 1-12" @@ -10237,13 +10237,6 @@ msgstr "Ligne d'entr msgid "Out of memory when growing buffer.\n" msgstr "Mémoire épuisée lors de l'accroissement du tampon.\n" -#, fuzzy -#~ msgid "mkfs from %s\n" -#~ msgstr "%s de %s%s\n" - -#~ msgid "mkfs version %s (%s)\n" -#~ msgstr "mkfs version %s (%s)\n" - #~ msgid "flock: unknown option, aborting.\n" #~ msgstr "flock: option inconnue, annulation de l'opération \n" diff --git a/po/it.gmo b/po/it.gmo index 341713ea..99166740 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index d98ca96f..55c42220 100644 --- a/po/it.po +++ b/po/it.po @@ -7,10 +7,10 @@ # partition table: tavola delle partizioni? tabella delle partizioni? msgid "" msgstr "" -"Project-Id-Version: util-linux 2.12q\n" +"Project-Id-Version: util-linux 2.13-pre2\n" "Report-Msgid-Bugs-To: Adrian Bunk \n" "POT-Creation-Date: 2005-08-14 18:14+0200\n" -"PO-Revision-Date: 2005-02-25 12:33+0000\n" +"PO-Revision-Date: 2005-08-16 12:28+0100\n" "Last-Translator: Marco Colombo \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -164,9 +164,9 @@ msgstr "Uso: %s [ -n ] dispositivo\n" #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626 #: disk-utils/mkswap.c:522 misc-utils/ddate.c:179 misc-utils/rename.c:79 #: misc-utils/script.c:142 sys-utils/readprofile.c:197 -#, fuzzy, c-format +#, c-format msgid "%s (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "%s (%s)\n" #: disk-utils/fdformat.c:130 #, c-format @@ -245,7 +245,7 @@ msgstr "" #: disk-utils/fsck.cramfs.c:399 #, c-format msgid "%s: invalid cramfs--bad path length\n" -msgstr "" +msgstr "%s: cramfs invalido -- lunghezza del percorso non valida\n" #: disk-utils/fsck.cramfs.c:479 #, c-format @@ -266,7 +266,7 @@ msgstr "%s non è un dispositivo a blocchi o un file\n" #: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556 #, c-format msgid "%s: invalid cramfs--file length too short\n" -msgstr "" +msgstr "%s: cramfs non valido -- lunghezza del file troppo corta\n" #: disk-utils/fsck.cramfs.c:548 #, c-format @@ -281,7 +281,7 @@ msgstr "" #: disk-utils/fsck.cramfs.c:571 #, c-format msgid "%s: invalid cramfs--crc error\n" -msgstr "" +msgstr "%s: cramfs non valido -- errore crc\n" #: disk-utils/fsck.cramfs.c:577 #, c-format @@ -291,7 +291,7 @@ msgstr "" #: disk-utils/fsck.cramfs.c:599 #, c-format msgid "%s: invalid cramfs--bad superblock\n" -msgstr "" +msgstr "%s: cramfs non valido -- superblocco danneggiato\n" #: disk-utils/fsck.cramfs.c:615 #, c-format @@ -713,7 +713,7 @@ msgstr "%s: errore di lettura su %s\n" #: disk-utils/isosize.c:150 #, c-format msgid "sector count: %d, sector size: %d\n" -msgstr "" +msgstr "numero settori: %d, dimensione settori: %d\n" #: disk-utils/isosize.c:198 #, c-format @@ -857,9 +857,9 @@ msgid "%s: Out of memory!\n" msgstr "%s: Memoria esaurita!\n" #: disk-utils/mkfs.c:103 -#, fuzzy, c-format +#, c-format msgid "mkfs (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "mkfs (%s)\n" #: disk-utils/mkfs.cramfs.c:124 #, c-format @@ -972,12 +972,16 @@ msgstr "attenzione: dimensioni dei file troncate a %luMB (meno 1 byte).\n" msgid "" "warning: uids truncated to %u bits. (This may be a security concern.)\n" msgstr "" +"attenzione: uid troncati a %u bit. (Questo può essere un problema di " +"sicurezza)\n" #: disk-utils/mkfs.cramfs.c:928 #, c-format msgid "" "warning: gids truncated to %u bits. (This may be a security concern.)\n" msgstr "" +"attenzione: gid troncati a %u bit. (Questo può essere un problema di " +"sicurezza)\n" #: disk-utils/mkfs.cramfs.c:933 #, c-format @@ -1137,7 +1141,7 @@ msgstr "nessuna etichetta, " #: disk-utils/mkswap.c:257 #, c-format msgid "no uuid\n" -msgstr "" +msgstr "nessun uuid\n" #: disk-utils/mkswap.c:381 #, c-format @@ -5352,7 +5356,7 @@ msgstr "" #: getopt/getopt.c:338 msgid " -V, --version Output version information\n" -msgstr " -V, --version informazioni sulla versione di output\n" +msgstr " -V, --version Mostra le informazioni sulla versione\n" #: getopt/getopt.c:395 getopt/getopt.c:456 msgid "missing optstring argument" @@ -5655,14 +5659,14 @@ msgstr "" "meno di un giornodall'ultima calibrazione.\n" #: hwclock/hwclock.c:808 -#, fuzzy, c-format +#, c-format msgid "" "Clock drifted %.1f seconds in the past %d seconds in spite of a drift factor " "of %f seconds/day.\n" "Adjusting drift factor by %f seconds/day\n" msgstr "" -"Il clock ha accumulato una deriva di %d secondi negli ultimi %d secondi " -"nonostante il fattoredi deriva fosse di %f secondi/giorno.\n" +"Il clock ha accumulato una deriva di %.1f secondi negli ultimi %d secondi " +"nonostante il fattore di deriva fosse di %f secondi/giorno.\n" "Regolazione del fattore di deriva a %f secondi/giorno\n" #: hwclock/hwclock.c:859 @@ -5772,12 +5776,12 @@ msgid "Unable to set the epoch value in the kernel.\n" msgstr "Impossibile impostare il valore epoch nel kernel.\n" #: hwclock/hwclock.c:1175 -#, fuzzy, c-format +#, c-format msgid "%s from util-linux-%s\n" -msgstr "%s da %s\n" +msgstr "%s da util-linux-%s\n" #: hwclock/hwclock.c:1196 -#, fuzzy, c-format +#, c-format msgid "" "hwclock - query and set the hardware clock (RTC)\n" "\n" @@ -5812,28 +5816,29 @@ msgstr "" "Uso: hwclock [funzione] [opzioni...]\n" "\n" "Funzioni:\n" -" --help mostra questa guida\n" +" --help mostra questo aiuto\n" " --show legge il clock hardware e stampa il risultato\n" -" --set imposta rtc rispetto all'orario dato con --date\n" +" --set imposta l'rtc rispetto all'orario dato con --date\n" " --hctosys imposta l'ora del sistema dal clock hardware\n" -" --systohc imposta il clock hardware sull'ora del sistema attuale\n" +" --systohc imposta il clock hardware all'ora corrente del sistema\n" " --adjust regola l'rtc tenendo conto della deriva sistematica " "dall'ultima \n" " volta in cui il clock è stato impostato o regolato\n" " --getepoch stampa il valore epoch del clock hardware del kernel\n" " --setepoch imposta il valore epoch del clock hardware del kernel sul \n" " valore dato con --epoch\n" -" --version stampa la versione di hwclock su stdout\n" +" --version stampa la versione di hwclock su standard output\n" "\n" "Opzioni: \n" -" --utc il clock hardware è mantenuto su di un orario universale " -"coordinato\n" -" --localtime il clock hardware è mantenuto sull'ora locale\n" +" --utc il clock hardware è in orario universale coordinato\n" +" --localtime il clock hardware è in ora locale\n" " --directisa accesso diretto al bus ISA invece di %s\n" " --badyear ignora l'anno rtc perché il bios è danneggiato\n" " --date specifica l'ora sulla quale impostare il clock hardware \n" -" --epoch=anno specifica l'anno che è l'inizio per il \n" -" valore epoch del clock hardware\n" +" --epoch=anno specifica l'anno di inizio del valore epoch del clock " +"hardware\n" +" --noadjfile non legge /etc/adjtime; richiede l'uso di --utc o --" +"localtime\n" #: hwclock/hwclock.c:1223 #, c-format @@ -6232,8 +6237,9 @@ msgstr "Login a %s da %s negato per impostazione predefinita.\n" msgid "Login on %s from %s denied.\n" msgstr "Login a %s da %s negato.\n" +# FIXME #: login-utils/chfn.c:128 login-utils/chsh.c:113 -#, fuzzy, c-format +#, c-format msgid "%s: you (user %d) don't exist.\n" msgstr "%s: non si esiste (come utente %d).\n" @@ -6255,7 +6261,7 @@ msgstr "" #: login-utils/chfn.c:152 #, c-format msgid "%s: %s is not authorized to change the finger info of %s\n" -msgstr "" +msgstr "%s: %s non è autorizzato a cambiare le informazioni finger di %s\n" #: login-utils/chfn.c:159 login-utils/chsh.c:144 #, c-format @@ -7132,7 +7138,7 @@ msgid "%s: can't read temporary file.\n" msgstr "%s: impossibile leggere il file temporaneo.\n" #: misc-utils/cal.c:313 -#, fuzzy, c-format +#, c-format msgid "%s from %s\n" msgstr "%s da %s\n" @@ -7144,10 +7150,11 @@ msgstr "valore del mese non valido: usare 1-12" msgid "illegal year value: use 1-9999" msgstr "valore dell'anno non valido: usare 1-9999" +# FIXME #: misc-utils/cal.c:439 #, c-format msgid "%s %d" -msgstr "" +msgstr "%s %d" #: misc-utils/cal.c:780 #, c-format @@ -7164,9 +7171,9 @@ msgid "St. Tib's Day" msgstr "Giorno di S.Tiberio" #: misc-utils/kill.c:189 -#, fuzzy, c-format +#, c-format msgid "%s from %s%s\n" -msgstr "%s da %s\n" +msgstr "%s da %s%s\n" #: misc-utils/kill.c:207 #, c-format @@ -7767,10 +7774,11 @@ msgstr "" " non è a conoscenza del loop device (se è questo il caso,\n" " occorre ricompilare o eseguire 'modprobe loop'.)" +# FIXME #: mount/lomount.c:189 -#, fuzzy, c-format +#, c-format msgid "%s: could not find any free loop device" -msgstr "%s: impossibile trovare un qualsiasi loop device libero" +msgstr "%s: impossibile trovare un loop device libero" #: mount/lomount.c:287 #, c-format @@ -8356,8 +8364,9 @@ msgstr "valore riportato di stato nfs sconosciuto: %d" msgid "bug in xstrndup call" msgstr "bug in chiamata xstrndup" +# FIXME #: mount/swapon.c:56 -#, fuzzy, c-format +#, c-format msgid "" "usage: %s [-hV]\n" " %s -a [-e] [-v]\n" @@ -8369,6 +8378,7 @@ msgstr "" " %s [-v] [-p priorità] speciale|LABEL=volume_name ...\n" " %s [-s]\n" +# FIXME #: mount/swapon.c:66 #, c-format msgid "" @@ -8520,7 +8530,7 @@ msgid "" msgstr "" "Uso: umount [-hV]\n" " umount -a [-f] [-r] [-n] [-v] [-t vfstypes] [-O opts]\n" -" umount [-f] [-r] [-n] [-v] special | node...\n" +" umount [-f] [-r] [-n] [-v] speciale | nodo...\n" #: mount/umount.c:546 msgid "Cannot umount \"\"\n" @@ -9810,15 +9820,15 @@ msgid "" "...Skipping " msgstr "" "\n" -"...sto ignorando" +"...ignorato" #: text-utils/more.c:1633 msgid "...Skipping to file " -msgstr "" +msgstr "...Andato al file " #: text-utils/more.c:1635 msgid "...Skipping back to file " -msgstr "" +msgstr "...Tornato al file " #: text-utils/more.c:1913 msgid "Line too long" @@ -10013,25 +10023,6 @@ msgstr "Linea di input troppo lunga.\n" msgid "Out of memory when growing buffer.\n" msgstr "Memoria insufficiente quando si amplia il buffer.\n" -#, fuzzy -#~ msgid "mkfs from %s\n" -#~ msgstr "%s da %s\n" - -#~ msgid "mkfs version %s (%s)\n" -#~ msgstr "versione mkfs %s (%s)\n" - -#~ msgid "flock: unknown option, aborting.\n" -#~ msgstr "flock: opzione sconosciuta, interruzione.\n" - -#, fuzzy -#~ msgid "" -#~ "Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n" -#~ msgstr "" -#~ "Uso: flock [--shared | --timeout=secondi] nomefile comando {arg arg...}\n" - -#~ msgid "%s version %s\n" -#~ msgstr "%s versione %s\n" - #~ msgid "Invalid number: %s\n" #~ msgstr "Numero non valido: %s\n" @@ -10065,10 +10056,6 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n" #~ msgid "can't stat(%s)" #~ msgstr "impossibile eseguire stat(%s)" -#, fuzzy -#~ msgid "%s doesn't have the correct filemodes" -#~ msgstr "%s non ha i filemode corretti" - #~ msgid "can't read data from %s" #~ msgstr "impossibile leggere i dati da %s" @@ -10181,3 +10168,14 @@ msgstr "Memoria insufficiente quando si amplia il buffer.\n" #~ msgid "mount: this version was compiled without support for the type `nfs'" #~ msgstr "" #~ "mount: questa versione è stata compilata senza supporto per il tipo 'nfs'" + +#~ msgid "flock: unknown option, aborting.\n" +#~ msgstr "flock: opzione sconosciuta, interruzione.\n" + +#~ msgid "" +#~ "Usage flock [--shared | --timeout=seconds] filename command {arg arg...}\n" +#~ msgstr "" +#~ "Uso: flock [--shared | --timeout=secondi] nomefile comando {arg arg...}\n" + +#~ msgid "%s version %s\n" +#~ msgstr "%s versione %s\n" diff --git a/po/nl.gmo b/po/nl.gmo index 1e44e9ab..afb018f0 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index ef9697db..74b4b8a9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -18,10 +18,10 @@ # msgid "" msgstr "" -"Project-Id-Version: util-linux 2.13-pre1\n" +"Project-Id-Version: util-linux 2.13-pre2\n" "Report-Msgid-Bugs-To: Adrian Bunk \n" "POT-Creation-Date: 2005-08-14 18:14+0200\n" -"PO-Revision-Date: 2005-08-03 22:12+0100\n" +"PO-Revision-Date: 2005-08-19 20:27+0100\n" "Last-Translator: Luk Claes \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -174,9 +174,9 @@ msgstr "gebruik: %s [ -n ] apparaat\n" #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626 #: disk-utils/mkswap.c:522 misc-utils/ddate.c:179 misc-utils/rename.c:79 #: misc-utils/script.c:142 sys-utils/readprofile.c:197 -#, fuzzy, c-format +#, c-format msgid "%s (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "%s (%s)\n" #: disk-utils/fdformat.c:130 #, c-format @@ -866,9 +866,9 @@ msgid "%s: Out of memory!\n" msgstr "%s: Geheugentekort!\n" #: disk-utils/mkfs.c:103 -#, fuzzy, c-format +#, c-format msgid "mkfs (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "mkfs (%s)\n" #: disk-utils/mkfs.cramfs.c:124 #, c-format @@ -7136,9 +7136,9 @@ msgid "%s: can't read temporary file.\n" msgstr "%s: kan tijdelijke bestand niet lezen.\n" #: misc-utils/cal.c:313 -#, fuzzy, c-format +#, c-format msgid "%s from %s\n" -msgstr "%s van %s%s\n" +msgstr "%s van %s\n" #: misc-utils/cal.c:327 msgid "illegal month value: use 1-12" @@ -10087,13 +10087,6 @@ msgstr "Invoerregel te lang.\n" msgid "Out of memory when growing buffer.\n" msgstr "Geheugentekort bij groeiende buffer.\n" -#, fuzzy -#~ msgid "mkfs from %s\n" -#~ msgstr "%s van %s%s\n" - -#~ msgid "mkfs version %s (%s)\n" -#~ msgstr "mkfs versie %s (%s)\n" - #~ msgid "flock: unknown option, aborting.\n" #~ msgstr "flock: onbekende optie, afbreken.\n" diff --git a/po/ru.gmo b/po/ru.gmo index f9cb08ce..99afb10f 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index deab3c03..1c209f63 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,14 +1,14 @@ -# Translation of util-linux-2.13-pre1.po to Russian +# Translation of util-linux-2.13-pre2.po to Russian # Copyright (C) 2003 Free Software Foundation Inc. # This file is put in the public domain. # Pavel Maryanov , 2003, 2004, 2005. # msgid "" msgstr "" -"Project-Id-Version: util-linux 2.13-pre1\n" +"Project-Id-Version: util-linux-2.13-pre2\n" "Report-Msgid-Bugs-To: Adrian Bunk \n" "POT-Creation-Date: 2005-08-14 18:14+0200\n" -"PO-Revision-Date: 2005-08-04 14:27+0300\n" +"PO-Revision-Date: 2005-08-16 16:54+0300\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -162,9 +162,9 @@ msgstr " #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626 #: disk-utils/mkswap.c:522 misc-utils/ddate.c:179 misc-utils/rename.c:79 #: misc-utils/script.c:142 sys-utils/readprofile.c:197 -#, fuzzy, c-format +#, c-format msgid "%s (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "%s (%s)\n" #: disk-utils/fdformat.c:130 #, c-format @@ -852,9 +852,9 @@ msgid "%s: Out of memory!\n" msgstr "%s: îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ!\n" #: disk-utils/mkfs.c:103 -#, fuzzy, c-format +#, c-format msgid "mkfs (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "mkfs (%s)\n" #: disk-utils/mkfs.cramfs.c:124 #, c-format @@ -7152,9 +7152,9 @@ msgid "%s: can't read temporary file.\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n" #: misc-utils/cal.c:313 -#, fuzzy, c-format +#, c-format msgid "%s from %s\n" -msgstr "%s ÉÚ %s%s\n" +msgstr "%s ÉÚ %s\n" #: misc-utils/cal.c:327 msgid "illegal month value: use 1-12" @@ -10118,22 +10118,3 @@ msgstr " #, c-format msgid "Out of memory when growing buffer.\n" msgstr "îÅ È×ÁÔÁÅÔ ÐÁÍÑÔÉ ÐÒÉ Õ×ÅÌÉÞÅÎÉÉ ÂÕÆÅÒÁ.\n" - -#, fuzzy -#~ msgid "mkfs from %s\n" -#~ msgstr "%s ÉÚ %s%s\n" - -#~ msgid "mkfs version %s (%s)\n" -#~ msgstr "mkfs ×ÅÒÓÉÉ %s (%s)\n" - -#~ msgid "flock: unknown option, aborting.\n" -#~ msgstr "flock: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÒÅÒÙ×ÁÎÉÅ.\n" - -#~ msgid "" -#~ "Usage flock [--shared] [--timeout=seconds] filename command {arg arg...}\n" -#~ msgstr "" -#~ "éÓÐÏÌØÚÏ×ÁÎÉÅ flock [--shared [--timeout=ÓÅËÕÎÄÙ] ÉÍÑ_ÆÁÊÌÁ ËÏÍÁÎÄÁ {ÁÒÇ " -#~ "ÁÒÇ...}\n" - -#~ msgid "%s version %s\n" -#~ msgstr "%s ×ÅÒÓÉÑ %s\n" diff --git a/po/sl.gmo b/po/sl.gmo index 51706bac..64619fef 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 96137697..d55de539 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # -*- mode: po -*- Slovenian translation for util-linux package. # Copyright (C) 2002, 2003 Free Software Foundation, Inc. # Primo¾ Peterlin , 2002, 2003. -# $Id: util-linux-2.11y.sl.po,v 1.2 2003/01/28 15:30:46 peterlin Exp $ +# $Id: util-linux-2.11z.sl.po,v 1.3 2003/04/22 09:36:06 peterlin Exp $ # # Permission is granted to freely copy and distribute # this file and modified versions, provided that this @@ -10,10 +10,10 @@ # msgid "" msgstr "" -"Project-Id-Version: util-linux 2.11y\n" +"Project-Id-Version: util-linux 2.11z\n" "Report-Msgid-Bugs-To: Adrian Bunk \n" "POT-Creation-Date: 2005-08-14 18:14+0200\n" -"PO-Revision-Date: 2003-01-28 16:30+0100\n" +"PO-Revision-Date: 2003-04-22 11:35+0200\n" "Last-Translator: Primo¾ Peterlin \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" @@ -30,27 +30,28 @@ msgstr "nastavi za pisanje in branje" #: disk-utils/blockdev.c:66 msgid "get read-only" -msgstr "" +msgstr "preberi samo za branje" #: disk-utils/blockdev.c:69 msgid "get sectorsize" -msgstr "" +msgstr "preberi velikost sektorja" #: disk-utils/blockdev.c:72 msgid "get blocksize" -msgstr "" +msgstr "preberi velikost bloka" #: disk-utils/blockdev.c:75 msgid "set blocksize" -msgstr "" +msgstr "nastavi velikost bloka" #: disk-utils/blockdev.c:78 msgid "get 32-bit sector count" msgstr "" #: disk-utils/blockdev.c:81 +#, fuzzy msgid "get size in bytes" -msgstr "" +msgstr "preberi velikost" #: disk-utils/blockdev.c:84 msgid "set readahead" @@ -62,7 +63,7 @@ msgstr "" #: disk-utils/blockdev.c:90 msgid "flush buffers" -msgstr "" +msgstr "izprazni medpomnilnike" #: disk-utils/blockdev.c:94 msgid "reread partition table" @@ -238,9 +239,9 @@ msgid "%s: Non-size (%ld vs %ld) bytes\n" msgstr "%s: Zapisanih samo %lu od skupno %lu bajtov" #: disk-utils/fsck.cramfs.c:399 -#, fuzzy, c-format +#, c-format msgid "%s: invalid cramfs--bad path length\n" -msgstr "%s: neveljavno dol¾ina pripone" +msgstr "%s: neveljaven cramfs - slaba dol¾ina poti\n" #: disk-utils/fsck.cramfs.c:479 #, c-format @@ -258,49 +259,50 @@ msgid "%s is not a block device or file\n" msgstr "%s ni bloèna enota, niti datoteka\n" #: disk-utils/fsck.cramfs.c:521 disk-utils/fsck.cramfs.c:556 -#, fuzzy, c-format +#, c-format msgid "%s: invalid cramfs--file length too short\n" -msgstr "%s: neveljavno dol¾ina pripone" +msgstr "%s: neveljaven cramfs - ime datoteke prekratko\n" #: disk-utils/fsck.cramfs.c:548 #, c-format msgid "%s: invalid cramfs--wrong magic\n" -msgstr "" +msgstr "%s: neveljaven cramfs - napaèno magièno ¹tevilo\n" #: disk-utils/fsck.cramfs.c:561 #, c-format msgid "%s: warning--file length too long, padded image?\n" -msgstr "" +msgstr "%s: opozorilo - dol¾ina datoteke predolga, dopolnjena slika?\n" #: disk-utils/fsck.cramfs.c:571 -#, fuzzy, c-format +#, c-format msgid "%s: invalid cramfs--crc error\n" -msgstr "%s: neveljavno ¹tevilo" +msgstr "%s: neveljaven cramfs - napaka v nadzorni vsoti\n" #: disk-utils/fsck.cramfs.c:577 #, c-format msgid "%s: warning--old cramfs image, no CRC\n" -msgstr "" +msgstr "%s: opozorilo - stari zapis cramfs, nadzorna vsota manjka\n" #: disk-utils/fsck.cramfs.c:599 -#, fuzzy, c-format +#, c-format msgid "%s: invalid cramfs--bad superblock\n" -msgstr "%s: neveljavno ¹tevilo" +msgstr "%s: neveljaven cramfs - slab superblok\n" #: disk-utils/fsck.cramfs.c:615 #, c-format msgid "%s: invalid cramfs--directory data end (%ld) != file data start (%ld)\n" msgstr "" +"%s: neveljaven cramfs - konec imenikov (%ld) ni enak zaèetku datotek (%ld)\n" #: disk-utils/fsck.cramfs.c:623 #, c-format msgid "%s: invalid cramfs--invalid file data offset\n" -msgstr "" +msgstr "%s neveljaven cramfs - neveljaven odmik datoteènih podatkov\n" #: disk-utils/fsck.minix.c:186 #, c-format msgid "Usage: %s [-larvsmf] /dev/name\n" -msgstr "" +msgstr "Uporaba: %s [-larvsmf] /dev/ime\n" #: disk-utils/fsck.minix.c:293 #, c-format @@ -338,7 +340,7 @@ msgstr "" #: disk-utils/fsck.minix.c:374 #, c-format msgid "Read error: bad block in file '%s'\n" -msgstr "" +msgstr "Napaka pri branju: slab blok v datoteki ,%s`\n" #: disk-utils/fsck.minix.c:389 #, c-format @@ -349,7 +351,7 @@ msgstr "" #: disk-utils/fsck.minix.c:395 disk-utils/mkfs.minix.c:267 msgid "seek failed in write_block" -msgstr "" +msgstr "neuspel klic seek v funkciji write_block" #: disk-utils/fsck.minix.c:398 #, c-format @@ -358,11 +360,11 @@ msgstr "Napaka pri pisanju: slab blok v datoteki ,%s`\n" #: disk-utils/fsck.minix.c:514 msgid "seek failed in write_super_block" -msgstr "" +msgstr "iskanje neuspelo v funkciji write_super_block" #: disk-utils/fsck.minix.c:516 disk-utils/mkfs.minix.c:254 msgid "unable to write super-block" -msgstr "" +msgstr "zapisovanje superbloka neuspe¹no" #: disk-utils/fsck.minix.c:526 msgid "Unable to write inode map" @@ -374,11 +376,11 @@ msgstr "" #: disk-utils/fsck.minix.c:530 msgid "Unable to write inodes" -msgstr "" +msgstr "Neuspe¹en zapis inodov" #: disk-utils/fsck.minix.c:557 msgid "seek failed" -msgstr "" +msgstr "klic seek neuspe¹en" #: disk-utils/fsck.minix.c:559 msgid "unable to read super block" @@ -436,12 +438,12 @@ msgstr "" #: disk-utils/fsck.minix.c:617 disk-utils/mkfs.minix.c:508 #, c-format msgid "%ld inodes\n" -msgstr "" +msgstr "%ld inodov\n" #: disk-utils/fsck.minix.c:618 disk-utils/mkfs.minix.c:509 #, c-format msgid "%ld blocks\n" -msgstr "" +msgstr "%ld blokov\n" #: disk-utils/fsck.minix.c:619 disk-utils/mkfs.minix.c:510 #, c-format @@ -473,11 +475,11 @@ msgstr "" #: disk-utils/fsck.minix.c:638 disk-utils/fsck.minix.c:689 #, c-format msgid "Inode %d marked unused, but used for file '%s'\n" -msgstr "" +msgstr "Inod %d oznaèen kot prost, vendar v rabi za datoteko ,%s`\n" #: disk-utils/fsck.minix.c:642 disk-utils/fsck.minix.c:693 msgid "Mark in use" -msgstr "" +msgstr "Oznaèi kot uporabljen" #: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:713 #, c-format @@ -487,7 +489,7 @@ msgstr "" #: disk-utils/fsck.minix.c:671 disk-utils/fsck.minix.c:719 #, c-format msgid "Warning: inode count too big.\n" -msgstr "" +msgstr "Opozorilo: ¹tevilo inodov preveliko.\n" #: disk-utils/fsck.minix.c:731 msgid "root inode isn't a directory" @@ -669,6 +671,9 @@ msgid "" "FILE SYSTEM HAS BEEN CHANGED\n" "----------------------------\n" msgstr "" +"----------------------------------\n" +"DATOTEÈNI SISTEM JE BIL SPREMENJEN\n" +"----------------------------------\n" #: disk-utils/isosize.c:129 #, c-format @@ -678,7 +683,7 @@ msgstr "%s: odpiranje ni uspelo: %s\n" #: disk-utils/isosize.c:135 #, c-format msgid "%s: seek error on %s\n" -msgstr "" +msgstr "%s: napaka pri iskanju na %s\n" #: disk-utils/isosize.c:141 #, c-format @@ -688,7 +693,7 @@ msgstr "%s: napaka pri branju z %s\n" #: disk-utils/isosize.c:150 #, c-format msgid "sector count: %d, sector size: %d\n" -msgstr "" +msgstr "¹t. sektorjev: %d, vel. sektorjev: %d\n" #: disk-utils/isosize.c:198 #, c-format @@ -742,7 +747,7 @@ msgstr "" #: disk-utils/mkfs.bfs.c:207 msgid "too many inodes - max is 512" -msgstr "" +msgstr "preveè inodov - najveè 512" #: disk-utils/mkfs.bfs.c:216 #, c-format @@ -832,7 +837,7 @@ msgstr "%s: Zmanjkalo pomnilnika!\n" #: disk-utils/mkfs.c:103 #, fuzzy, c-format msgid "mkfs (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "mkfs, izdaja %s (%s)\n" #: disk-utils/mkfs.cramfs.c:124 #, c-format @@ -990,20 +995,20 @@ msgstr "" #: disk-utils/mkfs.minix.c:260 msgid "unable to write inodes" -msgstr "" +msgstr "zapis inodov ni uspel" #: disk-utils/mkfs.minix.c:269 msgid "write failed in write_block" -msgstr "" +msgstr "pisanje neuspelo v funkciji write_block" #: disk-utils/mkfs.minix.c:277 disk-utils/mkfs.minix.c:351 #: disk-utils/mkfs.minix.c:400 msgid "too many bad blocks" -msgstr "" +msgstr "preveè slabih blokov" #: disk-utils/mkfs.minix.c:285 msgid "not enough good blocks" -msgstr "" +msgstr "premalo uporabnih blokov" #: disk-utils/mkfs.minix.c:497 msgid "unable to allocate buffers for maps" @@ -1040,12 +1045,12 @@ msgstr "" #: disk-utils/mkfs.minix.c:580 disk-utils/mkfs.minix.c:602 #, c-format msgid "%d bad blocks\n" -msgstr "" +msgstr "%d slabih blokov\n" #: disk-utils/mkfs.minix.c:582 disk-utils/mkfs.minix.c:604 #, c-format msgid "one bad block\n" -msgstr "" +msgstr "en slab blok\n" #: disk-utils/mkfs.minix.c:592 msgid "can't open file of bad blocks" @@ -1054,7 +1059,7 @@ msgstr "" #: disk-utils/mkfs.minix.c:674 #, c-format msgid "strtol error: number of blocks not specified" -msgstr "" +msgstr "napaka v funkciji strtol: ¹tevilo blokov ni podano" #: disk-utils/mkfs.minix.c:704 #, c-format @@ -1074,7 +1079,7 @@ msgstr "" #: disk-utils/mkswap.c:177 #, c-format msgid "Bad user-specified page size %d\n" -msgstr "Slaba podana velikost strani %d\n" +msgstr "Neustrezna podana velikost strani %d\n" #: disk-utils/mkswap.c:186 #, c-format @@ -1209,7 +1214,7 @@ msgstr "fsync() ni uspel" #: fdisk/cfdisk.c:370 fdisk/cfdisk.c:2061 msgid "Unusable" -msgstr "" +msgstr "Neuporabno" #: fdisk/cfdisk.c:372 fdisk/cfdisk.c:2063 msgid "Free Space" @@ -1271,6 +1276,10 @@ msgid "" "DOS 6.x partitions, please see the cfdisk manual\n" "page for additional information.\n" msgstr "" +"\n" +"OPOZORILO: Èe ste ustvarili ali spremenili\n" +"kak¹en razdelek DOS 6.x, si prosim oglejte\n" +"priroènik cfdiska za dodatne informacije.\n" #: fdisk/cfdisk.c:506 msgid "FATAL ERROR" @@ -1282,7 +1291,7 @@ msgstr "Pritisnike katerokoli tipko za izhod iz cfdisk" #: fdisk/cfdisk.c:554 fdisk/cfdisk.c:562 msgid "Cannot seek on disk drive" -msgstr "" +msgstr "Iskanje na disku ni mogoèe" #: fdisk/cfdisk.c:556 msgid "Cannot read disk drive" @@ -1339,18 +1348,19 @@ msgstr "" msgid "" "Cannot create logical drive here -- would create two extended partitions" msgstr "" +"Logiènega pogona ni mogoèe ustvariti - ustvarili bi dva raz¹irjena razdelka" #: fdisk/cfdisk.c:1158 msgid "Menu item too long. Menu may look odd." -msgstr "" +msgstr "Menujski vnos predolg. Menu bi izgledal èudno." #: fdisk/cfdisk.c:1214 msgid "Menu without direction. Defaulting horizontal." -msgstr "" +msgstr "Menu brez smeri. Privzeta je vodoravna." #: fdisk/cfdisk.c:1345 msgid "Illegal key" -msgstr "" +msgstr "Nedovoljena tipka" #: fdisk/cfdisk.c:1368 msgid "Press a key to continue" @@ -1428,7 +1438,7 @@ msgstr "Enostaven izpis tabele razdelkov" #: fdisk/cfdisk.c:1581 #, fuzzy msgid "Unknown partition table type" -msgstr "ponovno preberi tabelo razdelkov" +msgstr "Tabela razdelkov zapisana na disku" #: fdisk/cfdisk.c:1583 msgid "Do you wish to start with a zero table [y/N] ?" @@ -1436,15 +1446,15 @@ msgstr "" #: fdisk/cfdisk.c:1631 msgid "You specified more cylinders than fit on disk" -msgstr "" +msgstr "Navedli ste veè stez, kot jih disk zmore" #: fdisk/cfdisk.c:1663 msgid "Cannot open disk drive" -msgstr "" +msgstr "Diskovnega pogona ni moè odpreti" #: fdisk/cfdisk.c:1665 fdisk/cfdisk.c:1845 msgid "Opened disk read-only - you have no permission to write" -msgstr "" +msgstr "Disk odprt samo za branje - nimate dovoljenja za pisanje" #: fdisk/cfdisk.c:1686 msgid "Cannot get disk size" @@ -1576,7 +1586,7 @@ msgstr "" #: fdisk/cfdisk.c:2114 #, fuzzy msgid " First Last\n" -msgstr "parametri\n" +msgstr " t - Surova oblika tabele" #: fdisk/cfdisk.c:2115 msgid "" @@ -1664,95 +1674,97 @@ msgstr "------- -------" #: fdisk/cfdisk.c:2275 msgid " b Toggle bootable flag of the current partition" -msgstr "" +msgstr " b Preklop med zagonskim/nezagonskim razdelkom" #: fdisk/cfdisk.c:2276 msgid " d Delete the current partition" -msgstr "" +msgstr " d Izbri¹i trenutni razdelek" #: fdisk/cfdisk.c:2277 msgid " g Change cylinders, heads, sectors-per-track parameters" -msgstr "" +msgstr " g Spremeni parametre (¹t. stez, ¹t. glav, sektorjev/stezo)" #: fdisk/cfdisk.c:2278 msgid " WARNING: This option should only be used by people who" msgstr "" +" OPOZORILO: Izbiro naj izberejo le usposobljeni strokovnjaki," #: fdisk/cfdisk.c:2279 msgid " know what they are doing." -msgstr "" +msgstr " ki razumejo, kaj poènejo." #: fdisk/cfdisk.c:2280 msgid " h Print this screen" -msgstr "" +msgstr " h Ta navodila" #: fdisk/cfdisk.c:2281 msgid " m Maximize disk usage of the current partition" -msgstr "" +msgstr " m Maksimiziraj trenutni razdelek" #: fdisk/cfdisk.c:2282 msgid " Note: This may make the partition incompatible with" -msgstr "" +msgstr " Opomba: To lahko napravi razdelek nezdru¾ljiv z drugimi" #: fdisk/cfdisk.c:2283 msgid " DOS, OS/2, ..." -msgstr "" +msgstr " operacijskimi sistemi (DOS, OS/2)" #: fdisk/cfdisk.c:2284 msgid " n Create new partition from free space" -msgstr "" +msgstr " n Ustvari nov razdelek na prostem delu diska" #: fdisk/cfdisk.c:2285 msgid " p Print partition table to the screen or to a file" -msgstr "" +msgstr " p Izpi¹i tabelo razdelkov na zaslon ali v datoteko" #: fdisk/cfdisk.c:2286 msgid " There are several different formats for the partition" -msgstr "" +msgstr " Izbirate lahko med veè razliènimi izpisi" #: fdisk/cfdisk.c:2287 msgid " that you can choose from:" -msgstr "" +msgstr " podatkov:" #: fdisk/cfdisk.c:2288 msgid " r - Raw data (exactly what would be written to disk)" -msgstr "" +msgstr " r - Surovi podatki (natanèno tako, kot bodo zapisani)" #: fdisk/cfdisk.c:2289 msgid " s - Table ordered by sectors" -msgstr "" +msgstr " s - Tabela urejena po sektorjih" #: fdisk/cfdisk.c:2290 msgid " t - Table in raw format" -msgstr "" +msgstr " t - Surova oblika tabele" #: fdisk/cfdisk.c:2291 msgid " q Quit program without writing partition table" -msgstr "" +msgstr " q Zapusti program, ne da bi zapisal tabelo razdelkov" #: fdisk/cfdisk.c:2292 msgid " t Change the filesystem type" -msgstr "" +msgstr " t Spremeni vrsto datoteènega sistema" #: fdisk/cfdisk.c:2293 msgid " u Change units of the partition size display" -msgstr "" +msgstr " u Spremeni enote izpisa velikosti razdelkov" #: fdisk/cfdisk.c:2294 msgid " Rotates through MB, sectors and cylinders" -msgstr "" +msgstr " (ciklièno MB, sektorji in steze)" #: fdisk/cfdisk.c:2295 msgid " W Write partition table to disk (must enter upper case W)" -msgstr "" +msgstr " W Zapi¹i tabelo razdelkov na disk (veliki W!)" #: fdisk/cfdisk.c:2296 msgid " Since this might destroy data on the disk, you must" msgstr "" +" Ker lahko ta izbira onemogoèi dostop do podatkoc na disku," #: fdisk/cfdisk.c:2297 msgid " either confirm or deny the write by entering `yes' or" -msgstr "" +msgstr " morate izbiro potrditi ali preklicati z vnosom ,da` ali" #: fdisk/cfdisk.c:2298 msgid " `no'" @@ -1760,47 +1772,47 @@ msgstr " ,ne`" #: fdisk/cfdisk.c:2299 msgid "Up Arrow Move cursor to the previous partition" -msgstr "" +msgstr "Pu¹èica gor Premakni kazalèek na prej¹nji razdelek" #: fdisk/cfdisk.c:2300 msgid "Down Arrow Move cursor to the next partition" -msgstr "" +msgstr "Pu¹èica dol Premakni kazalèek na naslednji razdelek" #: fdisk/cfdisk.c:2301 msgid "CTRL-L Redraws the screen" -msgstr "" +msgstr "CTRL-L Osve¾en izris zaslona" #: fdisk/cfdisk.c:2302 msgid " ? Print this screen" -msgstr "" +msgstr " ? Ta navodila" #: fdisk/cfdisk.c:2304 msgid "Note: All of the commands can be entered with either upper or lower" -msgstr "" +msgstr "Opomba: Vse ukaze razen W lahko vnesete kot male ali velike" #: fdisk/cfdisk.c:2305 msgid "case letters (except for Writes)." -msgstr "" +msgstr "èrke." #: fdisk/cfdisk.c:2336 fdisk/fdisksunlabel.c:317 fdisk/fdisksunlabel.c:319 msgid "Cylinders" -msgstr "" +msgstr "Stez" #: fdisk/cfdisk.c:2336 msgid "Change cylinder geometry" -msgstr "" +msgstr "Spremeni ¹tevilo stez" #: fdisk/cfdisk.c:2337 fdisk/fdisksunlabel.c:314 msgid "Heads" -msgstr "" +msgstr "Glav" #: fdisk/cfdisk.c:2337 msgid "Change head geometry" -msgstr "" +msgstr "Spremeni ¹tevilo glav" #: fdisk/cfdisk.c:2338 msgid "Change sector geometry" -msgstr "" +msgstr "Spremeni ¹tevilo sektorjev" #: fdisk/cfdisk.c:2339 msgid "Done" @@ -1808,43 +1820,43 @@ msgstr "Opravljeno" #: fdisk/cfdisk.c:2339 msgid "Done with changing geometry" -msgstr "" +msgstr "Opravljena spremeba geometrije" #: fdisk/cfdisk.c:2352 msgid "Enter the number of cylinders: " -msgstr "" +msgstr "Vnesite ¹tevilo stez: " #: fdisk/cfdisk.c:2363 fdisk/cfdisk.c:2934 msgid "Illegal cylinders value" -msgstr "" +msgstr "Nedovoljena vrednost stez" #: fdisk/cfdisk.c:2369 msgid "Enter the number of heads: " -msgstr "" +msgstr "Vnesite ¹tevilo glav: " #: fdisk/cfdisk.c:2376 fdisk/cfdisk.c:2944 msgid "Illegal heads value" -msgstr "" +msgstr "Nedovoljeno ¹tevilo glav" #: fdisk/cfdisk.c:2382 msgid "Enter the number of sectors per track: " -msgstr "" +msgstr "Vnesite ¹tevilo sektorjev na stezo: " #: fdisk/cfdisk.c:2389 fdisk/cfdisk.c:2951 msgid "Illegal sectors value" -msgstr "" +msgstr "Nedovoljeno ¹tevilo sektorjev" #: fdisk/cfdisk.c:2492 msgid "Enter filesystem type: " -msgstr "" +msgstr "Vnesite vrsto datoteènega sistema: " #: fdisk/cfdisk.c:2510 msgid "Cannot change FS Type to empty" -msgstr "" +msgstr "Vrste datoteènega sistema ni moè spremeniti na prazno" #: fdisk/cfdisk.c:2512 msgid "Cannot change FS Type to extended" -msgstr "" +msgstr "Vrste datoteènega sistema ni moè spremeniti na raz¹irjeno" #: fdisk/cfdisk.c:2543 #, c-format @@ -1861,7 +1873,7 @@ msgstr "" #: fdisk/cfdisk.c:2565 msgid "Pri/Log" -msgstr "" +msgstr "Pri/Log" #: fdisk/cfdisk.c:2572 #, c-format @@ -1871,22 +1883,22 @@ msgstr "Neznano (%02X)" #: fdisk/cfdisk.c:2641 #, c-format msgid "Disk Drive: %s" -msgstr "" +msgstr "Pogon: %s" #: fdisk/cfdisk.c:2648 -#, c-format +#, fuzzy, c-format msgid "Size: %lld bytes, %lld MB" -msgstr "" +msgstr "Vel. %lld bajtov, %ld MB" #: fdisk/cfdisk.c:2651 -#, c-format +#, fuzzy, c-format msgid "Size: %lld bytes, %lld.%lld GB" -msgstr "" +msgstr "Vel. %lld bajtov, %ld,%ld GB" #: fdisk/cfdisk.c:2655 #, fuzzy, c-format msgid "Heads: %d Sectors per Track: %d Cylinders: %lld" -msgstr "%d glav, %d sektorjev/stezo, %d stez" +msgstr "Glav: %d Sektorjev/stezo: %d Stez: %d" #: fdisk/cfdisk.c:2659 msgid "Name" @@ -1911,12 +1923,12 @@ msgstr "[Oznaka]" #: fdisk/cfdisk.c:2665 #, fuzzy msgid " Sectors" -msgstr "Sektorji" +msgstr "Sektorjev" #: fdisk/cfdisk.c:2667 #, fuzzy msgid " Cylinders" -msgstr "steza" +msgstr "Stez" #: fdisk/cfdisk.c:2669 #, fuzzy @@ -4431,9 +4443,8 @@ msgid "" msgstr "" #: fdisk/sfdisk.c:1343 -#, fuzzy msgid "start" -msgstr "stanje" +msgstr "zaè. " #: fdisk/sfdisk.c:1346 #, c-format @@ -4442,9 +4453,8 @@ msgid "" msgstr "" #: fdisk/sfdisk.c:1352 -#, fuzzy msgid "end" -msgstr "po¹lji" +msgstr "kon." #: fdisk/sfdisk.c:1355 #, c-format @@ -4755,7 +4765,7 @@ msgstr "" #: fdisk/sfdisk.c:2635 #, fuzzy, c-format msgid "total: %llu blocks\n" -msgstr ", skupno %lu sektorjev" +msgstr "%ld blokov\n" #: fdisk/sfdisk.c:2674 msgid "usage: sfdisk --print-id device partition-number\n" @@ -6669,7 +6679,7 @@ msgid "%s: can't read temporary file.\n" msgstr "" #: misc-utils/cal.c:313 -#, fuzzy, c-format +#, c-format msgid "%s from %s\n" msgstr "%s iz %s\n" @@ -7306,9 +7316,9 @@ msgid "set_loop(%s,%s,%llu): success\n" msgstr "" #: mount/lomount.c:351 -#, fuzzy, c-format +#, c-format msgid "loop: can't delete device %s: %s\n" -msgstr "Ni moè pognati %s: %s\n" +msgstr "" #: mount/lomount.c:361 #, c-format @@ -7355,9 +7365,9 @@ msgid "; rest of file ignored" msgstr "" #: mount/mount_blkid.c:87 -#, fuzzy, c-format +#, c-format msgid "%s: error: the label %s occurs on both %s and %s\n" -msgstr "%s: napaka: Ni prostora za izmenjalni prostor?\n" +msgstr "" #: mount/mount_blkid.c:99 #, fuzzy, c-format @@ -7582,9 +7592,9 @@ msgid "mount: %s: unknown device" msgstr "" #: mount/mount.c:1009 -#, c-format +#, fuzzy, c-format msgid "mount: unknown filesystem type '%s'" -msgstr "" +msgstr "Vnesite vrsto datoteènega sistema: " #: mount/mount.c:1021 #, c-format @@ -7914,7 +7924,7 @@ msgstr "%s na %s\n" #: mount/swapon.c:177 mount/swapon.c:243 #, fuzzy, c-format msgid "%s: cannot find the device for %s\n" -msgstr "Ni moè pognati %s: %s\n" +msgstr "%s: ni moè odpreti %s\n" #: mount/swapon.c:184 #, fuzzy, c-format @@ -7949,7 +7959,7 @@ msgstr "" #: mount/umount.c:139 #, fuzzy, c-format msgid "umount: cannot fork: %s" -msgstr "mount: samo sistemski skrbnik lahko priklopi %s na %s" +msgstr "vejitev ni mogoèa" #: mount/umount.c:171 #, c-format @@ -9278,14 +9288,16 @@ msgid "" "\n" "...Skipping " msgstr "" +"\n" +"... Preskakujemo " #: text-utils/more.c:1633 msgid "...Skipping to file " -msgstr "" +msgstr "... Preskakujemo na datoteko " #: text-utils/more.c:1635 msgid "...Skipping back to file " -msgstr "" +msgstr "... Preskakujemo nazaj na datoteko " #: text-utils/more.c:1913 msgid "Line too long" @@ -9293,62 +9305,64 @@ msgstr "Vrstica je predolga" #: text-utils/more.c:1956 msgid "No previous command to substitute for" -msgstr "" +msgstr "Nobenega prej¹njega ukaza ni za zamenjavo" #: text-utils/odsyntax.c:130 #, c-format msgid "od: od(1) has been deprecated for hexdump(1).\n" -msgstr "" +msgstr "od: od(1) je nadome¹èen s programom hexdump(1).\n" #: text-utils/odsyntax.c:133 #, c-format msgid "od: hexdump(1) compatibility doesn't support the -%c option%s\n" -msgstr "" +msgstr "od: hexdump(1) ne podpira izbire -%c izbir%s\n" #: text-utils/odsyntax.c:134 msgid "; see strings(1)." -msgstr "" +msgstr "; glejte strings(1)." #: text-utils/parse.c:63 #, c-format msgid "hexdump: can't read %s.\n" -msgstr "" +msgstr "hexdump: branje %s ni uspelo.\n" #: text-utils/parse.c:68 #, c-format msgid "hexdump: line too long.\n" -msgstr "" +msgstr "hexdump: vrstica predolga.\n" #: text-utils/parse.c:401 #, c-format msgid "hexdump: byte count with multiple conversion characters.\n" -msgstr "" +msgstr "hexdump: ¹tevec bajtov naveden z veè pretvornimi znaki.\n" #: text-utils/parse.c:483 #, c-format msgid "hexdump: bad byte count for conversion character %s.\n" -msgstr "" +msgstr "hexdump: slab ¹tevec bajtov za pretvorni znak %s.\n" #: text-utils/parse.c:490 #, c-format msgid "hexdump: %%s requires a precision or a byte count.\n" -msgstr "" +msgstr "hexdump: %%s zahteva bodisi natanènost bodisi ¹tevec bajtov.\n" #: text-utils/parse.c:496 #, c-format msgid "hexdump: bad format {%s}\n" -msgstr "" +msgstr "hexdump: slab format [%s]\n" #: text-utils/parse.c:502 #, c-format msgid "hexdump: bad conversion character %%%s.\n" -msgstr "" +msgstr "hexdump: slab pretvorni znak %%%s.\n" #: text-utils/pg.c:237 #, c-format msgid "" "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n" msgstr "" +"%s: Uporaba: %s [-¹tevilo] [-p niz] [-cefnrs] [+vrstica] [+/vzorec/] " +"[datoteke]\n" #: text-utils/pg.c:246 #, c-format @@ -9362,11 +9376,11 @@ msgstr "%s: nedovoljena izbira -- %s\n" #: text-utils/pg.c:371 msgid "...skipping forward\n" -msgstr "" +msgstr "... preskakujemo naprej\n" #: text-utils/pg.c:373 msgid "...skipping backward\n" -msgstr "" +msgstr "... preskakujemo nazaj\n" #: text-utils/pg.c:395 msgid "No next file" @@ -9389,7 +9403,7 @@ msgstr "%s: Nepri #: text-utils/pg.c:938 #, c-format msgid "%s: Unknown error in %s file\n" -msgstr "" +msgstr "%s: Neznana napaka v datoteki %s\n" #: text-utils/pg.c:1033 #, c-format @@ -9406,7 +9420,7 @@ msgstr "(EOF)" #: text-utils/pg.c:1225 msgid "No remembered search string" -msgstr "" +msgstr "Nobenega shranjenega iskanega niza" #: text-utils/pg.c:1308 msgid "Cannot open " @@ -9418,25 +9432,25 @@ msgstr "shranjeno" #: text-utils/pg.c:1463 msgid ": !command not allowed in rflag mode.\n" -msgstr "" +msgstr ": !ukaz ni dovoljen v naèinu rflag.\n" #: text-utils/pg.c:1495 msgid "fork() failed, try again later\n" -msgstr "" +msgstr "klic fork() neuspel, poskusite pozneje\n" #: text-utils/pg.c:1700 msgid "(Next file: " -msgstr "" +msgstr "(Naslednja datoteka: " #: text-utils/rev.c:113 #, c-format msgid "Unable to allocate bufferspace\n" -msgstr "" +msgstr "Ni mogoèe dodeliti prostora za medpomnilnik.\n" #: text-utils/rev.c:156 #, c-format msgid "usage: rev [file ...]\n" -msgstr "" +msgstr "Uporaba: rev [datoteka ...]\n" #: text-utils/tailf.c:53 text-utils/tailf.c:105 #, fuzzy, c-format @@ -9451,47 +9465,35 @@ msgstr "" #: text-utils/ul.c:141 #, c-format msgid "usage: %s [ -i ] [ -tTerm ] file...\n" -msgstr "" +msgstr "Uporaba: %s [ -i ] [ -tTerminal ] datoteka...\n" #: text-utils/ul.c:152 #, c-format msgid "trouble reading terminfo" -msgstr "" +msgstr "te¾ave pri branju zbirke terminfo" #: text-utils/ul.c:242 #, c-format msgid "Unknown escape sequence in input: %o, %o\n" -msgstr "" +msgstr "Neznano ube¾no na vhodu: %o, %o\n" #: text-utils/ul.c:425 #, c-format msgid "Unable to allocate buffer.\n" -msgstr "" +msgstr "Ni mogoèe dodeliti pomnilnika za medpomnilnik.\n" #: text-utils/ul.c:586 #, c-format msgid "Input line too long.\n" -msgstr "" +msgstr "Vhodna vrstica je predolga.\n" #: text-utils/ul.c:599 #, c-format msgid "Out of memory when growing buffer.\n" -msgstr "" - -#, fuzzy -#~ msgid "mkfs from %s\n" -#~ msgstr "%s iz %s\n" - -#~ msgid "mkfs version %s (%s)\n" -#~ msgstr "mkfs, izdaja %s (%s)\n" +msgstr "Pri poveèevanju medpomnilnika je zmanjkalo pomnilnika.\n" -#, fuzzy -#~ msgid "flock: unknown option, aborting.\n" -#~ msgstr "%s: napaka: neznana izdaja %d\n" - -#, fuzzy -#~ msgid "%s version %s\n" -#~ msgstr "%s Razlièica %s\n" +#~ msgid "%s: not compiled with minix v2 support\n" +#~ msgstr "%s: ni prevedeno s podporo za Minix v2\n" #~ msgid "Invalid number: %s\n" #~ msgstr "Neveljavno ¹tevilo: %s\n" @@ -9499,6 +9501,23 @@ msgstr "" #~ msgid "Syntax error: '%s'\n" #~ msgstr "Skladenjska napaka: ,%s`\n" +#~ msgid " %s [ -p ] dev name\n" +#~ msgstr " %s [ -p ] enota ime\n" + +#~ msgid "" +#~ " %s [ -p ] dev size sect heads tracks stretch gap rate spec1 fmt_gap\n" +#~ msgstr "" +#~ " %s [ -p ] enota vel sekt glav stez razteg presl stopnja spec1 fmt_gap\n" + +#~ msgid " %s [ -c | -y | -n | -d ] dev\n" +#~ msgstr " %s [ -c | -y | -n | -d ] enota\n" + +#~ msgid " %s [ -c | -y | -n ] dev\n" +#~ msgstr " %s [ -c | -y | -n ] enota\n" + +#~ msgid "None (%02X)" +#~ msgstr "Brez (%02X)" + #~ msgid "version" #~ msgstr "razlièica" @@ -9601,47 +9620,11 @@ msgstr "" #~ msgid "Password changed.\n" #~ msgstr "Geslo je bilo spremenjeno.\n" -#, fuzzy -#~ msgid "Warning: omitting partitions after %d\n" -#~ msgstr "Tabelo razdelkov zapisujemo na disk..." - -#~ msgid "None (%02X)" -#~ msgstr "Brez (%02X)" - -#, fuzzy -#~ msgid "Error: unable to open %s for reading\n" -#~ msgstr "ni mogoèe odpreti %s" - -#, fuzzy -#~ msgid "Retype password: " -#~ msgstr "Ponovno vnesite novo geslo: " - -#, fuzzy -#~ msgid "Error: Password must be at least %d characters.\n" -#~ msgstr "Geslo mora biti dolgo vsaj 6 znakov, poskusite ¹e enkrat.\n" - -#, fuzzy -#~ msgid "Error: Unable to allocate memory\n" -#~ msgstr "Pomnilnika ni veè mogoèe rezervirati\n" - #~ msgid "UUID" #~ msgstr "UUID" -#, fuzzy -#~ msgid "swapon: unable to open loop device %s\n" -#~ msgstr "ni mogoèe odpreti %s" - -#, fuzzy -#~ msgid "swapon: unable to open swap device %s\n" -#~ msgstr "izmenjalne naprave ni mogoèe previti" - -#, fuzzy -#~ msgid "swapon: unable to create pipe\n" -#~ msgstr "strani s podpisom ni mogoèe zapisati" - -#, fuzzy -#~ msgid "swapon: random password for %s is %s" -#~ msgstr "Spreminjamo geslo za %s\n" +#~ msgid "%s version %s\n" +#~ msgstr "%s razlièica %s\n" #~ msgid "Can't open help file" #~ msgstr "Datoteke s pomoèjo ni mogoèe odpreti" diff --git a/po/tr.gmo b/po/tr.gmo index ae438cd6..1879818f 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 230d5f03..7cfb658e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,15 +5,15 @@ # this file and modified versions, provided that this # header is not removed and modified versions are marked # as such. No warranty. -# Nilgün Belma Bugüner , 2001, ..., 2005. +# Nilgün Belma Bugüner , 2001, ..., 2005. # msgid "" msgstr "" -"Project-Id-Version: util-linux 2.13-pre1\n" +"Project-Id-Version: util-linux 2.13-pre2\n" "Report-Msgid-Bugs-To: Adrian Bunk \n" "POT-Creation-Date: 2005-08-14 18:14+0200\n" -"PO-Revision-Date: 2005-08-04 12:42+0300\n" -"Last-Translator: Nilgün Belma Bugüner \n" +"PO-Revision-Date: 2005-08-17 12:06+0300\n" +"Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -167,9 +167,9 @@ msgstr "kullanımı: %s [ -n ] AYGIT\n" #: disk-utils/mkfs.cramfs.c:778 disk-utils/mkfs.minix.c:626 #: disk-utils/mkswap.c:522 misc-utils/ddate.c:179 misc-utils/rename.c:79 #: misc-utils/script.c:142 sys-utils/readprofile.c:197 -#, fuzzy, c-format +#, c-format msgid "%s (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "%s: (%s)\n" #: disk-utils/fdformat.c:130 #, c-format @@ -858,9 +858,9 @@ msgid "%s: Out of memory!\n" msgstr "%s: Bellek yetersiz!\n" #: disk-utils/mkfs.c:103 -#, fuzzy, c-format +#, c-format msgid "mkfs (%s)\n" -msgstr "%s: %s (%s)\n" +msgstr "mkfs (%s)\n" #: disk-utils/mkfs.cramfs.c:124 #, c-format @@ -7132,9 +7132,9 @@ msgid "%s: can't read temporary file.\n" msgstr "%s: geçici dosya okunamıyor.\n" #: misc-utils/cal.c:313 -#, fuzzy, c-format +#, c-format msgid "%s from %s\n" -msgstr "%2$s%3$s deki %1$s\n" +msgstr "%2$s deki %1$s\n" #: misc-utils/cal.c:327 msgid "illegal month value: use 1-12" @@ -8567,7 +8567,7 @@ msgstr "" " -t ds-türü -a seçeneği ile kullanıldığında sadece türü belirtilen dosya\n" " sistemlerini ayırır\n" "\n" -"Çeviri hatalarını adresine bildiriniz\n" +"Çeviri hatalarını adresine bildiriniz\n" "Daha fazla bilgi edinmek için 'man 8 umount' yazınız.\n" #: mount/umount.c:546 @@ -10093,13 +10093,6 @@ msgstr "Girdi satırı çok uzun.\n" msgid "Out of memory when growing buffer.\n" msgstr "Tampon büyütülürken bellek yetmedi.\n" -#, fuzzy -#~ msgid "mkfs from %s\n" -#~ msgstr "%2$s%3$s deki %1$s\n" - -#~ msgid "mkfs version %s (%s)\n" -#~ msgstr "mkfs sürüm %s (%s)\n" - #~ msgid "flock: unknown option, aborting.\n" #~ msgstr "flock: bilinmeyen seçenek, çıkılıyor\n" diff --git a/schedutils/Makefile.in b/schedutils/Makefile.in index 48cefd8e..442f670b 100644 --- a/schedutils/Makefile.in +++ b/schedutils/Makefile.in @@ -88,6 +88,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -148,8 +150,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index 45114365..49c1211f 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -23,9 +23,9 @@ usrsbinexec_PROGRAMS += rdev man_MANS += rdev.8 ramsize.8 rootflags.8 vidmode.8 install-exec-hook: - cd $(DESTDIR)$(usrsbindir) && ln -sf rdev ramsize - cd $(DESTDIR)$(usrsbindir) && ln -sf rdev vidmode - cd $(DESTDIR)$(usrsbindir) && ln -sf rdev rootflags + cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev ramsize + cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev vidmode + cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev rootflags endif diff --git a/sys-utils/Makefile.in b/sys-utils/Makefile.in index e6a8f3f9..4cf35f06 100644 --- a/sys-utils/Makefile.in +++ b/sys-utils/Makefile.in @@ -142,6 +142,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -202,8 +204,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -901,9 +901,9 @@ uninstall-man: uninstall-man1 uninstall-man8 @BUILD_RDEV_TRUE@@INTEL_TRUE@install-exec-hook: -@BUILD_RDEV_TRUE@@INTEL_TRUE@ cd $(DESTDIR)$(usrsbindir) && ln -sf rdev ramsize -@BUILD_RDEV_TRUE@@INTEL_TRUE@ cd $(DESTDIR)$(usrsbindir) && ln -sf rdev vidmode -@BUILD_RDEV_TRUE@@INTEL_TRUE@ cd $(DESTDIR)$(usrsbindir) && ln -sf rdev rootflags +@BUILD_RDEV_TRUE@@INTEL_TRUE@ cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev ramsize +@BUILD_RDEV_TRUE@@INTEL_TRUE@ cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev vidmode +@BUILD_RDEV_TRUE@@INTEL_TRUE@ cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev rootflags # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/text-utils/Makefile.in b/text-utils/Makefile.in index 2919cd36..fcdc4b44 100644 --- a/text-utils/Makefile.in +++ b/text-utils/Makefile.in @@ -125,6 +125,8 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_AGETTY_FALSE = @BUILD_AGETTY_FALSE@ BUILD_AGETTY_TRUE = @BUILD_AGETTY_TRUE@ +BUILD_CRAMFS_FALSE = @BUILD_CRAMFS_FALSE@ +BUILD_CRAMFS_TRUE = @BUILD_CRAMFS_TRUE@ BUILD_ELVTUNE_FALSE = @BUILD_ELVTUNE_FALSE@ BUILD_ELVTUNE_TRUE = @BUILD_ELVTUNE_TRUE@ BUILD_INIT_FALSE = @BUILD_INIT_FALSE@ @@ -185,8 +187,6 @@ HAVE_TERMCAP_FALSE = @HAVE_TERMCAP_FALSE@ HAVE_TERMCAP_TRUE = @HAVE_TERMCAP_TRUE@ HAVE_UUID_FALSE = @HAVE_UUID_FALSE@ HAVE_UUID_TRUE = @HAVE_UUID_TRUE@ -HAVE_ZLIB_FALSE = @HAVE_ZLIB_FALSE@ -HAVE_ZLIB_TRUE = @HAVE_ZLIB_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@