- openSUSE Commits

commit xen
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package xen checked in at Tue Apr 4 02:04:24 CEST 2006. -------- --- arch/i386/xen/xen.changes 2006-03-25 02:13:48.000000000 +0100 +++ xen/xen.changes 2006-04-04 01:26:11.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 4 01:24:01 CEST 2006 - garloff(a)suse.de + +- init script: Test for control_d in capabilities to determine dom0 + rather than privcmd. +- init script: Try loading netloop and backend modules. +- mk-xen-rescue-img.sh: Copy frontend drivers, remove stale files. +- example config files: provide commented out domUloader exmaples. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.hsX6w6/_old 2006-04-04 02:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.hsX6w6/_new 2006-04-04 02:03:59.000000000 +0200 @@ -19,7 +19,7 @@ %define with_pygrub 1 %define xen_build_dir xen-unstable Version: 3.0.2_09434 -Release: 1 +Release: 2 License: GPL Group: System/Kernel Autoreqprov: on @@ -71,7 +71,7 @@ multiple guest operating systems with unprecedented levels of performance and resource isolation. -This package contains the Xen Hypervisor. +This package contains the Xen Hypervisor. (tm) Modern computers are sufficiently powerful to use virtualization to present the illusion of many smaller virtual machines (VMs), each @@ -107,6 +107,8 @@ using full virtualization, if appropriate hardware is present. Install xen-tools-ioemu if you want to use this. +[Hypervisor is a trademark of IBM] + Authors: @@ -721,6 +723,12 @@ %{insserv_cleanup} %changelog -n xen +* Tue Apr 04 2006 - garloff(a)suse.de +- init script: Test for control_d in capabilities to determine dom0 + rather than privcmd. +- init script: Try loading netloop and backend modules. +- mk-xen-rescue-img.sh: Copy frontend drivers, remove stale files. +- example config files: provide commented out domUloader exmaples. * Thu Mar 23 2006 - ccoffing(a)novell.com - Update to hg 9434 (xen-unstable tree; 3.0.2-rc). - Fix /etc/xen/scripts/block to properly check if devices can be ++++++ README.SuSE ++++++ --- arch/i386/xen/README.SuSE 2006-03-16 23:59:33.000000000 +0100 +++ xen/README.SuSE 2006-04-04 01:21:25.000000000 +0200 @@ -5,7 +5,8 @@ For more in-depth documentation of using Xen on SUSE, consult the virtualization chapter in the SLES or SUSE Linux manual. For more complete -documentation on Xen itself, please install one of the xen-doc-* packages. +documentation on Xen itself, please install one of the xen-doc-* packages +and read the documentation installed into /usr/share/doc/packages/xen/. About @@ -352,7 +353,7 @@ into /etc/modprobe.conf.local in dom0. Similarly, the netback driver comes up with 8 virtual network device -paris (vif0.X - vethX); you can change this by placing the netback +pairs (vif0.X - vethX); you can change this by placing the netloop's nloopbacks=N parameter to the kernel/module. ++++++ init.xend ++++++ --- arch/i386/xen/init.xend 2006-03-08 19:52:19.000000000 +0100 +++ xen/init.xend 2006-04-04 01:20:28.000000000 +0200 @@ -43,16 +43,17 @@ } if [ "$1" == status ]; then - if [ ! -e /proc/xen/privcmd ]; then + if [ ! -e /proc/xen/capabilities ]; then xend_abort 3 fi else if [ `id -u` != 0 ]; then xend_abort 4 fi - if [ ! -e /proc/xen/privcmd ]; then + if [ ! -e /proc/xen/capabilities ] || + ! grep control_d /proc/xen/capabilities >/dev/null 2>&1; then if [ "$1" == stop ] || - [ "$1" == restart ]; then + [ "$1" == try-restart ]; then xend_abort 0 else xend_abort 6 @@ -70,6 +71,15 @@ if [ ! -z "$XEND" ]; then echo -n "(already running pid $XEND) " fi + # Load XEN backend modules + # Sidenote: They could be loaded later: + # - netloop at network-bridge init time + # - netbk and blkbk when the dom0 hotplug events occur + # (in xen-network-common.sh and block-common.sh) + # but for now it's safest to have them loaded when xend starts in dom0. + modprobe netloop 2>/dev/null || true + modprobe netbk 2>/dev/null || true + modprobe blkbk 2>/dev/null || true xend start await_daemons_up ;; @@ -83,13 +93,16 @@ rc_reset else echo -n "(pid $XEND) " + unset sysrq_sent while read nm id mem vcpu state time; do if [ $id = 0 ]; then continue; fi + sysrq_sent=1 echo -en "\n Warning: Domain $nm (ID $id) still up ($state)" # Domains should be closed down by xendomains; anyway, send # SysRq-S to avoid the worst in case domains are not shut down. xm sysrq $id s done < <(xm list | grep -v ^Name) + if [ -n "$sysrq_sent" ]; then sleep 1; fi xend stop killall xenconsoled >/dev/null 2>&1 killall xenstored >/dev/null 2>&1 ++++++ mk-xen-rescue-img.sh ++++++ --- arch/i386/xen/mk-xen-rescue-img.sh 2006-03-09 00:56:28.000000000 +0100 +++ xen/mk-xen-rescue-img.sh 2006-04-04 01:16:18.000000000 +0200 @@ -197,14 +197,23 @@ cp -p $KMODDIR/drivers/base/firmware_class.ko "$DST_MNT"$KMODDIR/drivers/base/ mkdir -p "$DST_MNT"$KMODDIR/drivers/md cp -p $KMODDIR/drivers/md/*.ko "$DST_MNT"$KMODDIR/drivers/md/ + mkdir -p "$DST_MNT"$KMODDIR/drivers/xen + for dir in $KMODDIR/drivers/xen/*front; do + cp -ax $dir "$DST_MNT"$KMODDIR/drivers/xen/ + done if test -e $KMODDIR/kernel; then mkdir -p "$DST_MNT"$KMODDIR/kernel cp -ax $KMODDIR/kernel/* "$DST_MNT"$KMODDIR/kernel/ fi # Kernel image + System.map mkdir -p "$DST_MNT"/boot + rm -f "$DST_MNT"/boot/vmlinuz-* "$DST_MNT"/boot/System.map-* "$DST_MNT"/boot/initrd-* cp -p /boot/vmlinuz-$KVER "$DST_MNT"/boot/ - cp -p /boot/initrd-$KVER "$DST_MNT"/boot/ + if test -e /boot/initrd-$KVER-domU; then + cp -p /boot/initrd-$KVER-domU "$DST_MNT"/boot/initrd-$KVER + else + cp -p /boot/initrd-$KVER "$DST_MNT"/boot/ + fi cp -p /boot/System.map-$KVER "$DST_MNT"/boot/ depmod -a $KVER -b "$DST_MNT" -F "$DST_MNT"/boot/System.map-$KVER ++++++ xen-xmexample.diff ++++++ --- /var/tmp/diff_new_pack.hsX6w6/_old 2006-04-04 02:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.hsX6w6/_new 2006-04-04 02:03:59.000000000 +0200 @@ -4,58 +4,86 @@ =================================================================== --- xen-unstable.orig/tools/examples/xmexample1 +++ xen-unstable/tools/examples/xmexample1 -@@ -8,10 +8,10 @@ +@@ -6,13 +6,16 @@ + # you can set the parameters for the domain on the xm command line. + #============================================================================ #---------------------------------------------------------------------------- - # Kernel image file. +-# Kernel image file. -kernel = "/boot/vmlinuz-2.6.10-xenU" -+kernel = "/boot/vmlinuz-xen" - - # Optional ramdisk. +- +-# Optional ramdisk. -#ramdisk = "/boot/initrd.gz" ++# Kernel image file and (optional) ramdisk (initrd). ++kernel = "/boot/vmlinuz-xen" +ramdisk = "/boot/initrd-xen" ++ ++# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS ++#bootloader = "/usr/lib/xen/boot/domUlaoder.py" ++#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" ++#bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen" # The domain build function. Default is 'linux'. #builder='linux' + Index: xen-unstable/tools/examples/xmexample2 =================================================================== --- xen-unstable.orig/tools/examples/xmexample2 +++ xen-unstable/tools/examples/xmexample2 -@@ -36,10 +36,10 @@ xm_vars.check() +@@ -34,13 +34,16 @@ xm_vars.var('vmid', + # Check the defined variables have valid values.. + xm_vars.check() #---------------------------------------------------------------------------- - # Kernel image file. +-# Kernel image file. -kernel = "/boot/vmlinuz-2.6.10-xenU" -+kernel = "/boot/vmlinuz-xen" - - # Optional ramdisk. +- +-# Optional ramdisk. -#ramdisk = "/boot/initrd.gz" ++# Kernel image file and (optional) ramdisk (initrd). ++kernel = "/boot/vmlinuz-xen" +ramdisk = "/boot/initrd-xen" ++ ++# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS ++#bootloader = "/usr/lib/xen/boot/domUlaoder.py" ++#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" ++#bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen" # The domain build function. Default is 'linux'. #builder='linux' + Index: xen-unstable/tools/examples/xmexample3 =================================================================== --- xen-unstable.orig/tools/examples/xmexample3 +++ xen-unstable/tools/examples/xmexample3 -@@ -36,10 +36,10 @@ xm_vars.check() +@@ -34,13 +34,16 @@ xm_vars.var('vmid', + # Check the defined variables have valid values.. + xm_vars.check() #---------------------------------------------------------------------------- - # Kernel image file. +-# Kernel image file. -kernel = "/path/to/domU/kernel" -+kernel = "/boot/vmlinuz-xen" - - # Optional ramdisk. +- +-# Optional ramdisk. -#ramdisk = "/boot/initrd.gz" ++# Kernel image file and (optional) ramdisk (initrd). ++kernel = "/boot/vmlinuz-xen" +ramdisk = "/boot/initrd-xen" ++ ++# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS ++#bootloader = "/usr/lib/xen/boot/domUlaoder.py" ++#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" ++#bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen" # The domain build function. Default is 'linux'. #builder='linux' + Index: xen-unstable/tools/examples/xmexample.vti =================================================================== --- xen-unstable.orig/tools/examples/xmexample.vti +++ xen-unstable/tools/examples/xmexample.vti -@@ -44,7 +44,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] +@@ -43,9 +43,9 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] + # where UNAME is the device, DEV is the device name the domain will see, # and MODE is r for read-only, w for read-write. #disk = [ 'phy:hda1,hda1,r' ] @@ -64,11 +92,13 @@ #---------------------------------------------------------------------------- # Set according to whether you want the domain restarted when it exits. + # The default is 'onreboot', which restarts the domain when it shuts down Index: xen-unstable/tools/examples/xmexample.hvm =================================================================== --- xen-unstable.orig/tools/examples/xmexample.hvm +++ xen-unstable/tools/examples/xmexample.hvm -@@ -58,7 +58,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] +@@ -57,9 +57,9 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] + # where UNAME is the device, DEV is the device name the domain will see, # and MODE is r for read-only, w for read-write. #disk = [ 'phy:hda1,hda1,r' ] @@ -77,3 +107,4 @@ #---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' + # for a domain to stop: poweroff, reboot, and crash. For each of these you ++++++ xmexample.domUloader ++++++ --- arch/i386/xen/xmexample.domUloader 2006-01-21 01:10:53.000000000 +0100 +++ xen/xmexample.domUloader 2006-04-04 01:16:18.000000000 +0200 @@ -53,7 +53,8 @@ # This is a bootloader used to boot paravirtualized domains. You can # optionally plug in a different boot loader here, e.g., pygrub. There is -# usually no reason to change this. +# usually no reason to change this. Don't use kernel and ramdisk if you +# use a bootloader. bootloader = "/usr/lib/xen/boot/domUloader.py" # The domUloader will pull the specified kernel and initrd out of the domU's @@ -61,7 +62,9 @@ # keeping a copy of the kernel and initrd in sync in dom0's filesystem and # pointing to them with the "kernel" and "ramdisk" parameters. Syntax is # "VDEV:KERNEL,INITRD", where VDEV is the block device (from domU's point of -# view) within which KERNEL and INITRD can be found. +# view) within which KERNEL and INITRD can be found. VDEV is optional; if it's +# not specified, the root= parameter will be evaluated, /etc/fstab from the +# root FS be consulted and a path relative to the domU root FS be used. bootentry = "hda1:/boot/vmlinuz-xen,/boot/initrd-xen" #---------------------------------------------------------------------------- ++++++ xmexample.rescue ++++++ --- arch/i386/xen/xmexample.rescue 2006-03-08 00:17:03.000000000 +0100 +++ xen/xmexample.rescue 2006-04-04 01:23:01.000000000 +0200 @@ -21,18 +21,15 @@ xm_vars.check() #---------------------------------------------------------------------------- -# Bootloader, which extracts the kernel and ramdisk from the disk. -#bootloader = "/usr/lib/xen/boot/domUloader.py" - -# The locations of the kernel and ramdisk to be extracted by the bootloader. -#bootentry = "hda1:/boot/vmlinuz-xen,/boot/initrd-xen" - -# Kernel image file. +# Kernel image file and (optional) ramdisk (initrd). kernel = "/boot/vmlinuz-xen" - -# Optional ramdisk. ramdisk = "/boot/initrd-xen" +# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS +#bootloader = "/usr/lib/xen/boot/domUlaoder.py" +#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" +#bootentry = "/boot/vmlinuz-xen,/boot/initrd-xen" + # The domain build function. Default is 'linux'. #builder='linux' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit aaa_base
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package aaa_base checked in at Tue Apr 4 02:03:51 CEST 2006. -------- --- aaa_base/aaa_base.changes 2006-04-03 12:06:52.000000000 +0200 +++ aaa_base/aaa_base.changes 2006-04-04 01:54:05.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 01:53:49 CEST 2006 - garloff(a)suse.de + +- Add DOMU_INITRD_MODULES variable to sysconfig.kernel. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.9RF4Xp/_old 2006-04-04 02:03:30.000000000 +0200 +++ /var/tmp/diff_new_pack.9RF4Xp/_new 2006-04-04 02:03:30.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Autoreqprov: on Version: 10.1 -Release: 15 +Release: 16 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -143,6 +143,8 @@ %defattr(-,root,root) %changelog -n aaa_base +* Tue Apr 04 2006 - garloff(a)suse.de +- Add DOMU_INITRD_MODULES variable to sysconfig.kernel. * Mon Apr 03 2006 - ro(a)suse.de - fix /etc/profile.d/xdg-enviroment.csh (#158283) * Wed Mar 29 2006 - ro(a)suse.de ++++++ sysconfig_parts.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/sysconfig.kernel new/sysconfig_parts/sysconfig.kernel --- old/sysconfig_parts/sysconfig.kernel 2005-12-16 14:49:06.000000000 +0100 +++ new/sysconfig_parts/sysconfig.kernel 2006-04-04 01:53:25.000000000 +0200 @@ -4,10 +4,20 @@ ## Command: /sbin/mkinitrd # # This variable contains the list of modules to be added to the initial -# ramdisk by calling the script "mk_initrd" +# ramdisk by calling the script "mkinitrd" # (like drivers for scsi-controllers, for lvm or reiserfs) # INITRD_MODULES="" + +## Type: string +## Command: /sbin/mkinitrd +# +# This variable contains the list of modules to be added to the initial +# ramdisk that is created for unprivilegd Xen domains (domU); you may need +# drivers for virtual block and network devices in addition to filesystem +# and device-mapper modules. +# +DOMU_INITRD_MODULES="xennet xenblk" ## Type: string ## ServiceRestart: boot.loadmodules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-bootloader
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Tue Apr 4 00:59:25 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-04-01 23:27:58.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-04-03 20:55:01.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Apr 3 20:51:38 CEST 2006 - od(a)suse.de + +- do not add kernel option "selinux=0" on any architecture (#155856) +- fixed compilation errors in lib_iface.ycp +- 2.13.36 + +------------------------------------------------------------------- +Mon Apr 3 20:27:48 CEST 2006 - jplack(a)suse.de + +- ppc: update default name if denoted section has been updated +- ppc: update global clone entry, too, if device names changed +- fix for #161755, send partition/disk info where neccessary +- reorder code so that new function SetDiskInfo is formed and can + be used in various places to fix #161755 +- add proposed code change for virtual 'boot' mountpoints (#162242) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.35.tar.bz2 New: ---- yast2-bootloader-2.13.36.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.DmZbbt/_old 2006-04-04 00:58:44.000000000 +0200 +++ /var/tmp/diff_new_pack.DmZbbt/_new 2006-04-04 00:58:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.35) +# spec file for package yast2-bootloader (Version 2.13.36) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.35 +Version: 2.13.36 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.35.tar.bz2 +Source0: yast2-bootloader-2.13.36.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.35 +%setup -n yast2-bootloader-2.13.36 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,17 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Mon Apr 03 2006 - od(a)suse.de +- do not add kernel option "selinux=0" on any architecture (#155856) +- fixed compilation errors in lib_iface.ycp +- 2.13.36 +* Mon Apr 03 2006 - jplack(a)suse.de +- ppc: update default name if denoted section has been updated +- ppc: update global clone entry, too, if device names changed +- fix for #161755, send partition/disk info where neccessary +- reorder code so that new function SetDiskInfo is formed and can + be used in various places to fix #161755 +- add proposed code change for virtual 'boot' mountpoints (#162242) * Sat Apr 01 2006 - od(a)suse.de - added TESTME comment: test parted partition activation with BSD slices ++++++ yast2-bootloader-2.13.35.tar.bz2 -> yast2-bootloader-2.13.36.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/VERSION new/yast2-bootloader-2.13.36/VERSION --- old/yast2-bootloader-2.13.35/VERSION 2006-04-01 23:25:39.000000000 +0200 +++ new/yast2-bootloader-2.13.36/VERSION 2006-04-03 20:51:24.000000000 +0200 @@ -1 +1 @@ -2.13.35 +2.13.36 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/modules/BootArch.ycp new/yast2-bootloader-2.13.36/src/modules/BootArch.ycp --- old/yast2-bootloader-2.13.35/src/modules/BootArch.ycp 2006-02-13 04:52:14.000000000 +0100 +++ new/yast2-bootloader-2.13.36/src/modules/BootArch.ycp 2006-04-03 20:43:21.000000000 +0200 @@ -13,7 +13,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: BootArch.ycp 27748 2006-02-08 15:15:11Z jplack $ + * $Id: BootArch.ycp 29647 2006-04-03 18:43:13Z odabrunz $ * */ @@ -45,15 +45,15 @@ string ret = ""; if (Arch::i386 ()) { - ret = "showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off"; + ret = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off"; } else if (Arch::x86_64 ()) { - ret = "showopts ide=nodma apm=off acpi=off noresume selinux=0 edd=off"; + ret = "showopts ide=nodma apm=off acpi=off noresume edd=off"; } else if (Arch::ia64 ()) { - ret = "ide=nodma nohalt noresume selinux=0"; + ret = "ide=nodma nohalt noresume"; } else { @@ -85,8 +85,7 @@ string resumestring = ""; if (resume != "") resumestring = sformat ("resume=%1", resume); - string ret = sformat ("%1 %2 %3 %4", - "selinux=0", + string ret = sformat ("%1 %2 %3", Kernel::GetCmdLine (), resumestring, ProductFeatures::GetStringFeature ( @@ -99,8 +98,7 @@ } else if (Arch::ia64 ()) { - string append = sformat ("%1 %2 %3 splash=silent", - "selinux=0", + string append = sformat ("%1 %2 splash=silent", ProductFeatures::GetStringFeature ( "globals", "additional_kernel_parameters"), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.36/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp 2006-04-01 23:05:49.000000000 +0200 +++ new/yast2-bootloader-2.13.36/src/modules/BootPOWERLILO.ycp 2006-04-03 20:40:51.000000000 +0200 @@ -14,7 +14,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootPOWERLILO.ycp 29590 2006-03-31 14:28:39Z jplack $ + * $Id: BootPOWERLILO.ycp 29645 2006-04-03 18:20:32Z jplack $ * */ @@ -572,9 +572,11 @@ * @return boolean true on success */ global boolean Read (boolean reread) { - BootCommon::InitializeLibrary (reread, "ppc"); - if (reread) - { + if (!BootCommon::InitializeLibrary (reread, "ppc")) { + // send current disk/partition information to perl-Bootloader + BootCommon::SetDiskInfo (); + } + if (reread) { BootCommon::ReadFiles (); } // Do we have to detect disks ? @@ -612,13 +614,21 @@ } if (! BootCommon::InitializeLibrary (init, "ppc")) - return false; + // send current disk/partition information to perl-Bootloader + BootCommon::SetDiskInfo (); + // Sanity check the sections list: we can only pass strings // through the perl interface list<map<string,string> > sects = maplist (map<string,any> s, BootCommon::sections, { return (map<string,string>) filter (string k, any v, s, { return is (v, string); }); }); + + // FIXME: remove all mountpoints of type 'boot/boot' through some Storage::<func> + + // FIXME: set one mountpoint 'boot/boot' for every boot target means all + // partitions in 'boot_<arch>_custom' and 'clone' (chrp) + // ret = ret && BootCommon::SetDeviceMap (device_mapping); ret = ret && BootCommon::SetSections (sects); ret = ret && BootCommon::SetGlobal (BootCommon::globals); @@ -728,6 +738,12 @@ sections_to_recreate = filter (string this_name, sections_to_recreate, ``(this_name != oname) ); + // check for a new global default if oname != name + if ( name == BootCommon::globals["default"]:"" ) { + // we assume that the new name produced by CreateImageSection + // will be oname + BootCommon::globals["default"] = oname; + } return CreateImageSection(oname); } @@ -841,7 +857,7 @@ // update device naming of default root and boot_* entries foreach (string key, ["root", "boot_prep_custom", "boot_chrp_custom", - "boot_iseries_custom","boot_pmac_custom"], { + "boot_iseries_custom","boot_pmac_custom", "clone"], { if (haskey(BootCommon::globals, key)) { y2milestone ("Updating global %1= setting, currently %2", key, BootCommon::globals[key]:""); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/modules/BootZIPL.ycp new/yast2-bootloader-2.13.36/src/modules/BootZIPL.ycp --- old/yast2-bootloader-2.13.35/src/modules/BootZIPL.ycp 2006-01-02 14:59:33.000000000 +0100 +++ new/yast2-bootloader-2.13.36/src/modules/BootZIPL.ycp 2006-04-03 20:43:21.000000000 +0200 @@ -12,7 +12,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: BootZIPL.ycp 26719 2005-12-22 10:50:59Z uli $ + * $Id: BootZIPL.ycp 29647 2006-04-03 18:43:13Z odabrunz $ * */ @@ -174,10 +174,9 @@ global define void Propose () ``{ BootCommon::DetectDisks (); string root_device = BootCommon::RootPartitionDevice; - string parameters = sformat ("%1 %3 %4 %5", + string parameters = sformat ("%1 %3 %4", StorageControllers::dasdParam, BootCommon::GetAdditionalKernelParams (), - "selinux=0", "TERM=dumb"); BootCommon::globals = $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.35/src/routines/lib_iface.ycp new/yast2-bootloader-2.13.36/src/routines/lib_iface.ycp --- old/yast2-bootloader-2.13.35/src/routines/lib_iface.ycp 2006-03-20 14:35:22.000000000 +0100 +++ new/yast2-bootloader-2.13.36/src/routines/lib_iface.ycp 2006-04-03 20:43:21.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: lib_iface.ycp 29144 2006-03-20 09:39:37Z jplack $ + * $Id: lib_iface.ycp 29647 2006-04-03 18:43:13Z odabrunz $ * * WARNING: * To be included to BootCommon.ycp only @@ -33,22 +33,17 @@ string library_initialized = nil; /** - * Prepare the data for perl-Bootloader library initialization - * @return a map of data needed for the library initialization + * Retrieve the data for perl-Bootloader library from Storage module + * and pass it along + * @return nothing */ -map<string,any> PrepareInitData () { +// FIXME: this should be done directly in perl-Bootloader through LibStorage.pm +global void SetDiskInfo () { map<string,any> mountpoints = mapmap (string k, list v, (map<string,list>)Storage::GetMountPoints (), { return $[ k : (any)v[0]:nil]; }); - // get what's really mounted - list<map<string,any> > mounted_list = (list<map<string,any> >) - SCR::Read (.proc.mounts); - map<string,string> mounted = listmap (map<string,any> m, mounted_list, { - return $[ m["file"]:"" : m["spec"]:"" ]; - }); - y2milestone ("Really mounted: %1", mounted); mountpoints = filter (string k, any v, mountpoints, { string tmpdir = (string)SCR::Read (.target.tmpdir); integer tmp_sz = size (tmpdir); @@ -56,6 +51,13 @@ }); if (! Stage::initial ()) { + // get what's really mounted + list<map<string,any> > mounted_list = (list<map<string,any> >) + SCR::Read (.proc.mounts); + map<string,string> mounted = listmap (map<string,any> m, mounted_list, { + return $[ m["file"]:"" : m["spec"]:"" ]; + }); + y2milestone ("Really mounted: %1", mounted); mountpoints = filter (string k, any v, mountpoints, { return mounted[k]:nil == v; }); @@ -68,6 +70,8 @@ { if (info["type"]:`CT_UNKNOWN==`CT_LVM) return []; + if (info["type"]:`CT_UNKNOWN==`CT_EVMS) + return []; list partitions = info["partitions"]:[]; list<list> parts = maplist (map p, (list<map>)partitions, { string raid = ""; @@ -105,11 +109,9 @@ y2milestone ("Information about partitioning: %1", partinfo); y2milestone ("Information about MD arrays: %1", md_info); - return $[ - "mountpoints" : mountpoints, - "partitions" : partinfo, - "md_arrays" : md_info, - ]; + System::Bootloader_API::setMountPoints ((map<string,string>) mountpoints); + System::Bootloader_API::setPartitions ((list<list<string> >) partinfo); + System::Bootloader_API::setMDArrays ((map<string,list<string> >) md_info); } /** @@ -120,21 +122,16 @@ */ global boolean InitializeLibrary (boolean force, string loader) { if (!force && loader == library_initialized) - return true; + return false; y2milestone ("Initializing lib for %1", loader); System::Bootloader_API::initBootloader (loader); y2milestone ("Putting partitioning into library"); - map<string,any> init_data = PrepareInitData (); - map<string,string> mountpoints = init_data["mountpoints"]:$[]; - list<list<string> > partitions = init_data["partitions"]:[]; - map<string,list<string> > md_arrays = init_data["md_arrays"]:$[]; - System::Bootloader_API::setMountPoints (mountpoints); - System::Bootloader_API::setPartitions (partitions); - System::Bootloader_API::setMDArrays (md_arrays); + // pass all needed disk/partition information to library + SetDiskInfo(); y2milestone ("Library initialization finished"); library_initialized = loader; - return true; // FIXME error checking + return true; } /** ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sumf
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package sumf checked in at Tue Apr 4 00:58:37 CEST 2006. -------- --- sumf/sumf.changes 2006-03-27 18:22:52.000000000 +0200 +++ sumf/sumf.changes 2006-04-03 19:38:14.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 3 19:37:00 CEST 2006 - jg(a)suse.de + +- fixed ugly startup message boxes +- fixed sometimes incorrect status handling +- fixed YaST execution support +- minor translation fixes + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sumf.spec ++++++ --- /var/tmp/diff_new_pack.Qmt6eI/_old 2006-04-04 00:58:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Qmt6eI/_new 2006-04-04 00:58:27.000000000 +0200 @@ -15,7 +15,7 @@ URL: http://forge.novell.com/modules/xfmod/project/?scpm Summary: SCPM Universal Management Front-End Version: 0.2.1 -Release: 12 +Release: 13 Group: System/Management License: GPL Source: sumf-%{version}.tar.bz2 @@ -61,6 +61,11 @@ test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT %changelog -n sumf +* Mon Apr 03 2006 - jg(a)suse.de +- fixed ugly startup message boxes +- fixed sometimes incorrect status handling +- fixed YaST execution support +- minor translation fixes * Mon Mar 27 2006 - jg(a)suse.de - updated translations - dropped obsolete menu_fix patch ++++++ sumf-0.2.1.tar.bz2 ++++++ ++++ 11539 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdebase3
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package kdebase3 checked in at Tue Apr 4 00:50:17 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-04-03 15:14:29.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-04-03 19:00:55.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 3 19:00:25 CEST 2006 - stbinner(a)suse.de + +- fix possible Konsole crash on session saving/logout (#147286) + +------------------------------------------------------------------- New: ---- konsole-save-session-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.fdNBEB/_old 2006-04-04 00:48:51.000000000 +0200 +++ /var/tmp/diff_new_pack.fdNBEB/_new 2006-04-04 00:48:51.000000000 +0200 @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.1 -Release: 50 +Release: 51 %define kde_version 3.5.1 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -154,6 +154,7 @@ Patch150: taskbar-size.diff Patch151: 3_5_BRANCH_fix-kded-hang-with-nfs.diff Patch152: kcontrol-lookandfeel.diff +Patch153: konsole-save-session-crash.diff Provides: kdebase %description @@ -323,7 +324,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 64 +Release: 65 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -466,6 +467,7 @@ %patch150 %patch151 %patch152 +%patch153 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -1387,6 +1389,8 @@ %changelog -n kdebase3 * Mon Apr 03 2006 - stbinner(a)suse.de +- fix possible Konsole crash on session saving/logout (#147286) +* Mon Apr 03 2006 - stbinner(a)suse.de - don't remove obsolete from list of known kdesu options (#162790) - fix panel configuration to not always ask to save (#157821) - add missing kdm Provides: for transition from NLD9 (#162511) ++++++ konsole-save-session-crash.diff ++++++ --- konsole/konsole/konsole.cpp 2006/04/03 16:14:20 1.3 +++ konsole/konsole/konsole.cpp 2006/04/03 16:53:56 @@ -214,6 +214,7 @@ ,selectScrollbar(0) ,selectTabbar(0) ,selectBell(0) +,selectSetEncoding(0) ,m_clearHistory(0) ,m_findHistory(0) ,m_saveHistory(0) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome-cups-manager
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package gnome-cups-manager checked in at Tue Apr 4 00:48:34 CEST 2006. -------- --- GNOME/gnome-cups-manager/gnome-cups-manager.changes 2006-03-30 19:11:40.000000000 +0200 +++ gnome-cups-manager/gnome-cups-manager.changes 2006-04-03 22:41:33.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 3 22:40:27 CEST 2006 - joeshaw(a)suse.de + +- Fix "quarter" typo in the US letter test page. (bnc #9535) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-cups-manager.spec ++++++ --- /var/tmp/diff_new_pack.8XHmvs/_old 2006-04-04 00:48:14.000000000 +0200 +++ /var/tmp/diff_new_pack.8XHmvs/_new 2006-04-04 00:48:14.000000000 +0200 @@ -13,7 +13,7 @@ Name: gnome-cups-manager BuildRequires: cups cups-devel gcc-c++ gnome-common gnutls-devel intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeprintui-devel libgnomeui-devel libsmbclient libsmbclient-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files Version: 0.32cvs20060120 -Release: 20 +Release: 21 URL: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL @@ -102,6 +102,8 @@ /opt/gnome/include/libgnomecups-1/libgnomecups/* %changelog -n gnome-cups-manager +* Mon Apr 03 2006 - joeshaw(a)suse.de +- Fix "quarter" typo in the US letter test page. (bnc #9535) * Thu Mar 30 2006 - fejj(a)suse.de - Fixed a crash in smb-uri-parser-fix.patch (bug #161045) * Mon Mar 27 2006 - danw(a)suse.de ++++++ gnome-cups-manager-novell-branded-test-pages.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome-cups-manager/xd2-testpage-letter.eps new/gnome-cups-manager/xd2-testpage-letter.eps --- old/gnome-cups-manager/xd2-testpage-letter.eps 2004-07-26 19:06:05.000000000 +0200 +++ new/gnome-cups-manager/xd2-testpage-letter.eps 2006-04-03 22:34:44.000000000 +0200 @@ -8716,7 +8716,7 @@ (o check margin settings, use a ruler and verify that the margin lines are printe) Tx 1 0 Tk (d ) Tx 1 0 Tk 0 -14.5 Td -(at one quater inch and one half inch from the edge of the paper on all sides.) Tx 1 0 Tk +(at one quarter inch and one half inch from the edge of the paper on all sides.) Tx 1 0 Tk (\r) TX TO 1 To ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Mon Apr 3 20:29:24 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-02 17:17:45.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-03 19:30:07.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 19:29:26 CEST 2006 - kkaempf(a)suse.de + +- plainRpm() is deprecated, use location() +- rev 2893 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.K1brEC/_old 2006-04-03 20:28:25.000000000 +0200 +++ /var/tmp/diff_new_pack.K1brEC/_new 2006-04-03 20:28:25.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 28 +Release: 29 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Mon Apr 03 2006 - kkaempf(a)suse.de +- plainRpm() is deprecated, use location() +- rev 2893 * Sun Apr 02 2006 - kkaempf(a)suse.de - add force_remote flag to handle the case where zmd does the download, so metadata appears local to zypp, but the real ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc --- old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-04-02 14:53:27.000000000 +0200 +++ new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-04-03 18:25:08.000000000 +0200 @@ -575,10 +575,10 @@ sqlite3_bind_text( handle, 6, NULL, -1, SQLITE_STATIC ); // zmd knows how to get the package } else { - const char *plainrpm = pkg->plainRpm().asString().c_str(); - if (plainrpm[0] == '.' && plainrpm[1] == '/') plainrpm += 2; // strip leading "./" - DBG << "Source " << src << " is local, plainrpm " << plainrpm << endl; - sqlite3_bind_text( handle, 6, plainrpm, -1, SQLITE_STATIC ); // zypp knows how to get the package + const char *location = pkg->location().asString().c_str(); + if (location[0] == '.' && location[1] == '/') location += 2; // strip leading "./" + DBG << "Source " << src << " is local, location " << location << endl; + sqlite3_bind_text( handle, 6, location, -1, SQLITE_STATIC ); // zypp knows how to get the package } sqlite3_bind_text( handle, 7, NULL, -1, SQLITE_STATIC ); // signature_filename sqlite3_bind_int( handle, 8, pkg->size() ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package libzypp checked in at Mon Apr 3 20:28:15 CEST 2006. -------- --- libzypp/libzypp.changes 2006-04-03 08:36:07.000000000 +0200 +++ libzypp/libzypp.changes 2006-04-03 19:33:41.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 19:30:35 CEST 2006 - kkaempf(a)suse.de + +- add Resolver::freshenPool() (#156980) +- rev 2893 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.rfNLjB/_old 2006-04-03 20:27:27.000000000 +0200 +++ /var/tmp/diff_new_pack.rfNLjB/_new 2006-04-03 20:27:27.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 70 +Release: 71 Source: zypp-0.0.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -105,6 +105,9 @@ %changelog -n libzypp * Mon Apr 03 2006 - kkaempf(a)suse.de +- add Resolver::freshenPool() (#156980) +- rev 2893 +* Mon Apr 03 2006 - kkaempf(a)suse.de - skip incompatible archs in filelist parsing. - restrict pathes to 'interesting' ones (/bin/, /sbin/, /lib/, /lib64/, ...) ++++++ zypp-0.0.0.tar.bz2 ++++++ libzypp/zypp-0.0.0.tar.bz2 libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-pkg-bindings
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Mon Apr 3 20:27:06 CEST 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-03 15:24:19.000000000 +0200 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-03 19:28:43.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 3 19:25:55 CEST 2006 - kkaempf(a)suse.de + +- new callback: Pkg::PkgFreshen() (#156980) +- 2.13.45 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.13.44.tar.bz2 New: ---- yast2-pkg-bindings-2.13.45.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.0YwiIa/_old 2006-04-03 20:20:35.000000000 +0200 +++ /var/tmp/diff_new_pack.0YwiIa/_new 2006-04-03 20:20:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.44) +# spec file for package yast2-pkg-bindings (Version 2.13.45) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.13.44 +Version: 2.13.45 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.44.tar.bz2 +Source0: yast2-pkg-bindings-2.13.45.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools Summary: YaST2 Package Manager Access @@ -36,7 +36,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.44 +%setup -n yast2-pkg-bindings-2.13.45 %build %{prefix}/bin/y2tool y2autoconf @@ -67,6 +67,9 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Mon Apr 03 2006 - kkaempf(a)suse.de +- new callback: Pkg::PkgFreshen() (#156980) +- 2.13.45 * Mon Apr 03 2006 - lslezak(a)suse.cz - new callbacks: Pkg::CallbackAcceptUnknownGpgKey(), Pkg::CallbackAcceptUnsignedFile(), ++++++ yast2-pkg-bindings-2.13.44.tar.bz2 -> yast2-pkg-bindings-2.13.45.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/Makefile.am new/yast2-pkg-bindings-2.13.45/Makefile.am --- old/yast2-pkg-bindings-2.13.44/Makefile.am 2006-03-27 16:16:48.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/Makefile.am 2006-02-08 17:37:32.000000000 +0100 @@ -154,7 +154,7 @@ $(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 = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +199,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/Makefile.in new/yast2-pkg-bindings-2.13.45/Makefile.in --- old/yast2-pkg-bindings-2.13.44/Makefile.in 2006-03-27 16:17:07.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/Makefile.in 2006-02-08 17:37:46.000000000 +0100 @@ -855,7 +855,7 @@ $(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 check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -898,9 +898,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/VERSION new/yast2-pkg-bindings-2.13.45/VERSION --- old/yast2-pkg-bindings-2.13.44/VERSION 2006-04-03 15:17:20.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/VERSION 2006-04-03 19:26:33.000000000 +0200 @@ -1 +1 @@ -2.13.44 +2.13.45 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/configure new/yast2-pkg-bindings-2.13.45/configure --- old/yast2-pkg-bindings-2.13.44/configure 2006-03-27 16:17:02.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/configure 2006-02-08 17:37:41.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.41. +# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.1.7. # # Report bugs to <http://www.suse.de/feedback>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.13.41' -PACKAGE_STRING='yast2-pkg-bindings 2.13.41' +PACKAGE_VERSION='2.13.1.7' +PACKAGE_STRING='yast2-pkg-bindings 2.13.1.7' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -959,7 +959,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-pkg-bindings 2.13.41 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.13.1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1026,7 +1026,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.41:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.1.7:";; esac cat <<\_ACEOF @@ -1169,7 +1169,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.13.41 +yast2-pkg-bindings configure 2.13.1.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1183,7 +1183,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-pkg-bindings $as_me 2.13.41, which was +It was created by yast2-pkg-bindings $as_me 2.13.1.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1913,7 +1913,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.13.41' + VERSION='2.13.1.7' cat >>confdefs.h <<_ACEOF @@ -2124,7 +2124,7 @@ -VERSION="2.13.41" +VERSION="2.13.1.7" RPMNAME="yast2-pkg-bindings" MAINTAINER="Michael Andres <ma(a)suse.de>" @@ -20042,7 +20042,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-pkg-bindings $as_me 2.13.41, which was +This file was extended by yast2-pkg-bindings $as_me 2.13.1.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20105,7 +20105,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.13.41 +yast2-pkg-bindings config.status 2.13.1.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/configure.in new/yast2-pkg-bindings-2.13.45/configure.in --- old/yast2-pkg-bindings-2.13.44/configure.in 2006-03-27 16:16:48.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/configure.in 2006-02-08 17:37:32.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.13.41, http://www.suse.de/feedback, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.13.1.7, http://www.suse.de/feedback, yast2-pkg-bindings) 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.13.41" +VERSION="2.13.1.7" RPMNAME="yast2-pkg-bindings" MAINTAINER="Michael Andres <ma(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/pkg-bindings.pot new/yast2-pkg-bindings-2.13.45/pkg-bindings.pot --- old/yast2-pkg-bindings-2.13.44/pkg-bindings.pot 2006-03-27 16:52:32.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# 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: 2006-03-27 16:52+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/Package.cc:1669 src/Package.cc:1729 -msgid "See /var/log/YaST2/badlist for more information." -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/src/Package.cc new/yast2-pkg-bindings-2.13.45/src/Package.cc --- old/yast2-pkg-bindings-2.13.44/src/Package.cc 2006-04-03 08:30:52.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/src/Package.cc 2006-04-03 19:22:51.000000000 +0200 @@ -1937,6 +1937,66 @@ /** + @builtin PkgFreshen + @short check all package freshens and schedule matching ones for installation + @return boolean + + Returns true. (If no pool item 'transacts') + + The pool should NOT have any items set to 'transact' (scheduled for installation + or removal) + If it has, dependencies will be solved and the returned result might be false. + +*/ + +YCPBoolean +PkgModuleFunctions::PkgFreshen() +{ + bool result = false; + + try + { + result = zypp_ptr()->resolver()->freshenPool(); + } + catch (const zypp::Exception& excpt) + { + y2error("An error occurred during Pkg::PkgFreshen."); + _last_error.setLastError(excpt.asUserString(), "See /var/log/YaST2/badlist for more information."); + } + + // save information about failed dependencies to file + if (!result) + { + try + { + zypp::ResolverProblemList problems = zypp_ptr()->resolver()->problems(); + int problem_size = problems.size(); + + if (problem_size > 0) + { + y2error ("PkgSolve: %d packages failed (see /var/log/YaST2/badlist)", problem_size); + + std::ofstream out ("/var/log/YaST2/badlist"); + + out << problem_size << " packages failed" << std::endl; + for(zypp::ResolverProblemList::const_iterator p = problems.begin(); + p != problems.end(); ++p ) + { + out << (*p)->description() << std::endl; + } + } + } + catch (...) + { + return YCPBoolean(false); + } + } + + return YCPBoolean(result); +} + + +/** @builtin PkgSolveCheckTargetOnly @short Solve packages currently installed on target system. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.44/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.45/src/PkgModuleFunctions.h --- old/yast2-pkg-bindings-2.13.44/src/PkgModuleFunctions.h 2006-04-03 11:15:15.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.45/src/PkgModuleFunctions.h 2006-04-03 19:24:23.000000000 +0200 @@ -375,6 +375,8 @@ /* TYPEINFO: boolean()*/ YCPBoolean PkgEstablish (); /* TYPEINFO: boolean()*/ + YCPBoolean PkgFreshen (); + /* TYPEINFO: boolean()*/ YCPBoolean PkgSolveCheckTargetOnly (); /* TYPEINFO: integer()*/ YCPValue PkgSolveErrors (); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-storage
by root＠suse.de 03 Apr '06

03 Apr '06

Hello community, here is the log from the commit of package yast2-storage checked in at Mon Apr 3 18:58:38 CEST 2006. -------- --- yast2-storage/yast2-storage.changes 2006-03-30 19:58:49.000000000 +0200 +++ yast2-storage/yast2-storage.changes 2006-04-03 16:57:50.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 3 13:11:32 CEST 2006 - fehr(a)suse.de + +- check if swapon succeeds before using swap partitions (#161335) +- add Storage::RemoveDmMapsTo for usage by bootloader (#162242) +- use correct default fstab options when resuing partition (#162510) +- fix various bugs handling complete disk with mac label (#161751) +- version 2.13.45 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.13.44.tar.bz2 New: ---- yast2-storage-2.13.45.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.CAriSV/_old 2006-04-03 18:58:12.000000000 +0200 +++ /var/tmp/diff_new_pack.CAriSV/_new 2006-04-03 18:58:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.13.44) +# spec file for package yast2-storage (Version 2.13.45) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.13.44 +Version: 2.13.45 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.13.44.tar.bz2 +Source0: yast2-storage-2.13.45.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.13.44 +%setup -n yast2-storage-2.13.45 %build %{prefix}/bin/y2tool y2autoconf @@ -164,6 +164,12 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %changelog -n yast2-storage +* Mon Apr 03 2006 - fehr(a)suse.de +- check if swapon succeeds before using swap partitions (#161335) +- add Storage::RemoveDmMapsTo for usage by bootloader (#162242) +- use correct default fstab options when resuing partition (#162510) +- fix various bugs handling complete disk with mac label (#161751) +- version 2.13.45 * Thu Mar 30 2006 - fehr(a)suse.de - prevent reuse of partitions already used by other entities - wait for udev activity to be finished after calls to ++++++ yast2-storage-2.13.44.tar.bz2 -> yast2-storage-2.13.45.tar.bz2 ++++++ ++++ 6218 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-storage-2.13.44/VERSION new/yast2-storage-2.13.45/VERSION --- old/yast2-storage-2.13.44/VERSION 2006-03-30 20:01:20.000000000 +0200 +++ new/yast2-storage-2.13.45/VERSION 2006-04-03 16:57:54.000000000 +0200 @@ -1 +1 @@ -2.13.44 +2.13.45 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-storage-2.13.44/configure.in new/yast2-storage-2.13.45/configure.in --- old/yast2-storage-2.13.44/configure.in 2006-03-15 16:24:07.000000000 +0100 +++ new/yast2-storage-2.13.45/configure.in 2006-04-03 18:52:11.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.13.35, http://www.suse.de/feedback, yast2-storage) +AC_INIT(yast2-storage, 2.13.45, http://www.suse.de/feedback, yast2-storage) 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.13.35" +VERSION="2.13.45" RPMNAME="yast2-storage" MAINTAINER="Thomas Fehr <fehr(a)suse.de>" 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-storage-2.13.44/libstorage/src/Disk.cc new/yast2-storage-2.13.45/libstorage/src/Disk.cc --- old/yast2-storage-2.13.44/libstorage/src/Disk.cc 2006-03-30 14:24:35.000000000 +0200 +++ new/yast2-storage-2.13.45/libstorage/src/Disk.cc 2006-04-03 15:52:48.000000000 +0200 @@ -644,6 +644,10 @@ { id = Partition::ID_APPLE_HFS; } + else if( val.find( "Apple_UFS" ) != string::npos ) + { + id = Partition::ID_APPLE_UFS; + } } } } 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-storage-2.13.44/libstorage/src/Partition.h new/yast2-storage-2.13.45/libstorage/src/Partition.h --- old/yast2-storage-2.13.44/libstorage/src/Partition.h 2006-03-28 13:22:56.000000000 +0200 +++ new/yast2-storage-2.13.45/libstorage/src/Partition.h 2006-04-03 15:57:04.000000000 +0200 @@ -19,7 +19,7 @@ ID_LINUX=0x83, ID_SWAP=0x82, ID_LVM=0x8e, ID_RAID=0xfd, ID_APPLE_OTHER=0x101, ID_APPLE_HFS=0x102, ID_GPT_BOOT=0x103, ID_GPT_SERVICE=0x104, - ID_GPT_MSFTRES=0x105 } IdNum; + ID_GPT_MSFTRES=0x105, ID_APPLE_UFS=0x106 } IdNum; Partition( const Disk& d, unsigned Pnr, unsigned long long SizeK, unsigned long Start, unsigned long CSize, 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-storage-2.13.44/libstorage/src/Storage.cc new/yast2-storage-2.13.45/libstorage/src/Storage.cc --- old/yast2-storage-2.13.44/libstorage/src/Storage.cc 2006-03-30 19:51:25.000000000 +0200 +++ new/yast2-storage-2.13.45/libstorage/src/Storage.cc 2006-04-03 13:36:14.000000000 +0200 @@ -3136,8 +3136,9 @@ return( co.type()==EVMS || co.type()==DM || co.type()==LVM ); } -void Storage::removeDmMapsTo( const string& dev ) +bool Storage::removeDmMapsTo( const string& dev ) { + bool ret = false; y2milestone( "dev:%s", dev.c_str() ); VPair vp = vPair( isDmContainer ); for( VolIterator v=vp.begin(); v!=vp.end(); ++v ) @@ -3146,11 +3147,33 @@ if( dm!=NULL ) { if( dm->mapsTo( dev ) ) + { dm->removeTable(); + ret = true; + } } else y2warning( "not a Dm descendant %s", v->device().c_str() ); } + y2milestone( "ret:%d", ret ); + return( ret ); + } + +bool Storage::checkDmMapsTo( const string& dev ) + { + bool ret = false; + y2milestone( "dev:%s", dev.c_str() ); + VPair vp = vPair( isDmContainer ); + VolIterator v=vp.begin(); + while( !ret && v!=vp.end() ) + { + Dm * dm = dynamic_cast<Dm *>(&(*v)); + if( dm!=NULL ) + ret = ret && dm->mapsTo( dev ); + ++v; + } + y2milestone( "ret:%d", ret ); + return( ret ); } void 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-storage-2.13.44/libstorage/src/Storage.h new/yast2-storage-2.13.45/libstorage/src/Storage.h --- old/yast2-storage-2.13.44/libstorage/src/Storage.h 2006-03-30 19:49:51.000000000 +0200 +++ new/yast2-storage-2.13.45/libstorage/src/Storage.h 2006-04-03 13:33:35.000000000 +0200 @@ -334,7 +334,8 @@ void removeDmTableTo( const Volume& vol ); void removeDmTableTo( const string& device ); bool removeDmTable( const string& table ); - void removeDmMapsTo( const string& dev ); + bool removeDmMapsTo( const string& dev ); + bool checkDmMapsTo( const string& dev ); void setCallbackProgressBar( storage::CallbackProgressBar pfnc ) { progress_bar_cb=pfnc; } 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-storage-2.13.44/libstorage/src/StorageInterface.h new/yast2-storage-2.13.45/libstorage/src/StorageInterface.h --- old/yast2-storage-2.13.44/libstorage/src/StorageInterface.h 2006-01-25 18:32:39.000000000 +0100 +++ new/yast2-storage-2.13.45/libstorage/src/StorageInterface.h 2006-04-03 15:29:26.000000000 +0200 @@ -1738,6 +1738,22 @@ virtual bool mountDevice( const string& device, const string& mp ) = 0; /** + * Check if there are dm maps to a given device + * + * @param device device name for which dm maps should be checked + * @return bool true if there are map to device + */ + virtual bool checkDmMapsTo( const string& device ) = 0; + + /** + * Remove all possibly existing dm maps to a given device + * + * @param device device name for which dm maps should be removed + * @return bool true if maps to remove existed + */ + virtual bool removeDmMapsTo( const string& device ) = 0; + + /** * Detect potentially available free space on a partition * * @param device device to check 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-storage-2.13.44/storage/src/include/auto_part_ui.ycp new/yast2-storage-2.13.45/storage/src/include/auto_part_ui.ycp --- old/yast2-storage-2.13.44/storage/src/include/auto_part_ui.ycp 2006-01-23 16:00:30.000000000 +0100 +++ new/yast2-storage-2.13.45/storage/src/include/auto_part_ui.ycp 2006-04-03 18:37:20.000000000 +0200 @@ -9,7 +9,7 @@ * * * - * $Id: auto_part_ui.ycp 27211 2006-01-23 15:00:30Z fehr $ + * $Id: auto_part_ui.ycp 29641 2006-04-03 16:37:17Z fehr $ * * used globals: * @@ -106,10 +106,8 @@ symbol ptype = pentry["type"]:`unknown; if (ptype != `extended) { - list<string> hit = filter(string v, Partitions::not_shown_partitions, - ``(issubstring(pentry["fstype"]:"", v)) ); // skip #3 on AlphaBSD and SparcBSD - if (size(hit)==0 && + if( pentry["fsid"]:0 != Partitions::fsid_mac_hidden && ((ptype!=`bsd && ptype!=`sun) || pentry["nr"]:0 != 3) && !pentry["create"]:false) { 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-storage-2.13.44/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.13.45/storage/src/include/do_proposal_flexible.ycp --- old/yast2-storage-2.13.44/storage/src/include/do_proposal_flexible.ycp 2006-03-30 16:38:24.000000000 +0200 +++ new/yast2-storage-2.13.45/storage/src/include/do_proposal_flexible.ycp 2006-04-03 14:03:55.000000000 +0200 @@ -14,7 +14,7 @@ * ************************************************************* - $Id: do_proposal_flexible.ycp 29573 2006-03-30 14:38:22Z fehr $ + $Id: do_proposal_flexible.ycp 29609 2006-04-03 12:03:53Z fehr $ */ { @@ -1918,6 +1918,7 @@ ``(p["type"]:`unknown!=`free && !p["delete"]:false && p["detected_fs"]:`unknown==`swap)); + swaps = filter( map p, swaps, ``(Storage::CheckSwapable(p["device"]:""))); swaps = sort( map a, map b, swaps, ``(a["size_k"]:0>b["size_k"]:0)); y2milestone( "can_swap_reuse swaps %1", swaps ); if( swaps[0,"size_k"]:0 >= 128*1024 ) @@ -1995,6 +1996,8 @@ p["mount"] = Partitions::BootMount(); p["used_fs"] = Partitions::DefaultBootFs(); p["format"] = true; + p["fstopt"] = + FileSystems::DefaultFstabOptions( p ); } return( p ); }); @@ -2031,6 +2034,7 @@ p["mount"] = mp; p["used_fs"] = Partitions::default_fs; p["format"] = true; + p["fstopt"] = FileSystems::DefaultFstabOptions( p ); } return( p ); }); 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-storage-2.13.44/storage/src/inst_custom_part.ycp new/yast2-storage-2.13.45/storage/src/inst_custom_part.ycp --- old/yast2-storage-2.13.44/storage/src/inst_custom_part.ycp 2006-03-28 15:18:16.000000000 +0200 +++ new/yast2-storage-2.13.45/storage/src/inst_custom_part.ycp 2006-04-03 18:37:20.000000000 +0200 @@ -26,7 +26,7 @@ * ************************************************************* - $Id: inst_custom_part.ycp 29473 2006-03-28 13:18:12Z fehr $ + $Id: inst_custom_part.ycp 29641 2006-04-03 16:37:17Z fehr $ */ { @@ -1031,12 +1031,7 @@ ``{ // dont show "system partitions" string fstype = partition["fstype"]:""; - boolean hide = false; - if( size(filter( string v, Partitions::not_shown_partitions, - ``(issubstring(fstype, v)) ))>0 ) - { - hide = true; - } + boolean hide = partition["fsid"]:0 == Partitions::fsid_mac_hidden; if( !hide && search( partition["device"]:"", "/dev/evms/" )==0 ) { y2milestone( "evms p: %1", partition ); 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-storage-2.13.44/storage/src/inst_target_part.ycp new/yast2-storage-2.13.45/storage/src/inst_target_part.ycp --- old/yast2-storage-2.13.44/storage/src/inst_target_part.ycp 2006-02-02 17:45:48.000000000 +0100 +++ new/yast2-storage-2.13.45/storage/src/inst_target_part.ycp 2006-04-03 18:37:20.000000000 +0200 @@ -9,7 +9,7 @@ * -Ask the user which partition to use. * -Check the input and return error-messages. * - * $Id: inst_target_part.ycp 27550 2006-02-02 16:45:49Z fehr $ + * $Id: inst_target_part.ycp 29641 2006-04-03 16:37:17Z fehr $ */ { textdomain "storage"; @@ -201,10 +201,10 @@ symbol ret = nil; // TODO: UI::ControlWidget(dlg, `id(`full), `SetFocus()); - if( target["label"]:""=="mac" && UI::WidgetExists( `id(`full) )) - { - UI::ChangeWidget( `id(`full), `Enabled, false ); - } + //if( target["label"]:""=="mac" && UI::WidgetExists( `id(`full) )) + //{ + //UI::ChangeWidget( `id(`full), `Enabled, false ); + //} boolean ok = false; while(!ok) @@ -223,7 +223,8 @@ ``{ symbol ptype = pentry["type"]:`unknown; integer ui_id = 0; - if (ptype != `extended) + if( ptype != `extended && + pentry["fsid"]:0 != Partitions::fsid_mac_hidden ) { ui_id = pentry["ui_id"]:0; if (ui_id != 0) @@ -353,9 +354,9 @@ if( ptype != `extended ) { ui_id = p["ui_id"]:0; - boolean selection = - !UI::WidgetExists( `id(ui_id) ) || - (UI::QueryWidget( `id(ui_id), `Value)==true); + boolean selection = p["fsid"]:0 != Partitions::fsid_mac_hidden && + (!UI::WidgetExists( `id(ui_id) ) || + (UI::QueryWidget( `id(ui_id), `Value)==true)); y2milestone( "sel:%1", selection ); if( win_partition_to_delete == p["nr"]:-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-storage-2.13.44/storage/src/modules/Partitions.ycp new/yast2-storage-2.13.45/storage/src/modules/Partitions.ycp --- old/yast2-storage-2.13.44/storage/src/modules/Partitions.ycp 2006-01-30 15:53:10.000000000 +0100 +++ new/yast2-storage-2.13.45/storage/src/modules/Partitions.ycp 2006-04-03 18:37:20.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Provides information about partitions * - * $Id: Partitions.ycp 27442 2006-01-30 14:53:09Z fehr $ + * $Id: Partitions.ycp 29641 2006-04-03 16:37:17Z fehr $ */ { module "Partitions"; @@ -29,7 +29,9 @@ global integer fsid_fat16 = 6; global integer fsid_fat32 = 12; global integer fsid_prep_chrp_boot = 0x41; + global integer fsid_mac_hidden = 0x101; global integer fsid_mac_hfs = 0x102; + global integer fsid_mac_ufs = 0x106; global integer fsid_gpt_boot = 0x103; global integer fsid_gpt_service = 0x104; global integer fsid_gpt_msftres = 0x105; @@ -627,6 +629,7 @@ if ( fs_id == 0x103) return( "EFI boot"); if ( fs_id == 0x104) return( "Service"); if ( fs_id == 0x105) return( "Microsoft reserved"); + if ( fs_id == 0x106) return( "Apple_UFS"); return( "unknown" ); }; 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-storage-2.13.44/storage/src/modules/Storage.ycp new/yast2-storage-2.13.45/storage/src/modules/Storage.ycp --- old/yast2-storage-2.13.44/storage/src/modules/Storage.ycp 2006-03-29 13:34:53.000000000 +0200 +++ new/yast2-storage-2.13.45/storage/src/modules/Storage.ycp 2006-04-03 13:48:19.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht * "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen * näher erklärt. * - * $Id: Storage.ycp 29503 2006-03-29 11:34:49Z fehr $ + * $Id: Storage.ycp 29608 2006-04-03 11:48:12Z fehr $ */ { @@ -2729,6 +2729,18 @@ }); } +global define boolean CheckSwapable( string dev ) + { + string cmd = "swapon " + dev; + boolean ok = (integer)SCR::Execute(.target.bash, cmd )==0; + if( ok ) + { + cmd = "swapoff " + dev; + SCR::Execute(.target.bash, cmd ); + } + return( ok ); + } + /** * mark swap-partitions with pseudo Mountpoint swap in targetMap * @param target Disk map @@ -2736,28 +2748,34 @@ */ global define map<string,map> AddSwapMp( map<string,map> target ) ``{ - list swaps = []; - if( !Stage::initial() ) - swaps = SwappingPartitions(); + list swaps = SwappingPartitions(); y2milestone( "AddSwapMp swaps %1", swaps ); foreach(string diskdev, map disk, target, ``{ disk["partitions"] = maplist(map part, disk["partitions"]:[], - ``{ - if( (Stage::initial() && - !Partitions::IsDosWinNtPartition(part["fsid"]:0) && - part["detected_fs"]:`unknown==`swap && - !part["old_swap"]:false && - search( diskdev, "/dev/evms" )!=0 ) || - (!Stage::initial() && - contains( swaps, part["device"]:"" ))) - { - part["mount"] = "swap"; - ChangeVolumeProperties( part ); - y2milestone( "AddSwapMp %1", part ); - } - return( part ); - }); + ``{ + if( (Stage::initial() && + !Partitions::IsDosWinNtPartition(part["fsid"]:0) && + part["detected_fs"]:`unknown==`swap && + !part["old_swap"]:false && + search( diskdev, "/dev/evms" )!=0 ) || + (contains( swaps, part["device"]:"" ))) + { + boolean ok = true; + if( !contains( swaps, part["device"]:"" )) + { + ok = CheckSwapable( part["device"]:"" ); + y2milestone( "AddSwapMp initial ok:%1", ok ); + } + if( ok ) + { + part["mount"] = "swap"; + ChangeVolumeProperties( part ); + y2milestone( "AddSwapMp %1", part ); + } + } + return( part ); + }); target[diskdev] = disk; }); return( target ); @@ -5034,5 +5052,25 @@ y2milestone( "SwitchUiAutomounter exit" ); } +global void RemoveDmMapsTo( string device ) + { + y2milestone( "RemoveDmMapsTo device:%1", device ); + InitLibstorage(); + if( LibStorage::StorageInterface::checkDmMapsTo( sint, device )) + { + LibStorage::StorageInterface::removeDmMapsTo( sint, device ); + } + else + { + map d = GetDiskPartition( device ); + string ddev = d["disk"]:""; + if( size(ddev)>0 && ddev!=device && + LibStorage::StorageInterface::checkDmMapsTo( sint, ddev ) ) + { + LibStorage::StorageInterface::removeDmMapsTo( sint, ddev ); + } + } + } + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0