Hello community,
here is the log from the commit of package yast2-live-installer for
openSUSE:Factory
checked in at Tue Aug 9 16:28:10 CEST 2011.
--------
--- yast2-live-installer/yast2-live-installer.changes 2010-10-12
16:34:23.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-live-installer/yast2-live-installer.changes
2011-08-08 13:14:04.000000000 +0200
@@ -1,0 +2,24 @@
+Mon Aug 8 10:58:52 CEST 2011 - jsr...@suse.cz
+
+- enhance error reporting when running out of disk space during
+ live installation (bnc#533601)
+- 2.21.0
+
+-------------------------------------------------------------------
+Fri Aug 5 12:33:11 CEST 2011 - tgoettlic...@suse.de
+
+- fixed .desktop file (bnc #681249)
+
+-------------------------------------------------------------------
+Tue Mar 8 13:42:24 CET 2011 - jsr...@suse.cz
+
+- don't eject the CD during reboot after live installation
+ (bnc#511210)
+
+-------------------------------------------------------------------
+Thu Nov 18 13:12:37 UTC 2010 - jsr...@suse.cz
+
+- suppress memory warning if live installer is running directly
+ from boot scripts (bnc#547743)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-live-installer-2.20.0.tar.bz2
New:
----
yast2-live-installer-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-live-installer.spec ++++++
--- /var/tmp/diff_new_pack.AueFKj/_old 2011-08-09 16:27:50.000000000 +0200
+++ /var/tmp/diff_new_pack.AueFKj/_new 2011-08-09 16:27:50.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-live-installer (Version 2.20.0)
+# spec file for package yast2-live-installer
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,16 @@
Name: yast2-live-installer
-Version: 2.20.0
+Version: 2.21.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-live-installer-2.20.0.tar.bz2
+Source0: yast2-live-installer-2.21.0.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
# Internet and InternetDevices
Requires: yast2 >= 2.16.6
@@ -49,7 +49,7 @@
hard disk of the computer.
%prep
-%setup -n yast2-live-installer-2.20.0
+%setup -n yast2-live-installer-2.21.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-live-installer-2.20.0.tar.bz2 ->
yast2-live-installer-2.21.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-live-installer-2.20.0/VERSION
new/yast2-live-installer-2.21.0/VERSION
--- old/yast2-live-installer-2.20.0/VERSION 2010-10-12 16:33:35.000000000
+0200
+++ new/yast2-live-installer-2.21.0/VERSION 2011-08-08 10:59:27.000000000
+0200
@@ -1 +1 @@
-2.20.0
+2.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-live-installer-2.20.0/aclocal.m4
new/yast2-live-installer-2.21.0/aclocal.m4
--- old/yast2-live-installer-2.20.0/aclocal.m4 2010-10-12 16:33:45.000000000
+0200
+++ new/yast2-live-installer-2.21.0/aclocal.m4 2011-08-08 13:10:19.000000000
+0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
`autoreconf'.])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-live-installer-2.20.0/configure
new/yast2-live-installer-2.21.0/configure
--- old/yast2-live-installer-2.20.0/configure 2010-10-12 16:33:46.000000000
+0200
+++ new/yast2-live-installer-2.21.0/configure 2011-08-08 13:10:20.000000000
+0200
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for yast2-live-installer 2.20.0.
+# Generated by GNU Autoconf 2.65 for yast2-live-installer 2.21.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -318,7 +318,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -358,19 +358,19 @@
fi # as_fn_arith
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -532,7 +532,7 @@
exec 6>&1
# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
@@ -551,8 +551,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-live-installer'
PACKAGE_TARNAME='yast2-live-installer'
-PACKAGE_VERSION='2.20.0'
-PACKAGE_STRING='yast2-live-installer 2.20.0'
+PACKAGE_VERSION='2.21.0'
+PACKAGE_STRING='yast2-live-installer 2.21.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -743,9 +743,8 @@
fi
case $ac_option in
- *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *=) ac_optarg= ;;
- *) ac_optarg=yes ;;
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
@@ -790,7 +789,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -816,7 +815,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1020,7 +1019,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1036,7 +1035,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1066,8 +1065,8 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
@@ -1075,7 +1074,7 @@
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1093,13 +1092,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- as_fn_error $? "missing argument to $ac_option"
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options:
$ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1122,7 +1121,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1136,8 +1135,8 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't
use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't
use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1152,9 +1151,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- as_fn_error $? "working directory cannot be determined"
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- as_fn_error $? "pwd does not report name of working directory"
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1193,11 +1192,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1223,7 +1222,7 @@
# 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 yast2-live-installer 2.20.0 to adapt to many kinds of
systems.
+\`configure' configures yast2-live-installer 2.21.0 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1237,7 +1236,7 @@
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print \`checking...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
@@ -1295,7 +1294,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-live-installer 2.20.0:";;
+ short | recursive ) echo "Configuration of yast2-live-installer 2.21.0:";;
esac
cat <<\_ACEOF
@@ -1375,10 +1374,10 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-live-installer configure 2.20.0
-generated by GNU Autoconf 2.67
+yast2-live-installer configure 2.21.0
+generated by GNU Autoconf 2.65
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1392,8 +1391,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-live-installer $as_me 2.20.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+It was created by yast2-live-installer $as_me 2.21.0, which was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1503,9 +1502,11 @@
{
echo
- $as_echo "## ---------------- ##
+ cat <<\_ASBOX
+## ---------------- ##
## Cache variables. ##
-## ---------------- ##"[]
+## ---------------- ##
+_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
(
@@ -1539,9 +1540,11 @@
)
echo
- $as_echo "## ----------------- ##
+ cat <<\_ASBOX
+## ----------------- ##
## Output variables. ##
-## ----------------- ##"[]
+## ----------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -1554,9 +1557,11 @@
echo
if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ cat <<\_ASBOX
+## ------------------- ##
## File substitutions. ##
-## ------------------- ##"[]
+## ------------------- ##
+_ASBOX
echo
for ac_var in $ac_subst_files
do
@@ -1570,9 +1575,11 @@
fi
if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ cat <<\_ASBOX
+## ----------- ##
## confdefs.h. ##
-## ----------- ##"[]
+## ----------- ##
+_ASBOX
echo
cat confdefs.h
echo
@@ -1627,12 +1634,7 @@
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
@@ -1647,11 +1649,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script
$ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+ . "$ac_site_file"
fi
done
@@ -1727,7 +1725,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment
can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build"
>&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start
over" "$LINENO" 5
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over"
"$LINENO" 5
fi
## -------------------- ##
## Main body of script. ##
@@ -1744,22 +1742,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\"
\"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\"
\"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -1773,7 +1765,7 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -1784,16 +1776,16 @@
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed"
"$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO"
5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
@@ -1818,7 +1810,7 @@
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed"
"$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -1826,7 +1818,7 @@
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
@@ -1851,7 +1843,7 @@
ac_cv_target=$ac_cv_host
else
ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed"
"$LINENO" 5
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO"
5
fi
fi
@@ -1859,7 +1851,7 @@
$as_echo "$ac_cv_target" >&6; }
case $ac_cv_target in
*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
esac
target=$ac_cv_target
ac_save_IFS=$IFS; IFS='-'
@@ -2000,11 +1992,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2026,7 +2018,7 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
alias in your environment" "$LINENO" 5
fi
@@ -2036,7 +2028,7 @@
# Ok.
:
else
- as_fn_error $? "newly created file is older than distributed files!
+ as_fn_error "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2264,7 +2256,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" =
set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2272,7 +2264,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2306,7 +2298,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- as_fn_error $? "source directory already configured; run \"make
distclean\" there first" "$LINENO" 5
+ as_fn_error "source directory already configured; run \"make distclean\"
there first" "$LINENO" 5
fi
fi
@@ -2322,7 +2314,7 @@
# Define the identity of the package.
PACKAGE='yast2-live-installer'
- VERSION='2.20.0'
+ VERSION='2.21.0'
cat >>confdefs.h <<_ACEOF
@@ -2444,7 +2436,7 @@
-VERSION="2.20.0"
+VERSION="2.21.0"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain <jsr...@suse.cz>"
@@ -2537,7 +2529,7 @@
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" =
set"; }; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2545,7 +2537,7 @@
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2608,7 +2600,7 @@
if test -z "$XGETTEXT" ; then
- as_fn_error $? "xgettext is missing; please install gettext-tools."
"$LINENO" 5
+ as_fn_error "xgettext is missing; please install gettext-tools." "$LINENO"
5
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
@@ -2689,7 +2681,7 @@
if test "$YCPDOC" = "false"; then
- as_fn_error $? "ycpdoc is not installed" "$LINENO" 5
+ as_fn_error "ycpdoc is not installed" "$LINENO" 5
fi
# Extract the first word of "ycpmakedep", so it can be a program name with
args.
set dummy ycpmakedep; ac_word=$2
@@ -2734,7 +2726,7 @@
if test "$YCPMAKEDEP" = "false"; then
- as_fn_error $? "ycpmakedep is not installed" "$LINENO" 5
+ as_fn_error "ycpmakedep is not installed" "$LINENO" 5
fi
# Extract the first word of "ycpc", so it can be a program name with args.
set dummy ycpc; ac_word=$2
@@ -2779,16 +2771,16 @@
if test "$YCPC" = "false"; then
- as_fn_error $? "ycpc is not installed" "$LINENO" 5
+ as_fn_error "ycpc is not installed" "$LINENO" 5
fi
as_ac_File=`$as_echo
"ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for
$devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
$as_echo_n "checking for
$devtools_yast2dir/data/testsuite/Makefile.testsuite... " >&6; }
-if eval "test \"\${$as_ac_File+set}\"" = set; then :
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
- as_fn_error $? "cannot check for file existence when cross compiling"
"$LINENO" 5
+ as_fn_error "cannot check for file existence when cross compiling" "$LINENO"
5
if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then
eval "$as_ac_File=yes"
else
@@ -2798,7 +2790,8 @@
eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+eval as_val=\$$as_ac_File
+ if test "x$as_val" = x""yes; then :
else
@@ -2850,7 +2843,7 @@
if test "$MYEXPECT" = "false"; then
- as_fn_error $? "expect not installed" "$LINENO" 5
+ as_fn_error "expect not installed" "$LINENO" 5
fi
# Extract the first word of "runtest", so it can be a program name with args.
set dummy runtest; ac_word=$2
@@ -2894,7 +2887,7 @@
if test "$MYRUNTEST" = "false"; then
- as_fn_error $? "dejagnu not installed" "$LINENO" 5
+ as_fn_error "dejagnu not installed" "$LINENO" 5
fi
@@ -3019,7 +3012,6 @@
ac_libobjs=
ac_ltlibobjs=
-U=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -3036,11 +3028,11 @@
if test -z "${CREATE_PKGCONFIG_TRUE}" && test -z "${CREATE_PKGCONFIG_FALSE}";
then
- as_fn_error $? "conditional \"CREATE_PKGCONFIG\" was never defined.
+ as_fn_error "conditional \"CREATE_PKGCONFIG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CREATE_PKGCONFIG_NOARCH_TRUE}" && test -z
"${CREATE_PKGCONFIG_NOARCH_FALSE}"; then
- as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined.
+ as_fn_error "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -3190,19 +3182,19 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
as_fn_error ()
{
- as_status=$1; test $as_status -eq 0 && as_status=1
- if test "$4"; then
- as_lineno=${as_lineno-"$3"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"}
as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
- $as_echo "$as_me: error: $2" >&2
+ $as_echo "$as_me: error: $1" >&2
as_fn_exit $as_status
} # as_fn_error
@@ -3398,7 +3390,7 @@
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
} # as_fn_mkdir_p
@@ -3451,8 +3443,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-live-installer $as_me 2.20.0, which was
-generated by GNU Autoconf 2.67. Invocation command line was
+This file was extended by yast2-live-installer $as_me 2.21.0, which was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3504,11 +3496,11 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-live-installer config.status 2.20.0
-configured by $0, generated by GNU Autoconf 2.67,
+yast2-live-installer config.status 2.21.0
+configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -3526,16 +3518,11 @@
while test $# != 0
do
case $1 in
- --*=?*)
+ --*=*)
ac_option=`expr "X$1" : 'X\([^=]*\)='`
ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- --*=)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=
- ac_shift=:
- ;;
*)
ac_option=$1
ac_optarg=$2
@@ -3557,7 +3544,6 @@
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- '') as_fn_error $? "missing file argument" ;;
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
@@ -3568,7 +3554,7 @@
ac_cs_silent=: ;;
# This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
+ -*) as_fn_error "unrecognized option: \`$1'
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
@@ -3624,7 +3610,7 @@
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
@@ -3660,7 +3646,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -3677,7 +3663,7 @@
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- ac_cs_awk_cr='\\r'
+ ac_cs_awk_cr='\r'
else
ac_cs_awk_cr=$ac_cr
fi
@@ -3691,18 +3677,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
@@ -3791,28 +3777,20 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
-h
-s///
-s/^/:/
-s/[ ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
s/:*$//
-x
-s/\(=[ ]*\).*/\1/
-G
-s/\n//
s/^[^=]*=[ ]*$//
}'
fi
@@ -3830,7 +3808,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -3858,7 +3836,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;;
esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -3885,7 +3863,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -4022,22 +4000,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk"
>$tmp/out \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z
"$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a
reference to the variable \`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&5
+which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable
\`datarootdir'
-which seems to be undefined. Please make sure it is defined" >&2;}
+which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
;;
@@ -4052,7 +4030,7 @@
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
@@ -4073,7 +4051,7 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || as_fn_exit 1
+ $ac_cs_success || as_fn_exit $?
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no;
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options:
$ac_unrecognized_opts" >&5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-live-installer-2.20.0/configure.in
new/yast2-live-installer-2.21.0/configure.in
--- old/yast2-live-installer-2.20.0/configure.in 2010-10-12
16:33:42.000000000 +0200
+++ new/yast2-live-installer-2.21.0/configure.in 2011-08-08
13:10:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-live-installer, 2.20.0, http://bugs.opensuse.org/,
yast2-live-installer)
+AC_INIT(yast2-live-installer, 2.21.0, http://bugs.opensuse.org/,
yast2-live-installer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.0"
+VERSION="2.21.0"
RPMNAME="yast2-live-installer"
MAINTAINER="Jiri Srain <jsr...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-live-installer-2.20.0/live-installer.pot
new/yast2-live-installer-2.21.0/live-installer.pot
--- old/yast2-live-installer-2.20.0/live-installer.pot 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-live-installer-2.21.0/live-installer.pot 2010-12-06
11:17:42.000000000 +0100
@@ -0,0 +1,226 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-06 11:17+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/inst_live_add_base_repo.ycp:25 src/inst_live_sw_select.ycp:17
+msgid "Software Installation"
+msgstr ""
+
+#: src/inst_live_doit.ycp:79 src/inst_live_doit.ycp:80
+#, ycp-format
+msgid "Copying %1..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:132 src/inst_live_doit.ycp:133
+msgid "Evaluating filesystems to copy..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:135 src/inst_live_doit.ycp:136
+msgid "Copying root filesystem..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:137
+msgid "Copying live image..."
+msgstr ""
+
+#. error report
+#: src/inst_live_doit.ycp:149 src/inst_live_doit.ycp:156
+msgid "Copying the live image to hard disk failed."
+msgstr ""
+
+#. dialog caption
+#: src/inst_live_simple_proposal.ycp:22 src/inst_live_simple_proposal.ycp:155
+msgid "Installation settings"
+msgstr ""
+
+#. label
+#: src/inst_live_simple_proposal.ycp:24
+msgid "Analyzing the system..."
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:84
+#, ycp-format
+msgid "Use %1%% of disk %2 for Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:88
+#, ycp-format
+msgid "Do not use disk %1"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:92
+msgid "Partitioning"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:109
+msgid "System start-up"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:111
+msgid "Ask whether to boot Linux or existing system"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:112
+msgid "Boot only Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:113
+#, ycp-format
+msgid "System start time-out: %1 seconds"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:119
+msgid "Keyboard"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:126
+msgid "Time Zone"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:136
+msgid "Change Installation Settings"
+msgstr ""
+
+#. help text 1/3
+#: src/inst_live_simple_proposal.ycp:141
+msgid ""
+"<p>\n"
+"Use <b>Accept</b> to perform a new installation with the values
displayed.</p>"
+msgstr ""
+
+#. help text 2/3
+#: src/inst_live_simple_proposal.ycp:144
+msgid ""
+"<p>\n"
+"To change the values click the respective headline\n"
+"or select <b>Change Installation Settings</b></p>"
+msgstr ""
+
+#. help text 3/3
+#: src/inst_live_simple_proposal.ycp:148
+msgid ""
+"<p>\n"
+"Your hard disk has not been modified, you can still safely abort.\n"
+"</p>"
+msgstr ""
+
+#. help text 1/1
+#: src/inst_live_welcome.ycp:14
+msgid ""
+"<p>Welcome to the &product; installation.\n"
+"Press <b>Next</p> to run the installation wizard.</p>"
+msgstr ""
+
+#. dialog caption, %1 is product name (typically openSUSE)
+#: src/inst_live_welcome.ycp:19
+#, ycp-format
+msgid "Welcome to %1 installation"
+msgstr ""
+
+#. wellcome label, %1 is product name
+#: src/inst_live_welcome.ycp:21
+#, ycp-format
+msgid ""
+"Your %1 will be installed quickly\n"
+"and easily in a few steps.\n"
+"You will only have to answer some questions."
+msgstr ""
+
+#. TRANSLATORS: error message - the module does not provide command line
interface
+#: src/live-installer.ycp:27
+msgid "There is no user interface available for this module."
+msgstr ""
+
+#. pop-up, %1 is memory size, currently hardcoded "1 GB"
+#: src/live-installer.ycp:44
+#, ycp-format
+msgid ""
+"Your computer has less than %1 of memory. This may not be\n"
+"sufficient for the live installation, especially when installing\n"
+"while running other applications.\n"
+"Before continuing, finish all running applications."
+msgstr ""
+
+#. continue/cancel pop-up
+#: src/live-installer.ycp:83
+msgid ""
+"YaST detected a mounted removable media. YaST cannot install\n"
+"the system on media which is mounted.\n"
+"To install the system on these media, unmount them first."
+msgstr ""
+
+#. continue-cancel popup
+#: src/live-installer.ycp:111
+msgid ""
+"openSUSE installer detected DMRAID array.\n"
+"It is not supported by the openSUSE live installer.\n"
+"Continuing the installation may cause data loss."
+msgstr ""
+
+#. popup dialog, text followed by 'Reboot Now' and 'Reboot Later' buttons
+#: src/live-installer.ycp:158
+msgid ""
+"The computer needs to be rebooted without the Live CD in the\n"
+"drive to finish the installation. Either YaST can reboot\n"
+"now or you can reboot any time later.\n"
+"\n"
+"Note that if the Live CD is not ejected, you can either eject\n"
+"it after the Live system shuts down or select \"Hard Disk\"\n"
+"in the boot menu of the Live CD."
+msgstr ""
+
+#. push button
+#: src/live-installer.ycp:166
+msgid "Reboot &Now"
+msgstr ""
+
+#: src/live-installer.ycp:166
+msgid "Reboot &Later"
+msgstr ""
+
+#. error report
+#: src/live-installer.ycp:181
+msgid ""
+"Failed to restart the computer.\n"
+"Reboot it manually. You may even need to push the\n"
+"'Reset' button to restart it."
+msgstr ""
+
+#. progress step title
+#: src/live_copy_files_finish.ycp:51
+msgid "Copying files to installed system..."
+msgstr ""
+
+#. progress step title
+#: src/live_runme_at_boot_finish.ycp:45
+msgid "Writing YaST Configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:51
+msgid "Saving language..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:56
+msgid "Saving keyboard configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:61
+msgid "Saving time zone..."
+msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-live-installer-2.20.0/src/inst_live_doit.ycp
new/yast2-live-installer-2.21.0/src/inst_live_doit.ycp
--- old/yast2-live-installer-2.20.0/src/inst_live_doit.ycp 2010-10-12
16:33:35.000000000 +0200
+++ new/yast2-live-installer-2.21.0/src/inst_live_doit.ycp 2011-08-08
10:22:16.000000000 +0200
@@ -112,6 +112,46 @@
SCR::Execute (.target.bash, sformat ("/bin/cp -a %1/etc %2", tmpdir,
Installation::destdir));
return ret;
}
+
+void ReportImageCopyError() {
+ // check for out of disk space
+ string cmd = "df -P";
+ y2milestone ("Executing %1", cmd);
+ map out = (map)SCR::Execute (.target.bash_output, cmd);
+ y2milestone ("Output: %1", out);
+ string total_str = out["stdout"]:"";
+ string error = nil;
+ foreach (string line, splitstring(total_str, "\n"), {
+ list<string> parsed = filter (string s, splitstring (line, " "),
{return s != "";});
+ string dev = parsed[0]:"";
+ string mp = parsed[5]:"";
+ string free = parsed[3]:"";
+ if (substring (dev, 0, 4) == "/dev" && substring (mp, 0, 4) == "/mnt")
+ {
+ if (tointeger (free) < 100*1024) // need to set some lower limit -
roughly estimated maximum size of the last file which could have failed
+ {
+ error = _("Copying the live image to hard disk failed.
+
+You have run out of disk space. Choose
+a bigger disk partition for the installation
+of the live system.");
+ }
+ }
+ });
+ if (error != nil)
+ {
+ Report::Error (error);
+ return;
+ }
+
+ total_str = splitstring(total_str, "\n")[1]:"";
+ integer total_mb = tointeger (filter (string s, splitstring (total_str, "
"), {return s != "";})[2]:"0") / 1024;
+
+
+
+ // generic error report
+ Report::Error (_("Copying the live image to hard disk failed."));
+}
/*
Progress::New(
// Headline for last dialog of base installation: Install LILO etc.
@@ -145,15 +185,13 @@
if (! CopyRootImage (5, 5 + step_size))
{
- // error report
- Report::Error (_("Copying the live image to hard disk failed."));
+ ReportImageCopyError();
return `abort;
}
//Progress::NextStageStep (10);
if (! CopySymlinkedImage (copy_map, 5 + step_size))
{
- // error report
- Report::Error (_("Copying the live image to hard disk failed."));
+ ReportImageCopyError();
return `abort;
}
//Progress::Finish();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-live-installer-2.20.0/src/live-installer.desktop
new/yast2-live-installer-2.21.0/src/live-installer.desktop
--- old/yast2-live-installer-2.20.0/src/live-installer.desktop 2010-10-12
16:33:35.000000000 +0200
+++ new/yast2-live-installer-2.21.0/src/live-installer.desktop 2011-08-08
13:07:31.000000000 +0200
@@ -3,7 +3,6 @@
Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
X-KDE-ModuleType=Library
-X-KDE-RootOnly=true
X-KDE-HasReadOnlyMode=true
X-KDE-Library=yast2
X-SuSE-YaST-Call=live-installer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-live-installer-2.20.0/src/live-installer.ycp
new/yast2-live-installer-2.21.0/src/live-installer.ycp
--- old/yast2-live-installer-2.20.0/src/live-installer.ycp 2010-10-12
16:33:35.000000000 +0200
+++ new/yast2-live-installer-2.21.0/src/live-installer.ycp 2011-03-08
13:42:00.000000000 +0100
@@ -35,7 +35,11 @@
integer memsize = memories[0,"resource","phys_mem",0,"range"]:0;
integer oneGB = 1073741824;
y2milestone ("Physical memory %1", memsize);
- if (memsize < oneGB) {
+
+ string cmd = "cat /proc/cmdline | grep -q liveinstall";
+ boolean live_only = (0 == (integer)SCR::Execute (.target.bash, cmd));
+
+ if (memsize < oneGB && ! live_only) {
// pop-up, %1 is memory size, currently hardcoded "1 GB"
if (! Popup::ContinueCancel (sformat (_("Your computer has less than
%1 of memory. This may not be
sufficient for the live installation, especially when installing
@@ -72,7 +76,7 @@
// detect removable media, if they are mounted, they cannot be used for
installation (bnc #437235)
// this is a hack, since partitioner cannot provide information which
partitions will be resized,
// removed or formatted and thus mustn't be mounted during installation
- string cmd = "cat /proc/mounts |grep '\/media\/'";
+ cmd = "cat /proc/mounts |grep '\/media\/'";
if (0 == (integer)SCR::Execute (.target.bash, cmd))
{
// continue/cancel pop-up
@@ -155,23 +159,19 @@
drive to finish the installation. Either YaST can reboot
now or you can reboot any time later.
-Note that if the Live CD is not ejected, you can either eject
+Note that the Live CD is not ejected, you can either eject
it after the Live system shuts down or select \"Hard Disk\"
in the boot menu of the Live CD.");
// push button
if (Popup::AnyQuestion(Popup::NoHeadline(), msg, _("Reboot &Now"),
_("Reboot &Later"), `focus_no))
{
- string device = "/dev/sr0";
- map out = (map)WFM::Execute (.local.bash_output, "cat /proc/mounts
|grep '\/media\/livecd ' | cut -d ' ' -f 1");
- if (out["exit"]:-1 != 0)
- y2error ("Failed to detect the device");
- else
- device = out["stdout"]:"";
- y2milestone ("Ejecting device %1", device);
- string cmd = sformat ("echo s >/proc/sysrq-trigger ; sleep 1 ; echo
u >/proc/sysrq-trigger ; eject %1; sleep 10s; echo b >/proc/sysrq-trigger",
device);
+ string cmd = "/sbin/reboot";
UI::OpenDialog (`Label ("Rebooting the system..."));
- WFM::Execute (.local.bash, cmd);
- // this should never be reached
+ if (0 == (integer)WFM::Execute (.local.bash, cmd)) {
+ while (true)
+ sleep(10);
+ }
+ // this should never be reached in case of successful reboot
UI::CloseDialog ();
// error report
Report::Error (_("Failed to restart the computer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-live-installer-2.20.0/yast2-live-installer-2.21.0/live-installer.pot
new/yast2-live-installer-2.21.0/yast2-live-installer-2.21.0/live-installer.pot
---
old/yast2-live-installer-2.20.0/yast2-live-installer-2.21.0/live-installer.pot
1970-01-01 01:00:00.000000000 +0100
+++
new/yast2-live-installer-2.21.0/yast2-live-installer-2.21.0/live-installer.pot
2010-12-06 11:17:42.000000000 +0100
@@ -0,0 +1,226 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-06 11:17+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/inst_live_add_base_repo.ycp:25 src/inst_live_sw_select.ycp:17
+msgid "Software Installation"
+msgstr ""
+
+#: src/inst_live_doit.ycp:79 src/inst_live_doit.ycp:80
+#, ycp-format
+msgid "Copying %1..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:132 src/inst_live_doit.ycp:133
+msgid "Evaluating filesystems to copy..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:135 src/inst_live_doit.ycp:136
+msgid "Copying root filesystem..."
+msgstr ""
+
+#: src/inst_live_doit.ycp:137
+msgid "Copying live image..."
+msgstr ""
+
+#. error report
+#: src/inst_live_doit.ycp:149 src/inst_live_doit.ycp:156
+msgid "Copying the live image to hard disk failed."
+msgstr ""
+
+#. dialog caption
+#: src/inst_live_simple_proposal.ycp:22 src/inst_live_simple_proposal.ycp:155
+msgid "Installation settings"
+msgstr ""
+
+#. label
+#: src/inst_live_simple_proposal.ycp:24
+msgid "Analyzing the system..."
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:84
+#, ycp-format
+msgid "Use %1%% of disk %2 for Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:88
+#, ycp-format
+msgid "Do not use disk %1"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:92
+msgid "Partitioning"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:109
+msgid "System start-up"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:111
+msgid "Ask whether to boot Linux or existing system"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:112
+msgid "Boot only Linux"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:113
+#, ycp-format
+msgid "System start time-out: %1 seconds"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:119
+msgid "Keyboard"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:126
+msgid "Time Zone"
+msgstr ""
+
+#: src/inst_live_simple_proposal.ycp:136
+msgid "Change Installation Settings"
+msgstr ""
+
+#. help text 1/3
+#: src/inst_live_simple_proposal.ycp:141
+msgid ""
+"<p>\n"
+"Use <b>Accept</b> to perform a new installation with the values
displayed.</p>"
+msgstr ""
+
+#. help text 2/3
+#: src/inst_live_simple_proposal.ycp:144
+msgid ""
+"<p>\n"
+"To change the values click the respective headline\n"
+"or select <b>Change Installation Settings</b></p>"
+msgstr ""
+
+#. help text 3/3
+#: src/inst_live_simple_proposal.ycp:148
+msgid ""
+"<p>\n"
+"Your hard disk has not been modified, you can still safely abort.\n"
+"</p>"
+msgstr ""
+
+#. help text 1/1
+#: src/inst_live_welcome.ycp:14
+msgid ""
+"<p>Welcome to the &product; installation.\n"
+"Press <b>Next</p> to run the installation wizard.</p>"
+msgstr ""
+
+#. dialog caption, %1 is product name (typically openSUSE)
+#: src/inst_live_welcome.ycp:19
+#, ycp-format
+msgid "Welcome to %1 installation"
+msgstr ""
+
+#. wellcome label, %1 is product name
+#: src/inst_live_welcome.ycp:21
+#, ycp-format
+msgid ""
+"Your %1 will be installed quickly\n"
+"and easily in a few steps.\n"
+"You will only have to answer some questions."
+msgstr ""
+
+#. TRANSLATORS: error message - the module does not provide command line
interface
+#: src/live-installer.ycp:27
+msgid "There is no user interface available for this module."
+msgstr ""
+
+#. pop-up, %1 is memory size, currently hardcoded "1 GB"
+#: src/live-installer.ycp:44
+#, ycp-format
+msgid ""
+"Your computer has less than %1 of memory. This may not be\n"
+"sufficient for the live installation, especially when installing\n"
+"while running other applications.\n"
+"Before continuing, finish all running applications."
+msgstr ""
+
+#. continue/cancel pop-up
+#: src/live-installer.ycp:83
+msgid ""
+"YaST detected a mounted removable media. YaST cannot install\n"
+"the system on media which is mounted.\n"
+"To install the system on these media, unmount them first."
+msgstr ""
+
+#. continue-cancel popup
+#: src/live-installer.ycp:111
+msgid ""
+"openSUSE installer detected DMRAID array.\n"
+"It is not supported by the openSUSE live installer.\n"
+"Continuing the installation may cause data loss."
+msgstr ""
+
+#. popup dialog, text followed by 'Reboot Now' and 'Reboot Later' buttons
+#: src/live-installer.ycp:158
+msgid ""
+"The computer needs to be rebooted without the Live CD in the\n"
+"drive to finish the installation. Either YaST can reboot\n"
+"now or you can reboot any time later.\n"
+"\n"
+"Note that if the Live CD is not ejected, you can either eject\n"
+"it after the Live system shuts down or select \"Hard Disk\"\n"
+"in the boot menu of the Live CD."
+msgstr ""
+
+#. push button
+#: src/live-installer.ycp:166
+msgid "Reboot &Now"
+msgstr ""
+
+#: src/live-installer.ycp:166
+msgid "Reboot &Later"
+msgstr ""
+
+#. error report
+#: src/live-installer.ycp:181
+msgid ""
+"Failed to restart the computer.\n"
+"Reboot it manually. You may even need to push the\n"
+"'Reset' button to restart it."
+msgstr ""
+
+#. progress step title
+#: src/live_copy_files_finish.ycp:51
+msgid "Copying files to installed system..."
+msgstr ""
+
+#. progress step title
+#: src/live_runme_at_boot_finish.ycp:45
+msgid "Writing YaST Configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:51
+msgid "Saving language..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:56
+msgid "Saving keyboard configuration..."
+msgstr ""
+
+#. progress step title
+#: src/live_save_config_finish.ycp:61
+msgid "Saving time zone..."
+msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
