Hello community, here is the log from the commit of package yast2-repair checked in at Thu May 17 11:27:13 CEST 2007. -------- --- yast2-repair/yast2-repair.changes 2007-05-03 14:27:04.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-repair/yast2-repair.changes 2007-05-16 10:43:10.980982000 +0200 @@ -1,0 +2,6 @@ +Wed May 16 10:32:17 CEST 2007 - jsuchome@suse.cz + +- checking of /etc/fstab adapted to current standards (#273105) +- 2.15.6 + +------------------------------------------------------------------- Old: ---- yast2-repair-2.15.5.tar.bz2 New: ---- yast2-repair-2.15.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-repair.spec ++++++ --- /var/tmp/diff_new_pack.H27527/_old 2007-05-17 11:26:28.000000000 +0200 +++ /var/tmp/diff_new_pack.H27527/_new 2007-05-17 11:26:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-repair (Version 2.15.5) +# spec file for package yast2-repair (Version 2.15.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-repair -Version: 2.15.5 +Version: 2.15.6 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-repair-2.15.5.tar.bz2 +Source0: yast2-repair-2.15.6.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-testsuite Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage @@ -34,7 +34,7 @@ Jiri Suchomel <jsuchome@suse.cz> %prep -%setup -n yast2-repair-2.15.5 +%setup -n yast2-repair-2.15.6 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,9 @@ %doc %{prefix}/share/doc/packages/yast2-repair %changelog +* Wed May 16 2007 - jsuchome@suse.cz +- checking of /etc/fstab adapted to current standards (#273105) +- 2.15.6 * Thu May 03 2007 - jsuchome@suse.cz - basic command line for view_anymsg client (#269912) - 2.15.5 ++++++ yast2-repair-2.15.5.tar.bz2 -> yast2-repair-2.15.6.tar.bz2 ++++++ ++++ 5396 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.15.5/configure.in new/yast2-repair-2.15.6/configure.in --- old/yast2-repair-2.15.5/configure.in 2007-05-03 14:09:26.000000000 +0200 +++ new/yast2-repair-2.15.6/configure.in 2006-03-16 09:32:25.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-repair dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-repair, 2.15.4, http://bugs.opensuse.org/, yast2-repair) +AC_INIT(yast2-repair, 2.13.3, http://www.suse.de/feedback, yast2-repair) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.4" +VERSION="2.13.3" RPMNAME="yast2-repair" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" @@ -110,8 +110,6 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -144,9 +142,6 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) AC_CONFIG_FILES(Makefile data/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.15.5/Makefile.am new/yast2-repair-2.15.6/Makefile.am --- old/yast2-repair-2.15.5/Makefile.am 2007-05-03 14:09:26.000000000 +0200 +++ new/yast2-repair-2.15.6/Makefile.am 2006-03-16 09:32:26.000000000 +0100 @@ -7,7 +7,7 @@ # #where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -66,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in config.status +$(RPMNAME).pc: $(RPMNAME).pc.in ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH @@ -95,7 +95,7 @@ done pot: - $(Y2TOOL) y2makepot -s $(srcdir) + y2tool y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +116,7 @@ fi spellcheck: pot - $(Y2TOOL) pot-spellcheck + y2tool pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +143,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(Y2TOOL); then \ - echo "$(Y2TOOL): not found."; \ + if ! test -x $(PREFIX)/bin/y2tool; then \ + echo "$(PREFIX)/bin/y2tool: not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ + $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local -TAGVERSION = $(Y2TOOL) tagversion +TAGVERSION = $(PREFIX)/bin/y2tool tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -199,13 +199,10 @@ false; \ fi -check-textdomain: - $(Y2TOOL) check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package - $(Y2TOOL) checkin-stable + $(PREFIX)/bin/y2tool checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.15.5/Makefile.am.common new/yast2-repair-2.15.6/Makefile.am.common --- old/yast2-repair-2.15.5/Makefile.am.common 2007-05-03 14:09:26.000000000 +0200 +++ new/yast2-repair-2.15.6/Makefile.am.common 2006-03-16 09:32:26.000000000 +0100 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.15.5/src/OSRFstab.ycp new/yast2-repair-2.15.6/src/OSRFstab.ycp --- old/yast2-repair-2.15.5/src/OSRFstab.ycp 2007-05-03 14:05:55.000000000 +0200 +++ new/yast2-repair-2.15.6/src/OSRFstab.ycp 2007-05-15 17:08:02.000000000 +0200 @@ -25,7 +25,7 @@ * OSRFstab::Repair(); * * - * $Id: OSRFstab.ycp 32905 2006-09-15 09:56:57Z jsuchome $ + * $Id: OSRFstab.ycp 32906 2006-09-15 09:57:06Z jsuchome $ */ { module "OSRFstab"; @@ -187,7 +187,7 @@ foreach (string type, [ "pts", "proc", "usb", "swap", "cdrom", "floppy", - "root", "zip", "dev", "nfs", "sys" ], + "root", "zip", "dev", "nfs", "sys", "debug" ], { fstab_defaults [type] = FileSystems::GetFstabDefaultMap (type); }); @@ -245,7 +245,7 @@ if (Mode::test ()) return ["/dev/hda1", "/dev/hda2"]; if (size (checked_partitions) == 0) return []; -y2warning ("checked_partitions: %1", checked_partitions); + y2warning ("checked_partitions: %1", checked_partitions); // e.g.: ["/dev/hda1", "/dev/hdb2"] list<string> linux_partition_list = []; @@ -254,7 +254,7 @@ foreach (map partition, description["partitions"]:[], ``{ -y2internal ("partition: %1", partition); + y2internal ("partition: %1", partition); if ((partition["fsid"]:0 == Partitions::fsid_native || partition["type"]:`primary == `lvm || partition["type"]:`primary == `sw_raid)) @@ -610,7 +610,6 @@ else { ret["found"] = "cdrom"; } - if (ret == $[] || ret == nil) { list lret = maplist (string n, map m, @@ -624,7 +623,16 @@ { ret = Storage::GetPartition( Storage::GetTargetMap(), dev_name ); if (ret != $[] && ret != nil) { - if (ret["device"]:"" == dev_name) + /* + dev name might be: /dev/disk/by-id/scsi-SATA_ST340016A_3HS8YAL0-part6 + ret = Storage::GetPartition might contain: $["detected_fs":`ext3, "device":"/dev/sda6", "fsid":131, "fstopt":"acl,user_xattr", "fstype":"Linux native", "mount":"/", "mountby":`id, "name":"sda6", "nr":6, "region":[2351, 652], "size_k":5237158, "type":`logical, "udev_id":["scsi-SATA_ST340016A_3HS8YAL0-part6", "ata-ST340016A_3HS8YAL0-part6"], "udev_path":"pci-0000:00:02.5-scsi-0:0:0:0-part6", "used_fs":`ext3, "uuid":"75ff86c0-4c4d-47ab-af1e-196dbed4ea68"] + */ + boolean correct = false; + foreach (string udev_id, ret["udev_id"]:[], { + correct = correct || issubstring (dev_name, udev_id); + }); + + if (ret["device"]:"" == dev_name || correct) { ret["dev_name"] = dev_name; if (ret["fsid"]:0 == Partitions::fsid_swap) { @@ -829,6 +837,14 @@ fs_vfstype = ( line[2]:"" == fstab_defaults[type,"vfstype"]:"!"); fs_mntops = ( line[3]:"" != nil && line[3]:"" != ""); } + else if (line[0]:"" == fstab_defaults["debug","spec"]:"!") + { + type = "debug"; + fs_spec = true; + fs_file = ( line[1]:"" == fstab_defaults[type,"mount"]:"!"); + fs_vfstype = ( line[2]:"" == fstab_defaults[type,"vfstype"]:"!"); + fs_mntops = ( line[3]:"" != nil && line[3]:"" != ""); + } fs_freq = check_fs_freq ( line, [ tostring (fstab_defaults [type, "freq"]:0) ]); fs_passno = check_fs_passno ( @@ -868,7 +884,8 @@ part["mount"] = line[1]:""; Storage::ChangeVolumeProperties(part); } - else if (contains (swapable_partition_list, part["dev_name"]:"") && + else if ((contains (swapable_partition_list, part["dev_name"]:"") || + contains (swapable_partition_list, part["device"]:"")) && part["found"]:"" == "swap") { type = "swap"; @@ -982,18 +999,23 @@ swapable_partition_list = tswapable_partition_list; checked_partitions = tchecked_partitions; + map fstab2part = $[]; + // check all lines in existing fstab file foreach (integer lnr, map line, fstab["l"]:$[], ``{ y2milestone("----check fstab line %1 ", lnr); if (! contains (valid_lines, lnr)) check_fstab_line(lnr); + map fstabpart = Storage::GetPartition (Storage::GetTargetMap(), line["fields",0]:""); + if (fstabpart["device"]:"" != "") + fstab2part[fstabpart["device"]:""] = fstabpart; }); // check all mountable partitions + swap + usb+ proc +... foreach (string p, devices2check(), ``{ y2milestone("-----check partition and usb,proc,pts %1", p); - check_dev_entry(p); + if (!haskey (fstab2part, p)) + check_dev_entry(p); }); - return ((size (missing_devs) == 0) && (size (not_valid_lines) == 0)); } @@ -1940,6 +1962,15 @@ root_l_no = union (root_l_no, AsciiFile::FindLineField (fstab, 0, "LABEL=" + root_part["label"]:"")); + if (root_l_no == []) + { + foreach (integer lnr, map line, fstab["l"]:$[], { + map fstabpart = Storage::GetPartition (Storage::GetTargetMap(), line["fields",0]:""); + if (fstabpart["device"]:"" == dev_name) + root_l_no = add (root_l_no, lnr); + }); + } + // root_lines example: // $[ 1 : $["fields":["/dev/hda3", "/", "reiserfs", "defaults", "1", "2"], // "line":"/dev/hda3\t/\treiserfs\tdefaults 1 2" ] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.15.5/src/osr_module_partition.ycp new/yast2-repair-2.15.6/src/osr_module_partition.ycp --- old/yast2-repair-2.15.5/src/osr_module_partition.ycp 2007-05-03 14:05:55.000000000 +0200 +++ new/yast2-repair-2.15.6/src/osr_module_partition.ycp 2006-09-26 14:43:06.000000000 +0200 @@ -11,7 +11,7 @@ * Author: * Johannes Buchhold <jbuch@suse.de> * - * $Id: osr_module_partition.ycp 32905 2006-09-15 09:56:57Z jsuchome $ + * $Id: osr_module_partition.ycp 32906 2006-09-15 09:57:06Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.15.5/src/view_anymsg.ycp new/yast2-repair-2.15.6/src/view_anymsg.ycp --- old/yast2-repair-2.15.5/src/view_anymsg.ycp 2007-05-03 14:10:36.000000000 +0200 +++ new/yast2-repair-2.15.6/src/view_anymsg.ycp 2007-05-16 10:31:49.000000000 +0200 @@ -5,7 +5,7 @@ * * Author: Klaus Kaempf <kkaempf@suse.de> * - * $Id: view_anymsg.ycp 25377 2005-09-06 07:56:23Z jsuchome $ + * $Id: view_anymsg.ycp 37801 2007-05-03 12:27:41Z jsuchome $ * * Reads a \n separated list of filenames from * /var/lib/YaST2/filenames diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-repair-2.15.5/VERSION new/yast2-repair-2.15.6/VERSION --- old/yast2-repair-2.15.5/VERSION 2007-05-03 14:12:41.000000000 +0200 +++ new/yast2-repair-2.15.6/VERSION 2007-05-16 10:34:08.000000000 +0200 @@ -1 +1 @@ -2.15.5 +2.15.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org